From: Sergey Glukhov
Date: December 21 2010 12:38pm
Subject: bzr commit into mysql-trunk-bugfixing branch (sergey.glukhov:3462)
List-Archive: http://lists.mysql.com/commits/127420
Message-Id: <201012211248.oBLCmas6022392@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/gluh/MySQL/mysql-trunk-bugfixing/ based on revid:sergey.glukhov@stripped

 3462 Sergey Glukhov	2010-12-21 [merge]
      automerge

    modified:
      mysql-test/include/rpl_start_server.inc
      mysql-test/include/rpl_stop_server.inc
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/t/rpl_do_grant.test
      sql/protocol.cc
=== modified file 'mysql-test/include/rpl_start_server.inc'
--- a/mysql-test/include/rpl_start_server.inc	2010-12-19 17:07:28 +0000
+++ b/mysql-test/include/rpl_start_server.inc	2010-12-21 11:37:43 +0000
@@ -45,7 +45,15 @@ if ($rpl_server_parameters)
 --source include/rpl_connection.inc
 
 # Write file to make mysql-test-run.pl start up the server again
---exec echo "$_rpl_start_server_command" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
+--let WRITE_TO_FILE= $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
+--let WRITE_TO_VAR= $_rpl_start_server_command
+perl;
+my $file= $ENV{'WRITE_TO_FILE'};
+my $var= $ENV{'WRITE_TO_VAR'};
+open WRITE_FILE, ">> $file" or die "Error opening $file: $!";
+print WRITE_FILE $var, "\n" or die "Error appending to $file: $!";
+close WRITE_FILE or die "Error closing $file: $!";
+EOF
 
 --source include/rpl_reconnect.inc
 

=== modified file 'mysql-test/include/rpl_stop_server.inc'
--- a/mysql-test/include/rpl_stop_server.inc	2010-12-19 17:07:28 +0000
+++ b/mysql-test/include/rpl_stop_server.inc	2010-12-21 11:37:43 +0000
@@ -44,7 +44,9 @@ if ($rpl_debug)
 
 # Write file to make mysql-test-run.pl expect the "crash", but don't start
 # it until it's told to
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
+--append_file $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
+wait
+EOF
 
 # Send shutdown to the connected server and give
 # it 10 seconds to die before zapping it

=== modified file 'mysql-test/suite/rpl/r/rpl_do_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_do_grant.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_do_grant.result	2010-12-21 12:19:48 +0000
@@ -162,7 +162,9 @@ USE bug42217_db;
 DROP FUNCTION upgrade_del_func;
 DROP FUNCTION upgrade_alter_func;
 DROP DATABASE bug42217_db;
+SET SQL_LOG_BIN= 0;
 DROP USER 'create_rout_db'@'localhost';
+SET SQL_LOG_BIN= 1;
 include/rpl_reset.inc
 USE test;
 ######## BUG#49119 #######

=== modified file 'mysql-test/suite/rpl/t/rpl_do_grant.test'
--- a/mysql-test/suite/rpl/t/rpl_do_grant.test	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_do_grant.test	2010-12-21 12:19:48 +0000
@@ -208,10 +208,10 @@ DROP DATABASE bug42217_db;
 -- connection master
 
 # user was already dropped in the slave before
-# so no need to wait for the slave to replicate
-# this statement (if it did and we later synced
-# the slave it would end up in an error anyway)
+# so we should not replicate this statement.
+SET SQL_LOG_BIN= 0;
 DROP USER 'create_rout_db'@'localhost';
+SET SQL_LOG_BIN= 1;
 
 # finish entire clean up (remove binlogs)
 # so that we leave a pristine environment for the

=== modified file 'sql/protocol.cc'
--- a/sql/protocol.cc	2010-11-18 16:34:56 +0000
+++ b/sql/protocol.cc	2010-12-21 12:23:49 +0000
@@ -983,8 +983,8 @@ bool Protocol_text::store(const char *fr
 {
   CHARSET_INFO *tocs= this->thd->variables.character_set_results;
 #ifndef DBUG_OFF
-  DBUG_PRINT("info", ("Protocol_text::store field %u (%u): %s", field_pos,
-                      field_count, (length == 0? "" : from)));
+  DBUG_PRINT("info", ("Protocol_text::store field %u (%u): %.*s", field_pos,
+                      field_count, (int) length, (length == 0 ? "" : from)));
   DBUG_ASSERT(field_pos < field_count);
   DBUG_ASSERT(field_types == 0 ||
 	      field_types[field_pos] == MYSQL_TYPE_DECIMAL ||

No bundle (reason: revision is a merge).