List:Commits« Previous MessageNext Message »
From:Nirbhay Choubey Date:July 13 2012 11:56am
Subject:bzr push into mysql-trunk branch (nirbhay.choubey:4052 to 4053)
View as plain text  
 4053 Nirbhay Choubey	2012-07-13 [merge]
      Local merge from mysql-5.6.

    modified:
      client/mysqldump.c
 4052 Hemant Kumar	2012-07-13 [merge]
      Merging the changes from mysql-trunk-5.6

    modified:
      mysql-test/suite/innodb/t/innodb_bug11766634.test
      mysql-test/suite/innodb/t/innodb_bug52663.test
      mysql-test/suite/parts/t/partition_debug_myisam.test
      mysql-test/suite/parts/t/partition_decimal_myisam.test
      mysql-test/suite/parts/t/partition_int_myisam.test
      mysql-test/t/index_merge_innodb.test
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2012-07-04 14:50:24 +0000
+++ b/client/mysqldump.c	2012-07-13 11:54:29 +0000
@@ -4810,7 +4810,7 @@ static int add_slave_statements(void)
 
 static int do_show_slave_status(MYSQL *mysql_con)
 {
-  MYSQL_RES *slave;
+  MYSQL_RES *slave= NULL;
   const char *comment_prefix=
     (opt_slave_data == MYSQL_OPT_SLAVE_DATA_COMMENTED_SQL) ? "-- " : "";
   if (mysql_query_with_error_report(mysql_con, &slave, "SHOW SLAVE STATUS"))

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (nirbhay.choubey:4052 to 4053) Nirbhay Choubey13 Jul