r2164 - trunk/mysql

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Wed Jan 27 23:34:33 PST 2010


Author: bdubbs
Date: 2010-01-28 00:34:33 -0700 (Thu, 28 Jan 2010)
New Revision: 2164

Modified:
   trunk/mysql/mysql-5.1.42-client-1.patch
Log:
Fix stupid file with embedded tab

Modified: trunk/mysql/mysql-5.1.42-client-1.patch
===================================================================
--- trunk/mysql/mysql-5.1.42-client-1.patch	2010-01-28 06:32:15 UTC (rev 2163)
+++ trunk/mysql/mysql-5.1.42-client-1.patch	2010-01-28 07:34:33 UTC (rev 2164)
@@ -5,9 +5,9 @@
 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
+--- a/libmysql/libmysql.c       2009-12-16 11:54:42.000000000 -0600
++++ b/libmysql/libmysql.c       2010-01-28 01:30:19.000000000 -0600
+@@ -2271,7 +2271,7 @@
 
  /* Store type of parameter in network buffer. */
 
@@ -16,11 +16,13 @@
  {
    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.
+@@ -2550,8 +2550,8 @@
+        Store types of parameters in first in first package
+        that is sent to the server.
        */
-       for (param= stmt->params; param < param_end ; param++)
+-      for (param= stmt->params;	param < param_end ; param++)
 -        store_param_type((char**) &net->write_pos, param);
++      for (param= stmt->params; param < param_end ; param++)
 +        store_param_type(&net->write_pos, param);
      }
 




More information about the patches mailing list