bzr commit into mysql-6.0-codebase branch (alik:3667)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/00.merges/mysql-6.0-codebase-merge/ based on revid:alik@stripped

 3667 Alexander Nozdrin	2009-11-09 [merge]
      Manual merge from mysql-next-mr-merge.

    modified:
      client/mysqltest.cc
      mysql-test/t/disabled.def
      mysql-test/t/innodb_bug34300.test
      sql/item.h
      sql/item_cmpfunc.h
      sql/records.h
      sql/sql_acl.cc
      sql/sql_parse.cc
      tests/mysql_client_test.c
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2009-11-03 10:27:17 +0000
+++ b/client/mysqltest.cc	2009-11-09 10:27:46 +0000
@@ -7026,13 +7026,13 @@ void run_query_stmt(MYSQL *mysql, struct
 
     if (!disable_warnings)
     {
-      /* Get the warnings from execute */
+      ulonglong affected_rows;
+      LINT_INIT(affected_rows);
 
-      /* Append warnings to ds - if there are any */
-      if (append_warnings(&ds_execute_warnings, mysql) ||
-          ds_execute_warnings.length ||
-          ds_prepare_warnings.length ||
-          ds_warnings->length)
+      if (!disable_info)
+        append_info(ds, mysql_stmt_affected_rows(stmt), mysql_info(mysql));
+
+      if (!disable_warnings)
       {
         dynstr_append_mem(ds, "Warnings:\n", 10);
 	if (ds_warnings->length)

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-11-09 08:01:09 +0000
+++ b/mysql-test/t/disabled.def	2009-11-09 10:27:46 +0000
@@ -12,6 +12,8 @@
 kill                 : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 innodb_bug39438      : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
 query_cache_28249    : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
+
 partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
 partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+
 rpl_killed_ddl           : Bug#45520: rpl_killed_ddl fails sporadically in pb2

=== modified file 'mysql-test/t/innodb_bug34300.test'
--- a/mysql-test/t/innodb_bug34300.test	2009-11-03 09:15:13 +0000
+++ b/mysql-test/t/innodb_bug34300.test	2009-11-09 10:27:46 +0000
@@ -9,6 +9,7 @@
 -- disable_result_log
 
 # set packet size and reconnect 
+let $max_packet=`select @@global.max_allowed_packet`;
 SET @@global.max_allowed_packet=16777216;
 --connect (newconn, localhost, root,,)
 

=== modified file 'sql/item.h'
--- a/sql/item.h	2009-11-03 10:27:17 +0000
+++ b/sql/item.h	2009-11-09 10:27:46 +0000
@@ -3238,4 +3238,5 @@ extern Cached_item *new_Cached_item(THD 
 extern Item_result item_cmp_type(Item_result a,Item_result b);
 extern void resolve_const_item(THD *thd, Item **ref, Item *cmp_item);
 extern int stored_field_cmp_to_item(THD *thd, Field *field, Item *item);
+
 #endif /* ITEM_INCLUDED */

=== modified file 'sql/item_cmpfunc.h'
--- a/sql/item_cmpfunc.h	2009-11-03 09:03:04 +0000
+++ b/sql/item_cmpfunc.h	2009-11-09 10:27:46 +0000
@@ -1742,6 +1742,8 @@ inline Item *and_conds(Item *a, Item *b)
 }
 
 Item *and_expressions(Item *a, Item *b, Item **org_item);
-bool get_mysql_time_from_str(THD *thd, String *str, timestamp_type warn_type, 
+
+bool get_mysql_time_from_str(THD *thd, String *str, timestamp_type warn_type,
                              const char *warn_name, MYSQL_TIME *l_time);
+
 #endif /* ITEM_CMPFUNC_INCLUDED */

=== modified file 'sql/records.h'
--- a/sql/records.h	2009-11-03 18:07:29 +0000
+++ b/sql/records.h	2009-11-09 10:27:46 +0000
@@ -84,5 +84,7 @@ void end_read_record(READ_RECORD *info);
 void rr_unlock_row(st_join_table *tab);
 
 
+void rr_unlock_row(st_join_table *tab);
+
 #endif /* SQL_RECORDS_H */
 

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2009-11-03 09:42:49 +0000
+++ b/sql/sql_acl.cc	2009-11-09 10:27:46 +0000
@@ -5658,7 +5658,7 @@ static int handle_grant_struct(uint stru
           ensure that the position matches the new hash key value
         */
         my_hash_update(&column_priv_hash, (uchar*) grant_name,
-                    (uchar*) grant_name->hash_key, grant_name->key_length);
+                       (uchar*) grant_name->hash_key, grant_name->key_length);
 	break;
       }
     }

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2009-11-03 09:42:49 +0000
+++ b/sql/sql_parse.cc	2009-11-09 10:27:46 +0000
@@ -516,7 +516,7 @@ static void handle_bootstrap_impl(THD *t
                                       thd->db_length + 1 +
                                       QUERY_CACHE_FLAGS_SIZE);
     thd->set_query(query, length);
-    DBUG_PRINT("query",("%-.4096s", thd->query()));
+    DBUG_PRINT("query",("%-.4096s",thd->query()));
 #if defined(ENABLED_PROFILING)
     thd->profiling.start_new_query();
     thd->profiling.set_query_source(thd->query(), length);

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2009-11-03 10:27:17 +0000
+++ b/tests/mysql_client_test.c	2009-11-09 10:27:46 +0000
@@ -18551,7 +18551,7 @@ static void test_bug33831(void)
 
   if (!(l_mysql= mysql_client_init(NULL)))
   {
-    myerror("mysql_init() failed");
+    myerror("mysql_client_init() failed");
     DIE_UNLESS(0);
   }
   if (!(mysql_real_connect(l_mysql, opt_host, opt_user,


Attachment: [text/bzr-bundle] bzr/[e-mail]