bzr push into mysql-5.1 branch (sven:2704 to 2705) Bug#38077, Bug#38178

[Sven Sandberg]

 2705 Sven Sandberg	2008-07-18
      BUG#38077: rpl_incident At line 22: query 'SELECT * ...' Table 'test.t1' doesn't
exist
      This is not a fix to the bug. It only adds debug info, so
      that we can analyze the bug better next time it happens.
      Please revert the patch after the bug is fixed.
modified:
  mysql-test/suite/rpl/t/rpl_incident.test

 2704 Sven Sandberg	2008-07-18
      BUG#38178: rpl_loaddata_map fails sporadically in pushbuild
      Problem: master binlog has 'create table t1'. Master binlog
      was removed before slave could replicate it. In test's cleanup
      code, master did 'drop table t1', which caused slave sql
      thread to stop with an error since slave sql thread did not
      know about t1.
      Fix: t1 is just an auxiliary construction, only needed on
      master. Hence, we turn off binlogging before t1 is created,
      drop t1 as soon as we don't need it anymore, and then turn
      on binlogging again.
modified:
  mysql-test/include/show_binlog_events.inc
  mysql-test/suite/rpl/r/rpl_loaddata_map.result
  mysql-test/suite/rpl/t/rpl_loaddata_map.test

=== modified file 'mysql-test/suite/rpl/t/rpl_incident.test'
--- a/mysql-test/suite/rpl/t/rpl_incident.test	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_incident.test	2008-07-18 13:07:14 +0000
@@ -19,6 +19,37 @@ connection slave;
 # The 4 should not be inserted into the table, since the incident log
 # event should have stop the slave.
 --echo **** On Slave ****
+#### BEGIN DEBUG INFO ADDED BY SVEN 2008-07-18 -- SEE BUG#38077 ####
+let $tables= query_get_value(SHOW TABLES, Tables_in_test, 1);
+if (`SELECT '$tables' != 't1'`)
+{
+  --echo **** TEST CASE BUG! PRINTING DEBUG INFO! ****
+  --echo **** Dear developer, if you see this in the output of a test
+  --echo **** case run, please add all the information below as a
+  --echo **** comment to BUG#38077. If it's a pushbuild failure, please
+  --echo **** include a link to the push page.
+  --echo **** Thank you! /Sven
+  SHOW BINLOG EVENTS;
+  --echo **** master binlog ****
+  --error 0,1
+  --exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001
+  --echo **** slave binlog ****
+  --error 0,1
+  --exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/slave-bin.000001
+  --echo **** slave status ****
+  query_vertical SHOW SLAVE STATUS;
+  --echo **** slave's master status ****
+  SHOW MASTER STATUS;
+  --echo **** slave binlog events ****
+  --echo [on master]
+  connection master;
+  --echo **** master status ****
+  SHOW MASTER STATUS;
+  --echo **** master binlog events ****
+  SHOW BINLOG EVENTS;
+  exit;
+}
+#### END DEBUG INFO ####
 SELECT * FROM t1;
 
 --replace_result $MASTER_MYPORT MASTER_PORT