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.2099 06/02/10 12:52:35 jmiller@stripped +17 -0
test updates
mysql-test/t/rpl_ndb_sp003.test
1.1 06/02/09 23:18:10 jmiller@stripped +9 -0
Wrapper to use same code for testing NDB that is used for InnoDB Currently
mysql-test/t/rpl_ndb_sp003.test
1.0 06/02/09 23:18:10 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_sp003.test
mysql-test/r/rpl_ndb_sp003.result
1.1 06/02/09 23:17:56 jmiller@stripped +49 -0
New results file
mysql-test/r/rpl_ndb_sp003.result
1.0 06/02/09 23:17:56 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_sp003.result
mysql-test/extra/rpl_tests/rpl_row_sp003.test
1.2 06/02/09 23:17:36 jmiller@stripped +4 -1
Augmented for use with NDB due to injector thread not populating the bin log before sync with master is done
mysql-test/t/rpl_ndb_sp006.test
1.2 06/02/09 23:02:26 jmiller@stripped +3 -0
Added comment
mysql-test/t/rpl_ndb_sp007.test
1.2 06/02/09 23:02:21 jmiller@stripped +3 -0
Added comment
mysql-test/r/rpl_ndb_sp007.result
1.1 06/02/09 22:57:22 jmiller@stripped +50 -0
New results file
mysql-test/r/rpl_ndb_sp007.result
1.0 06/02/09 22:57:22 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_sp007.result
mysql-test/t/rpl_ndb_sp007.test
1.1 06/02/09 22:57:07 jmiller@stripped +6 -0
Wrapper to use same code for testing NDB that is used for InnoDB Currently
mysql-test/t/rpl_ndb_sp007.test
1.0 06/02/09 22:57:07 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_sp007.test
mysql-test/t/disabled.def
1.61 06/02/09 22:55:58 jmiller@stripped +5 -4
updated 17290
mysql-test/t/rpl_row_sp007_innodb-slave.opt
1.1 06/02/09 22:29:05 jmiller@stripped +1 -0
Ensure slave tables are created as innodb
mysql-test/t/rpl_row_sp007_innodb-slave.opt
1.0 06/02/09 22:29:05 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_row_sp007_innodb-slave.opt
mysql-test/r/rpl_ndb_sp006.result
1.1 06/02/09 22:23:18 jmiller@stripped +45 -0
New results file
mysql-test/r/rpl_ndb_sp006.result
1.0 06/02/09 22:23:18 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_sp006.result
mysql-test/t/rpl_ndb_sp006.test
1.1 06/02/09 22:22:45 jmiller@stripped +6 -0
Wrapper to use same code for testing NDB that is used for InnoDB Currently
mysql-test/t/rpl_ndb_sp006.test
1.0 06/02/09 22:22:45 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_sp006.test
mysql-test/r/rpl_ndb_dd_basic.result
1.3 06/02/09 22:10:47 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl_ndb_dd_basic.result -> mysql-test/r/rpl_ndb_dd_basic.result
mysql-test/t/rpl_ndb_dd_basic.result
1.2 06/02/09 22:10:26 jmiller@stripped +0 -0
Rename: mysql-test/r/rpl_ndb_disk.result -> mysql-test/t/rpl_ndb_dd_basic.result
mysql-test/t/rpl_ndb_dd_basic.test
1.2 06/02/09 22:10:06 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl_ndb_disk.test -> mysql-test/t/rpl_ndb_dd_basic.test
mysql-test/r/rpl_ndb_idempotent.result
1.2 06/02/09 19:29:15 jmiller@stripped +1 -0
Updated result files
mysql-test/r/rpl_ndb_sync.result
1.3 06/02/09 19:29:08 jmiller@stripped +2 -1
Updated result files
mysql-test/r/rpl_trigger.result
1.4 06/02/09 19:29:00 jmiller@stripped +3 -0
Updated result files
mysql-test/t/rpl_ndb_idempotent.test
1.2 06/02/09 19:28:33 jmiller@stripped +5 -0
Test cleanup
mysql-test/t/rpl_ndb_sync.test
1.4 06/02/09 19:28:24 jmiller@stripped +4 -2
Test cleanup
mysql-test/t/rpl_trigger.test
1.6 06/02/09 19:28:14 jmiller@stripped +8 -1
Test cleanup
# 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
--- New file ---
+++ mysql-test/r/rpl_ndb_sp003.result 06/02/09 23:17:56
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
DROP PROCEDURE IF EXISTS test.p1;
DROP PROCEDURE IF EXISTS test.p2;
DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1(a INT,PRIMARY KEY(a))ENGINE=NDBCLUSTER;
CREATE PROCEDURE test.p1()
BEGIN
INSERT INTO test.t1 VALUES (4);
SELECT get_lock("test", 100);
UPDATE test.t1 set a=a+4 WHERE a=4;
END|
CREATE PROCEDURE test.p2()
BEGIN
UPDATE test.t1 SET a=a+1;
END|
SELECT get_lock("test", 200);
get_lock("test", 200)
1
CALL test.p1();
CALL test.p2();
SELECT release_lock("test");
release_lock("test")
1
SELECT * FROM test.t1;
a
5
SELECT * FROM test.t1;
a
5
DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1(a INT,PRIMARY KEY(a))ENGINE=NDBCLUSTER;
CALL test.p2();
CALL test.p1();
get_lock("test", 100)
0
SELECT * FROM test.t1;
a
8
SELECT * FROM test.t1;
a
8
DROP PROCEDURE IF EXISTS test.p1;
DROP PROCEDURE IF EXISTS test.p2;
DROP TABLE IF EXISTS test.t1;
--- New file ---
+++ mysql-test/r/rpl_ndb_sp006.result 06/02/09 22:23:18
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
create database if not exists mysqltest1;
DROP PROCEDURE IF EXISTS mysqltest1.p1;
DROP PROCEDURE IF EXISTS mysqltest1.p2;
DROP TABLE IF EXISTS mysqltest1.t2;
DROP TABLE IF EXISTS mysqltest1.t1;
CREATE TABLE IF NOT EXISTS mysqltest1.t1(name CHAR(16), birth DATE,PRIMARY KEY(name))ENGINE=NDBCLUSTER;
CREATE TABLE IF NOT EXISTS mysqltest1.t2(name CHAR(16), age INT ,PRIMARY KEY(name))ENGINE=NDBCLUSTER;
CREATE PROCEDURE mysqltest1.p1()
BEGIN
DECLARE done INT DEFAULT 0;
DECLARE spa CHAR(16);
DECLARE spb INT;
DECLARE cur1 CURSOR FOR SELECT name,
(YEAR(CURDATE())-YEAR(birth))-(RIGHT(CURDATE(),5)<RIGHT(birth,5))
FROM mysqltest1.t1;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;
OPEN cur1;
SET AUTOCOMMIT=0;
REPEAT
FETCH cur1 INTO spa, spb;
IF NOT done THEN
START TRANSACTION;
INSERT INTO mysqltest1.t2 VALUES (spa,spb);
COMMIT;
END IF;
UNTIL done END REPEAT;
SET AUTOCOMMIT=1;
CLOSE cur1;
END|
CREATE PROCEDURE mysqltest1.p2()
BEGIN
INSERT INTO mysqltest1.t1 VALUES ('MySQL','1993-02-04'),('ROCKS', '1990-08-27'),('Texas', '1999-03-30'),('kyle','2005-1-1');
END|
CALL mysqltest1.p2();
CALL mysqltest1.p1();
DROP PROCEDURE IF EXISTS mysqltest1.p1;
DROP PROCEDURE IF EXISTS mysqltest1.p2;
DROP TABLE IF EXISTS mysqltest1.t1;
DROP TABLE IF EXISTS mysqltest1.t2;
--- New file ---
+++ mysql-test/r/rpl_ndb_sp007.result 06/02/09 22:57:22
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1;
CREATE PROCEDURE test.p1(IN i INT)
BEGIN
DECLARE CONTINUE HANDLER FOR sqlexception BEGIN END;
DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (num INT,PRIMARY KEY(num))ENGINE=NDBCLUSTER;
START TRANSACTION;
INSERT INTO test.t1 VALUES(i);
savepoint t1_save;
INSERT INTO test.t1 VALUES (14);
ROLLBACK to savepoint t1_save;
COMMIT;
END|
< ---- Master selects-- >
-------------------------
CALL test.p1(12);
Warnings:
Note 1051 Unknown table 't1'
SELECT * FROM test.t1;
num
12
< ---- Slave selects-- >
------------------------
SELECT * FROM test.t1;
num
12
< ---- Master selects-- >
-------------------------
CALL test.p1(13);
SELECT * FROM test.t1;
num
13
< ---- Slave selects-- >
------------------------
SELECT * FROM test.t1;
num
13
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1;
--- New file ---
+++ mysql-test/t/rpl_ndb_sp003.test 06/02/09 23:18:10
#################################
# Wrapper for rpl_row_sp003.test#
# These tests have been wrapped #
# so the same code can be used #
# For different engines #
#################################
-- source include/have_ndb.inc
let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_sp003.test
--- New file ---
+++ mysql-test/t/rpl_ndb_sp006.test 06/02/09 22:22:45
#################################
# Wrapper for rpl_row_sp006.test#
# These tests have been wrapped #
# so the same code can be used #
# For different engines #
#################################
-- source include/have_ndb.inc
let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_sp006.test
--- New file ---
+++ mysql-test/t/rpl_ndb_sp007.test 06/02/09 22:57:07
#################################
# Wrapper for rpl_row_sp007.test#
# These tests have been wrapped #
# so the same code can be used #
# For different engines #
#################################
-- source include/have_ndb.inc
let $engine_type=NDBCLUSTER;
-- source extra/rpl_tests/rpl_row_sp007.test
--- New file ---
+++ mysql-test/t/rpl_row_sp007_innodb-slave.opt 06/02/09 22:29:05
--innodb
--- 1.60/mysql-test/t/disabled.def 2006-02-07 14:49:46 +01:00
+++ 1.61/mysql-test/t/disabled.def 2006-02-09 22:55:58 +01:00
@@ -27,9 +27,10 @@
rpl_sp : Bug #16456
ndb_autodiscover : Needs to be fixed w.r.t binlog
ndb_autodiscover2 : Needs to be fixed w.r.t binlog
-#ndb_alter_table_row : sometimes wrong error 1015!=1046
+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 : Bug 16993
+rpl_ndb_auto_inc : Bug #17086
+rpl_ndb_relay_space : Bug #16993
ndb_binlog_ddl_multi : Bug #17038
-rpl_ndb_log : MySQL Bugs: #17158
+rpl_ndb_log : Bug #17158
+rpl_ndb_sp007 : Bug #17290
--- 1.1/mysql-test/extra/rpl_tests/rpl_row_sp003.test 2005-12-22 06:34:50 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_row_sp003.test 2006-02-09 23:17:36 +01:00
@@ -46,7 +46,10 @@
SELECT release_lock("test");
SELECT * FROM test.t1;
#show binlog events;
-
+# Added sleep for use with NDB to ensure that
+# the injector thread will populate log before
+# we switch to the slave.
+sleep 5;
sync_slave_with_master;
connection slave;
SELECT * FROM test.t1;
--- 1.3/mysql-test/r/rpl_trigger.result 2005-12-11 15:06:27 +01:00
+++ 1.4/mysql-test/r/rpl_trigger.result 2006-02-09 19:29:00 +01:00
@@ -4,6 +4,9 @@
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
create table t1 (a int auto_increment, primary key (a), b int, rand_value double not null);
create table t2 (a int auto_increment, primary key (a), b int);
create table t3 (a int auto_increment, primary key (a), name varchar(64) not null, old_a int, old_b int, rand_value double not null);
--- 1.5/mysql-test/t/rpl_trigger.test 2005-12-22 05:10:52 +01:00
+++ 1.6/mysql-test/t/rpl_trigger.test 2006-02-09 19:28:14 +01:00
@@ -3,7 +3,14 @@
# Adding statement include due to Bug 12574
# TODO: Remove statement include once 12574 is patched
--source include/have_binlog_format_statement.inc
-source include/master-slave.inc;
+--source include/master-slave.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+--enable_warnings
#
# #12482: Triggers has side effects with auto_increment values
--- 1.1/mysql-test/r/rpl_ndb_idempotent.result 2006-01-12 19:50:40 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_idempotent.result 2006-02-09 19:29:15 +01:00
@@ -70,3 +70,4 @@
SHOW SLAVE STATUS;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master>
+DROP TABLE IF EXISTS t1;
--- 1.2/mysql-test/r/rpl_ndb_sync.result 2006-02-08 23:05:25 +01:00
+++ 1.3/mysql-test/r/rpl_ndb_sync.result 2006-02-09 19:29:08 +01:00
@@ -25,12 +25,13 @@
0 1 BCDEF
1 0 CD
0 0 DEFGHIJKL
-CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
+CREATE TEMPORARY TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
DELETE FROM cluster_replication.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
@the_backup_id:=backup_id
<the_backup_id>
+DROP TABLE cluster_replication.backup_info;
UPDATE t1 SET c2=0 WHERE c3="row2";
SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
hex(c1) hex(c2) c3
--- 1.1/mysql-test/t/rpl_ndb_idempotent.test 2006-01-12 19:50:46 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_idempotent.test 2006-02-09 19:28:33 +01:00
@@ -109,3 +109,8 @@
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master>
SHOW SLAVE STATUS;
+
+connection master;
+DROP TABLE IF EXISTS t1;
+
+# End of 5.1 Test
--- 1.3/mysql-test/t/rpl_ndb_sync.test 2006-02-08 23:05:14 +01:00
+++ 1.4/mysql-test/t/rpl_ndb_sync.test 2006-02-09 19:28:24 +01:00
@@ -27,13 +27,13 @@
# take a backup on master
--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT
--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > var/tmp.dat
-CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
+CREATE TEMPORARY TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
DELETE FROM cluster_replication.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
--replace_column 1 <the_backup_id>
SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
let the_backup_id=`select @the_backup_id` ;
-
+DROP TABLE cluster_replication.backup_info;
# update a row
UPDATE t1 SET c2=0 WHERE c3="row2";
SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
@@ -130,3 +130,5 @@
reset slave;
# should now contain nothing
select * from cluster_replication.apply_status;
+
+# End 5.1 Test
| Thread |
|---|
| • bk commit into 5.1 tree (jmiller:1.2099) | Jonathan Miller | 10 Feb |
