r2163 - trunk/mysql

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Wed Jan 27 22:32:15 PST 2010


Author: bdubbs
Date: 2010-01-27 23:32:15 -0700 (Wed, 27 Jan 2010)
New Revision: 2163

Added:
   trunk/mysql/mysql-5.1.42-client-1.patch
   trunk/mysql/mysql-5.1.42-logevent-1.patch
Log:
Add patches for mysql to handle gcc-4.4

Added: trunk/mysql/mysql-5.1.42-client-1.patch
===================================================================
--- trunk/mysql/mysql-5.1.42-client-1.patch	                        (rev 0)
+++ trunk/mysql/mysql-5.1.42-client-1.patch	2010-01-28 06:32:15 UTC (rev 2163)
@@ -0,0 +1,28 @@
+Submitted By: Bruce dubbs (bdubbs at linuxfromscratch dot org)
+Date: 2010-01-28
+Initial Package Version: 5.1.42
+Origin: mysql mailing list
+Description: Patches the mysqlclient library to fix a problem when
+             compiled with gcc-4.4.
+
+--- a/libmysql/libmysql.c  2009-11-03 18:18:44 +0000
++++ b/libmysql/libmysql.c  2009-11-23 21:54:27 +0000
+@@ -2285,7 +2285,7 @@ mysql_stmt_param_metadata(MYSQL_STMT *st
+
+ /* Store type of parameter in network buffer. */
+
+-static void store_param_type(char **pos, MYSQL_BIND *param)
++static void store_param_type(unsigned char **pos, MYSQL_BIND *param)
+ {
+   uint typecode= param->buffer_type | (param->is_unsigned ? 32768 : 0);
+   int2store(*pos, typecode);
+@@ -2565,7 +2565,7 @@ int cli_stmt_execute(MYSQL_STMT *stmt)
+   that is sent to the server.
+       */
+       for (param= stmt->params; param < param_end ; param++)
+-        store_param_type((char**) &net->write_pos, param);
++        store_param_type(&net->write_pos, param);
+     }
+
+     for (param= stmt->params; param < param_end; param++)
+

Added: trunk/mysql/mysql-5.1.42-logevent-1.patch
===================================================================
--- trunk/mysql/mysql-5.1.42-logevent-1.patch	                        (rev 0)
+++ trunk/mysql/mysql-5.1.42-logevent-1.patch	2010-01-28 06:32:15 UTC (rev 2163)
@@ -0,0 +1,39 @@
+Submitted By: Bruce dubbs (bdubbs at linuxfromscratch dot org)
+Date: 2010-01-28
+Initial Package Version: 5.1.42
+Origin: mysql mailing list
+Description: Patches event logging to fix a problem when
+             compiled with gcc-4.4.
+
+--- a/sql/log_event.cc  2009-10-23 03:13:42 +0000
++++ b/sql/log_event.cc  2009-11-09 17:36:13 +0000
+@@ -2138,8 +2138,8 @@ void Query_log_event::pack_info(Protocol
+ /**
+   Utility function for the next method (Query_log_event::write()) .
+ */
+-static void write_str_with_code_and_len(char **dst, const char *src,
+-                                        int len, uint code)
++static void write_str_with_code_and_len(uchar **dst, const char *src,
++                                        uint len, uint code)
+ {
+   /*
+     only 1 byte to store the length of catalog, so it should not
+@@ -2234,7 +2234,7 @@ bool Query_log_event::write(IO_CACHE* fi
+   }
+   if (catalog_len) // i.e. this var is inited (false for 4.0 events)
+   {
+-    write_str_with_code_and_len((char **)(&start),
++    write_str_with_code_and_len(&start,
+                                 catalog, catalog_len, Q_CATALOG_NZ_CODE);
+     /*
+       In 5.0.x where x<4 masters we used to store the end zero here. This was
+@@ -2272,7 +2272,7 @@ bool Query_log_event::write(IO_CACHE* fi
+   {
+     /* In the TZ sys table, column Name is of length 64 so this should be ok */
+     DBUG_ASSERT(time_zone_len <= MAX_TIME_ZONE_NAME_LENGTH);
+-    write_str_with_code_and_len((char **)(&start),
++    write_str_with_code_and_len(&start,
+                                 time_zone_str, time_zone_len, Q_TIME_ZONE_CODE);
+   }
+   if (lc_time_names_number)
+




More information about the patches mailing list