bk commit into 5.1 tree (anozdrin:1.2616)

From: Alexander Nozdrin <alik(at)mysql.com>
Date: Sat Sep 29 2007 - 15:31:14 EDT

Below is the list of changes that have just been committed into a local 5.1 repository of alik. When alik does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository.
For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@1.2616, 2007-09-29 23:31:08+04:00, anozdrin@station. +4 -0   Fix compile warnings.

  client/client_priv.h@1.76, 2007-09-29 23:31:05+04:00, anozdrin@station. +0 -4     Fix compile warnings.

  client/mysqltest.c@1.314, 2007-09-29 23:31:05+04:00, anozdrin@station. +6 -4     Fix compile warnings.

  libmysql/client_settings.h@1.39, 2007-09-29 23:31:05+04:00, anozdrin@station. +4 -0     Fix compile warnings.

  libmysql/libmysql.c@1.292, 2007-09-29 23:31:05+04:00, anozdrin@station. +3 -3     Fix compile warnings.

diff -Nrup a/client/client_priv.h b/client/client_priv.h
--- a/client/client_priv.h	2007-09-28 23:30:52 +04:00
+++ b/client/client_priv.h	2007-09-29 23:31:05 +04:00

@@ -82,7 +82,3 @@ enum options_client

   OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,    OPT_WRITE_BINLOG, OPT_MAX_CLIENT_OPTION  };

-
-C_MODE_START
-extern int mysql_init_character_set(MYSQL *mysql);
-C_MODE_END
diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c	2007-08-28 18:47:39 +04:00
+++ b/client/mysqltest.c	2007-09-29 23:31:05 +04:00

@@ -1507,7 +1507,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, c

     die("Failed to create temporary file for ds");
 

   /* Write ds to temporary file and set file pos to beginning*/ - if (my_write(fd, ds->str, ds->length, + if (my_write(fd, (uchar *) ds->str, ds->length,

                MYF(MY_FNABP | MY_WME)) ||
       my_seek(fd, 0, SEEK_SET, MYF(0)) == MY_FILEPOS_ERROR)

   {
@@ -1984,9 +1984,11 @@ void var_set_query_get_value(struct st_c

   static DYNAMIC_STRING ds_col;
   static DYNAMIC_STRING ds_row;
   const struct command_arg query_get_value_args[] = {

-    "query", ARG_STRING, TRUE, &ds_query, "Query to run",
-    "column name", ARG_STRING, TRUE, &ds_col, "Name of column",
-    "row number", ARG_STRING, TRUE, &ds_row, "Number for row",
+    {
+      "query", ARG_STRING, TRUE, &ds_query, "Query to run",
+      "column name", ARG_STRING, TRUE, &ds_col, "Name of column",
+      "row number", ARG_STRING, TRUE, &ds_row, "Number for row"

+ }

   };  

   DBUG_ENTER("var_set_query_get_value"); diff -Nrup a/libmysql/client_settings.h b/libmysql/client_settings.h

--- a/libmysql/client_settings.h	2007-06-15 22:31:54 +04:00
+++ b/libmysql/client_settings.h	2007-09-29 23:31:05 +04:00

@@ -63,3 +63,7 @@ int cli_read_change_user_result(MYSQL *m

 int init_embedded_server(int argc, char **argv, char **groups);
 void end_embedded_server();
 #endif /*EMBEDDED_LIBRARY*/
+
+C_MODE_START

+extern int mysql_init_character_set(MYSQL *mysql); +C_MODE_END
diff -Nrup a/libmysql/libmysql.c b/libmysql/libmysql.c

--- a/libmysql/libmysql.c	2007-09-28 23:30:52 +04:00
+++ b/libmysql/libmysql.c	2007-09-29 23:31:05 +04:00

@@ -2526,7 +2526,7 @@ static my_bool execute(MYSQL_STMT *stmt,

              5 /* execution flags */];

   my_bool res;

   DBUG_ENTER("execute");
-  DBUG_DUMP("packet", packet, length);
+  DBUG_DUMP("packet", (uchar *) packet, length);
 
   mysql->last_used_con= mysql;
   int4store(buff, stmt->stmt_id);		/* Send stmt id to server */

@@ -4702,13 +4702,13 @@ int cli_read_binary_rows(MYSQL_STMT *stm

   MYSQL_ROWS *cur, **prev_ptr= &result->data;    NET *net;  

+ DBUG_ENTER("cli_read_binary_rows");
+

   if (!mysql)
   {

     set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
     return 1;

   }
-
- DBUG_ENTER("cli_read_binary_rows");  

   net = &mysql->net;
   mysql= mysql->last_used_con;

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Sat Sep 29 15:27:23 2007