2806 Tomas Ulin 2009-01-08
Bug #41858 ndb.ndb_discover_db2 fails in pushbuild due to unexpected state
removed:
mysql-test/suite/ndb/r/ndb_discover_db2.result
mysql-test/suite/ndb/t/ndb_discover_db2-master.opt
mysql-test/suite/ndb/t/ndb_discover_db2.test
modified:
mysql-test/suite/ndb/r/ndb_discover_db.result
mysql-test/suite/ndb/t/ndb_discover_db.test
2805 Tomas Ulin 2009-01-08 [merge]
merge
modified:
mysql-test/t/disabled.def
storage/csv/ha_tina.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_discover_db.result'
--- a/mysql-test/suite/ndb/r/ndb_discover_db.result 2008-09-30 09:14:44 +0000
+++ b/mysql-test/suite/ndb/r/ndb_discover_db.result 2009-01-08 15:25:30 +0000
@@ -5,3 +5,31 @@ create table discover_db.t1 (a int key,
create database discover_db_2;
alter database discover_db_2 character set binary;
create table discover_db_2.t1 (a int key, b int) engine ndb;
+show create database discover_db;
+Database Create Database
+discover_db CREATE DATABASE `discover_db` /*!40100 DEFAULT CHARACTER SET latin1 */
+show create database discover_db_2;
+Database Create Database
+discover_db_2 CREATE DATABASE `discover_db_2` /*!40100 DEFAULT CHARACTER SET binary */
+reset master;
+insert into discover_db.t1 values (1,1);
+show binlog events from <binlog_start>;
+Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query 1 # BEGIN
+master-bin.000001 # Table_map 1 # table_id: # (discover_db.t1)
+master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status)
+master-bin.000001 # Write_rows 1 # table_id: #
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Query 1 # COMMIT
+reset master;
+insert into discover_db_2.t1 values (1,1);
+show binlog events from <binlog_start>;
+Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query 1 # BEGIN
+master-bin.000001 # Table_map 1 # table_id: # (discover_db_2.t1)
+master-bin.000001 # Table_map 1 # table_id: # (mysql.ndb_apply_status)
+master-bin.000001 # Write_rows 1 # table_id: #
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
+master-bin.000001 # Query 1 # COMMIT
+drop database discover_db;
+drop database discover_db_2;
=== removed file 'mysql-test/suite/ndb/r/ndb_discover_db2.result'
--- a/mysql-test/suite/ndb/r/ndb_discover_db2.result 2008-09-30 09:14:44 +0000
+++ b/mysql-test/suite/ndb/r/ndb_discover_db2.result 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-show create database discover_db;
-Database Create Database
-discover_db CREATE DATABASE `discover_db` /*!40100 DEFAULT CHARACTER SET latin1 */
-show create database discover_db_2;
-Database Create Database
-discover_db_2 CREATE DATABASE `discover_db_2` /*!40100 DEFAULT CHARACTER SET binary */
-reset master;
-insert into discover_db.t1 values (1,1);
-show binlog events from <binlog_start>;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin1.000001 # Query 102 # BEGIN
-master-bin1.000001 # Table_map 102 # table_id: # (discover_db.t1)
-master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status)
-master-bin1.000001 # Write_rows 102 # table_id: #
-master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F
-master-bin1.000001 # Query 102 # COMMIT
-reset master;
-insert into discover_db_2.t1 values (1,1);
-show binlog events from <binlog_start>;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin1.000001 # Query 102 # BEGIN
-master-bin1.000001 # Table_map 102 # table_id: # (discover_db_2.t1)
-master-bin1.000001 # Table_map 102 # table_id: # (mysql.ndb_apply_status)
-master-bin1.000001 # Write_rows 102 # table_id: #
-master-bin1.000001 # Write_rows 102 # table_id: # flags: STMT_END_F
-master-bin1.000001 # Query 102 # COMMIT
-drop database discover_db;
-drop database discover_db_2;
=== modified file 'mysql-test/suite/ndb/t/ndb_discover_db.test'
--- a/mysql-test/suite/ndb/t/ndb_discover_db.test 2008-09-30 09:14:44 +0000
+++ b/mysql-test/suite/ndb/t/ndb_discover_db.test 2009-01-08 15:25:30 +0000
@@ -12,6 +12,27 @@ drop database if exists discover_db_2;
# The discovery happens in ndb_discover_db2.test
#
+#
+# Shutdown server 1
+#
+
+-- connection server1
+# Write file to make mysql-test-run.pl expect the "crash", but don't start
+# it until it's told to.
+--write_file $MYSQLTEST_VARDIR/tmp/master0.expect
+wait
+EOF
+# Send shutdown to the connected server and give
+# it 30 seconds to die before zapping it.
+shutdown_server 30;
+# Check server is gone.
+--source include/wait_until_disconnected.inc
+
+#
+# Create databases while server1 is down
+#
+-- connection server2
+
# check that created database is discovered
create database discover_db;
create table discover_db.t1 (a int key, b int) engine ndb;
@@ -21,13 +42,41 @@ create database discover_db_2;
alter database discover_db_2 character set binary;
create table discover_db_2.t1 (a int key, b int) engine ndb;
--- remove_file $MYSQLTEST_VARDIR/master1-data/discover_db/t1.frm
--- remove_file $MYSQLTEST_VARDIR/master1-data/discover_db/t1.ndb
--- remove_file $MYSQLTEST_VARDIR/master1-data/discover_db/db.opt
--- rmdir $MYSQLTEST_VARDIR/master1-data/discover_db
-
--- remove_file $MYSQLTEST_VARDIR/master1-data/discover_db_2/t1.frm
--- remove_file $MYSQLTEST_VARDIR/master1-data/discover_db_2/t1.ndb
--- remove_file $MYSQLTEST_VARDIR/master1-data/discover_db_2/db.opt
--- rmdir $MYSQLTEST_VARDIR/master1-data/discover_db_2
+#
+# Startup server1
+#
+
+-- connection server1
+# Write file to make mysql-test-run.pl start up the server again.
+--append_file $MYSQLTEST_VARDIR/tmp/master0.expect
+restart
+EOF
+# Turn on reconnect.
+--enable_reconnect
+# Call script that will poll the server waiting for it to be back online again.
+--source include/wait_until_connected_again.inc
+# Turn off reconnect again.
+--disable_reconnect
+#
+--disable_query_log
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
+#
+# Now check that databases have been discovered
+#
+
+show create database discover_db;
+show create database discover_db_2;
+reset master;
+insert into discover_db.t1 values (1,1);
+--source include/show_binlog_events2.inc
+reset master;
+insert into discover_db_2.t1 values (1,1);
+--source include/show_binlog_events2.inc
+#
+# Cleanup
+#
+drop database discover_db;
+drop database discover_db_2;
=== removed file 'mysql-test/suite/ndb/t/ndb_discover_db2-master.opt'
--- a/mysql-test/suite/ndb/t/ndb_discover_db2-master.opt 2008-09-30 09:14:44 +0000
+++ b/mysql-test/suite/ndb/t/ndb_discover_db2-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---skip-external-locking
=== removed file 'mysql-test/suite/ndb/t/ndb_discover_db2.test'
--- a/mysql-test/suite/ndb/t/ndb_discover_db2.test 2008-09-30 09:14:44 +0000
+++ b/mysql-test/suite/ndb/t/ndb_discover_db2.test 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
--- source include/have_multi_ndb.inc
--- source include/have_binlog_format_mixed_or_row.inc
-
-#
-# When this test started there no database on disk for server2
-# Check that table has been discovered correctly, and that the
-# binlog is updated correctly
-#
-
--- connection server2
-show create database discover_db;
-show create database discover_db_2;
-reset master;
-insert into discover_db.t1 values (1,1);
---source include/show_binlog_events2.inc
-reset master;
-insert into discover_db_2.t1 values (1,1);
---source include/show_binlog_events2.inc
-
-drop database discover_db;
-drop database discover_db_2;
| Thread |
|---|
| • bzr push into mysql-6.0 branch (tomas.ulin:2805 to 2806) Bug#41858 | Tomas Ulin | 9 Jan |
