Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2080 06/02/07 14:51:46 jmiller@stripped +8 -0
More rpl test updates with using ndb as default engine
mysql-test/r/rpl_load_table_from_master.result
1.17 06/02/07 14:50:11 jmiller@stripped +2 -0
Update requested by Lars
mysql-test/t/rpl_load_table_from_master.test
1.7 06/02/07 14:49:55 jmiller@stripped +8 -3
Update requested by Lars
mysql-test/t/disabled.def
1.60 06/02/07 14:49:46 jmiller@stripped +1 -1
Update requested by Lars
mysql-test/r/rpl_err_ignoredtable.result
1.24 06/02/07 13:35:31 jmiller@stripped +3 -3
updated to run with ndb as default
mysql-test/t/rpl_err_ignoredtable.test
1.25 06/02/07 13:35:22 jmiller@stripped +6 -4
updated to run with ndb as default
mysql-test/t/rpl_foreign_key_innodb-slave.opt
1.1 06/02/07 13:27:43 jmiller@stripped +1 -0
Need to ensure that innodb table is created on the slave for this test
mysql-test/t/rpl_foreign_key_innodb-slave.opt
1.0 06/02/07 13:27:43 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_foreign_key_innodb-slave.opt
mysql-test/r/rpl_drop_temp.result
1.4 06/02/07 13:25:43 jmiller@stripped +2 -2
Updated with work around stated by Tomas in bug 16552. NDB does not support temp tables.
mysql-test/t/rpl_drop_temp.test
1.8 06/02/07 13:25:33 jmiller@stripped +9 -2
Updated with work around stated by Tomas in bug 16552. NDB does not support temp tables.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jmiller
# Host: ndb08.mysql.com
# Root: /home/ndbdev/jmiller/clones/mysql-5.1-new
--- 1.3/mysql-test/r/rpl_drop_temp.result 2005-08-11 13:02:40 +02:00
+++ 1.4/mysql-test/r/rpl_drop_temp.result 2006-02-07 13:25:43 +01:00
@@ -5,8 +5,8 @@
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
create database if not exists mysqltest;
-create temporary table mysqltest.t1 (n int);
-create temporary table mysqltest.t2 (n int);
+create temporary table mysqltest.t1 (n int)ENGINE=MyISAM;
+create temporary table mysqltest.t2 (n int)ENGINE=MyISAM;
show status like 'Slave_open_temp_tables';
Variable_name Value
Slave_open_temp_tables 0
--- 1.23/mysql-test/r/rpl_err_ignoredtable.result 2005-12-22 23:00:34 +01:00
+++ 1.24/mysql-test/r/rpl_err_ignoredtable.result 2006-02-07 13:35:31 +01:00
@@ -7,14 +7,14 @@
create table t1 (a int primary key);
create table t4 (a int primary key);
insert into t1 values (1),(1);
-ERROR 23000: Duplicate entry '1' for key 1
+Got one of the listed errors
insert into t4 values (1),(2);
show tables like 't1';
Tables_in_test (t1)
show tables like 't4';
Tables_in_test (t4)
t4
-SELECT * FROM test.t4;
+SELECT * FROM test.t4 ORDER BY a;
a
1
2
@@ -33,7 +33,7 @@
kill @id;
drop table t2,t3;
insert into t4 values (3),(4);
-SELECT * FROM test.t4;
+SELECT * FROM test.t4 ORDER BY a;
a
1
2
--- 1.7/mysql-test/t/rpl_drop_temp.test 2005-09-01 17:27:02 +02:00
+++ 1.8/mysql-test/t/rpl_drop_temp.test 2006-02-07 13:25:33 +01:00
@@ -1,10 +1,17 @@
+##############################################
+# Change Author: JBM
+# Change Date: 2006-02-07
+# Change: Added ENGINE=MyISAM
+# Purpose: According to TU in 16552 This is how
+# to work around NDB's issue with temp tables
+##############################################
source include/master-slave.inc;
--disable_warnings
create database if not exists mysqltest;
--enable_warnings
-create temporary table mysqltest.t1 (n int);
-create temporary table mysqltest.t2 (n int);
+create temporary table mysqltest.t1 (n int)ENGINE=MyISAM;
+create temporary table mysqltest.t2 (n int)ENGINE=MyISAM;
sync_slave_with_master;
connection master;
disconnect master;
--- 1.24/mysql-test/t/rpl_err_ignoredtable.test 2005-12-22 22:59:58 +01:00
+++ 1.25/mysql-test/t/rpl_err_ignoredtable.test 2006-02-07 13:35:22 +01:00
@@ -1,15 +1,17 @@
# Test for
# Bug #797: If a query is ignored on slave (replicate-ignore-table) the slave
# still checks that it has the same error as on the master.
+##########################################################################
+# 2006-02-07 JBM Added error code 1022 for NDB Engine + ORDER BY
+##########################################################################
-# Requires statement logging
-- source include/master-slave.inc
connection master;
create table t1 (a int primary key);
create table t4 (a int primary key);
# generate an error that goes to the binlog
---error 1062
+--error 1022, 1062
insert into t1 values (1),(1);
insert into t4 values (1),(2);
save_master_pos;
@@ -19,7 +21,7 @@
# check that the table has been ignored, because otherwise the test is nonsense
show tables like 't1';
show tables like 't4';
-SELECT * FROM test.t4;
+SELECT * FROM test.t4 ORDER BY a;
connection master;
drop table t1;
save_master_pos;
@@ -53,7 +55,7 @@
save_master_pos;
connection slave;
sync_with_master;
-SELECT * FROM test.t4;
+SELECT * FROM test.t4 ORDER BY a;
connection master1;
DROP TABLE test.t4;
--- New file ---
+++ mysql-test/t/rpl_foreign_key_innodb-slave.opt 06/02/07 13:27:43
--innodb
--- 1.59/mysql-test/t/disabled.def 2006-02-07 00:17:04 +01:00
+++ 1.60/mysql-test/t/disabled.def 2006-02-07 14:49:46 +01:00
@@ -30,6 +30,6 @@
#ndb_alter_table_row : sometimes wrong error 1015!=1046
ndb_gis : garbled msgs from corrupt THD*
rpl_ndb_auto_inc : MySQL Bugs:17086
-rpl_ndb_relay_space : Results are not deterministic
+rpl_ndb_relay_space : Bug 16993
ndb_binlog_ddl_multi : Bug #17038
rpl_ndb_log : MySQL Bugs: #17158
--- 1.6/mysql-test/t/rpl_load_table_from_master.test 2006-02-03 14:23:53 +01:00
+++ 1.7/mysql-test/t/rpl_load_table_from_master.test 2006-02-07 14:49:55 +01:00
@@ -15,15 +15,14 @@
############################################################
# REQUIREMENT TEST 1:
# LOAD TABLE FROM MASTER must work with a forced timestamp.
-#
-# REQUIREMENTi TEST 2:
-#LOAD TABLE FROM MASTER must work with table checksum
############################################################
#
# Test forced timestamp
#
-- source include/master-slave.inc
+-- echo "******************** Test Requirment 1 *************"
+
# Don't log table creating to the slave as we want to test LOAD TABLE
SET SQL_LOG_BIN=0,timestamp=200006;
eval CREATE TABLE t1(t TIMESTAMP NOT NULL,a CHAR(1))ENGINE=MyISAM;
@@ -48,6 +47,12 @@
# Don't log table creating to the slave as we want to test LOAD TABLE
set SQL_LOG_BIN=0;
+
+#######################################################
+# REQUIREMENTi TEST 2:
+#LOAD TABLE FROM MASTER must work with table checksum
+#######################################################
+-- echo "******************** Test Requirment 2 *************"
eval CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;
INSERT INTO t1 VALUES (1);
--- 1.16/mysql-test/r/rpl_load_table_from_master.result 2006-02-03 14:24:16 +01:00
+++ 1.17/mysql-test/r/rpl_load_table_from_master.result 2006-02-07 14:50:11 +01:00
@@ -4,6 +4,7 @@
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
+"******************** Test Requirment 1 *************"
SET SQL_LOG_BIN=0,timestamp=200006;
CREATE TABLE t1(t TIMESTAMP NOT NULL,a CHAR(1))ENGINE=MyISAM;
INSERT INTO t1 ( a) VALUE ('F');
@@ -17,6 +18,7 @@
set SQL_LOG_BIN=1,timestamp=default;
drop table t1;
set SQL_LOG_BIN=0;
+"******************** Test Requirment 2 *************"
CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;
INSERT INTO t1 VALUES (1);
load table t1 from master;
| Thread |
|---|
| • bk commit into 5.1 tree (jmiller:1.2080) | Jonathan Miller | 7 Feb |
