From: Luis Soares
Date: December 7 2010 2:43pm
Subject: bzr push into mysql-trunk-bugfixing branch (luis.soares:3419 to 3420)
 Bug#58762
List-Archive: http://lists.mysql.com/commits/126217
X-Bug: 58762
Message-Id: <201012071443.oB73r8iu001158@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3420 Luis Soares	2010-12-07 [merge]
      BUG#58762
      
      Autmoerged bzr bundle from bug report into latest 
      mysql-trunk-bugfixing.

    modified:
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/t/rpl_packet.test
 3419 Nirbhay Choubey	2010-12-07 [merge]
      Merging from mysql-5.5-bugteam.

    modified:
      client/mysqladmin.cc
      client/mysqldump.c
      mysql-test/r/plugin_auth.result
      mysql-test/t/plugin_auth.test
=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result	2010-11-09 12:02:20 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result	2010-12-07 01:50:08 +0000
@@ -77,9 +77,7 @@ INSERT INTO t1 VALUES (REPEAT('a', 2048)
 Last_IO_Error = Got a packet bigger than 'max_allowed_packet' bytes
 # Record Read_Master_Log_Pos for the Table_map_log_event
 SET @@global.max_allowed_packet=1048576;
-SET @b55790_output.1= LOAD_FILE('MYSQLTEST_VARDIR/tmp/b55790-mysqlbinlog.1');
 WARNING: The range of printed events ends with a row event or a table map event that does not have the STMT_END_F flag set. This might be because the last statement was not fully written to the log, or because you are using a --stop-position or --stop-datetime that refers to an event in the middle of a statement. The event(s) from the partial statement have not been written to output.
-SET @b55790_output.1= LOAD_FILE('MYSQLTEST_VARDIR/tmp/b55790-mysqlbinlog.1');
 WARNING: The range of printed events ends with a row event or a table map event that does not have the STMT_END_F flag set. This might be because the last statement was not fully written to the log, or because you are using a --stop-position or --stop-datetime that refers to an event in the middle of a statement. The event(s) from the partial statement have not been written to output.
 ==== clean up ====
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-19 10:41:26 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2010-12-07 01:50:08 +0000
@@ -213,17 +213,34 @@ while($i)
   }
 
   --exec $MYSQL_BINLOG $flags $MYSQLD_DATADIR/$relay_log_file 1> $outfile.1 2> $outfile.2
+  -- let POS=$table_map_log_pos
+  -- let FLGS=$flags
+  -- let OUTFILE_1=$outfile.1
 
-  # Load outputs into a variable
-  --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-  --eval SET @b55790_output.1= LOAD_FILE('$outfile.1')
+  -- perl
+$found=0;
+$file= $ENV{'OUTFILE_1'};
+$table_map_log_pos= $ENV{'POS'};
+$flags= $ENV{'FLGS'};
 
-  # Check Relay log contains the Table_map_log_event
-  if (!`SELECT INSTR(@b55790_output.1, 'end_log_pos $table_map_log_pos 	Table_map')`)
-  {
-    --echo **** ERROR **** Table map 'end_log_pos $table_map_log_pos  Table_map' NOT FOUND in mysqlbinlog output ($flags $outfile.1).
-    --cat_file $outfile.1
+open(FILE, "$file") or die("Unable to open $file: $!\n");
+while(<FILE>) {
+  if (/end_log_pos $table_map_log_pos .*Table_map/) {
+    $found=1;
+    break;
   }
+}
+
+if (!$found)
+{
+  print "**** ERROR **** Table map 'end_log_pos $table_map_log_pos  Table_map' NOT FOUND in mysqlbinlog output ($flags $file).";
+  seek(FILE, 0, 0);
+  while($line= <FILE>) {
+    print $line;
+  }
+}
+close(FILE);
+EOF
 
   # Check the warning is caused
   --cat_file $outfile.2

No bundle (reason: useless for push emails).