bzr push into mysql-next-mr branch (Dao-Gang.Qu:3370 to 3371) Bug#55790

[Dao-Gang.Qu]

 3371 Dao-Gang.Qu@stripped	2010-11-09
      Bug #55790  	Read_Master_Log_Pos is wrong after Slave_IO_Error= ER_NET_PACKET_TOO_LARGE
      
      Post fix.
     @ mysql-test/suite/rpl/t/rpl_packet.test
        Updated for bug#55790

    modified:
      mysql-test/suite/rpl/t/rpl_packet.test
 3370 Vasil Dimov	2010-11-08 [merge]
      Merge mysql-trunk-bugfixing -> mysql-next-mr-bugfixing

    added:
      mysql-test/std_data/bug57108.cnf
      mysql-test/suite/bugs/r/bug57108.result
      mysql-test/suite/bugs/t/bug57108-master.opt
      mysql-test/suite/bugs/t/bug57108.test
      mysql-test/suite/sys_vars/inc/autocommit_func2.inc
      mysql-test/suite/sys_vars/r/autocommit_func2.result
      mysql-test/suite/sys_vars/r/autocommit_func3.result
      mysql-test/suite/sys_vars/t/autocommit_func2-master.opt
      mysql-test/suite/sys_vars/t/autocommit_func2.test
      mysql-test/suite/sys_vars/t/autocommit_func3-master.opt
      mysql-test/suite/sys_vars/t/autocommit_func3.test
    modified:
      CMakeLists.txt
      config/ac-macros/maintainer.m4
      include/my_sys.h
      libmysqld/lib_sql.cc
      mysql-test/mysql-test-run.pl
      mysql-test/r/log_tables.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/t/log_tables.test
      mysys/default.c
      mysys/stacktrace.c
      sql/mysqld.cc
      sql/mysqld.h
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_rename.cc
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-08 02:49:16 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-09 04:28:48 +0000
@@ -201,7 +201,7 @@ INSERT INTO t1 VALUES (REPEAT('a', 2048)
 --let $old_slave_max_allowed_packet= `SELECT @@global.max_allowed_packet`
 SET @@global.max_allowed_packet=1048576;
 # Restart slave session for new settings to take effect.
---connect (slave2, localhost, root)
+--connect (slave2,127.0.0.1,root,,test,$SLAVE_MYPORT,)
 --connection slave2
 
 while($i)
@@ -225,7 +225,8 @@ while($i)
   # Check Relay log contains the Table_map_log_event
   if (!`SELECT INSTR(@b55790_output.1, 'end_log_pos $table_map_log_pos')`)
   {
-    --die **** ERROR **** Table map 'end_log_pos $table_map_log_pos' NOT FOUND in mysqlbinlog output ($flags $outfile.1).
+    --echo **** ERROR **** Table map 'end_log_pos $table_map_log_pos' NOT FOUND in mysqlbinlog output ($flags $outfile.1).
+    --cat_file $outfile.1
   }
 
   # Check the warning is caused

No bundle (reason: useless for push emails).