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.2097 06/02/15 14:02:47 jmiller@stripped +10 -0
Test updates
mysql-test/r/rpl_ndb_trig004.result
1.1 06/02/14 23:59:04 jmiller@stripped +30 -0
New result
mysql-test/r/rpl_ndb_trig004.result
1.0 06/02/14 23:59:04 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_trig004.result
mysql-test/t/rpl_ndb_trig004.test
1.1 06/02/14 23:55:39 jmiller@stripped +15 -0
New wrapper for ndb
mysql-test/t/rpl_ndb_trig004.test
1.0 06/02/14 23:55:39 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_trig004.test
mysql-test/r/rpl_row_trig004.result
1.2 06/02/14 23:55:13 jmiller@stripped +1 -0
Updated
mysql-test/t/rpl_row_trig004.test
1.2 06/02/14 23:54:59 jmiller@stripped +4 -0
Updated
mysql-test/extra/rpl_tests/rpl_trig004.test
1.2 06/02/14 23:54:38 jmiller@stripped +9 -2
Updated
mysql-test/t/rpl_EE_err.test
1.4 06/02/14 23:03:25 jmiller@stripped +5 -0
Updated wrapper
mysql-test/t/rpl_delete_no_where.test
1.3 06/02/14 22:58:51 jmiller@stripped +1 -1
Fix typo
mysql-test/t/disabled.def
1.67 06/02/14 22:38:19 jmiller@stripped +1 -0
Added test to be diabled
mysql-test/r/rpl_ndb_delete_nowhere.result
1.1 06/02/14 22:36:30 jmiller@stripped +15 -0
new reults file
mysql-test/r/rpl_ndb_delete_nowhere.result
1.0 06/02/14 22:36:30 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_delete_nowhere.result
mysql-test/t/rpl_ndb_delete_nowhere.test
1.1 06/02/14 22:35:24 jmiller@stripped +6 -0
new wrapper for NDB engine
mysql-test/t/rpl_ndb_delete_nowhere.test
1.0 06/02/14 22:35:24 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_delete_nowhere.test
mysql-test/t/rpl_delete_no_where.test
1.2 06/02/14 22:34:54 jmiller@stripped +4 -0
Updated wrapper
# 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_delete_nowhere.result 06/02/14 22:36:30
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 table t1 (a int, b int) engine=NDB;
insert into t1 values(1,1);
select * from t1;
a b
1 1
delete from t1;
select * from t1;
a b
drop table t1;
--- New file ---
+++ mysql-test/r/rpl_ndb_trig004.result 06/02/14 23:59:04
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 TRIGGER test.t1_bi_t2;
DROP TABLE IF EXISTS test.t1;
DROP TABLE IF EXISTS test.t2;
CREATE TABLE test.t1 (n MEDIUMINT NOT NULL AUTO_INCREMENT, d FLOAT, PRIMARY KEY(n))ENGINE=NDB;
CREATE TABLE test.t2 (n MEDIUMINT NOT NULL, f FLOAT, PRIMARY KEY(n))ENGINE=NDB;
CREATE TRIGGER test.t1_bi_t2 BEFORE INSERT ON test.t2 FOR EACH ROW INSERT INTO test.t1 VALUES (NULL, 1.234)//
INSERT INTO test.t2 VALUES (1, 0.0);
INSERT INTO test.t2 VALUES (1, 0.0);
Got one of the listed errors
select * from test.t1;
n d
1 1.234
select * from test.t2;
n f
1 0
select * from test.t1;
n d
1 1.234
select * from test.t2;
n f
1 0
DROP TRIGGER test.t1_bi_t2;
DROP TABLE test.t1;
DROP TABLE test.t2;
--- New file ---
+++ mysql-test/t/rpl_ndb_delete_nowhere.test 06/02/14 22:35:24
#########################################
# By JBM 2006-02-14 Test wrapping to #
# Share test code between engine tests #
#########################################
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_delete_no_where.test
--- New file ---
+++ mysql-test/t/rpl_ndb_trig004.test 06/02/14 23:55:39
#############################################################################
# Original Author: JBM #
# Original Date: 2006-02-14 #
#############################################################################
# TEST: Use before insert triggers and has the second insert fail #
# Test is wrapped to save code and share between engines #
#############################################################################
# Includes
-- source include/have_binlog_format_row.inc
-- source include/have_ndb.inc
-- source include/master-slave.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_trig004.test
--- 1.66/mysql-test/t/disabled.def 2006-02-14 14:35:52 +01:00
+++ 1.67/mysql-test/t/disabled.def 2006-02-14 22:38:19 +01:00
@@ -26,6 +26,7 @@
rpl_ddl : Bug#15963 SBR does not show "Definer" correctly
rpl_ndb_auto_inc : Bug#17086
rpl_ndb_basic : Bug#16228 [IN REVIEW]
+rpl_ndb_delete_nowhere : Bug#17400: Cluster Replication: delete of rows in table without pk fails
rpl_ndb_relay_space : Bug#16993
rpl_ndb_sp007 : Bug #17290
rpl_sp : Bug#16456
--- 1.1/mysql-test/extra/rpl_tests/rpl_trig004.test 2005-12-22 06:34:51 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_trig004.test 2006-02-14 23:54:38 +01:00
@@ -5,7 +5,10 @@
# TEST: Use after insert and before inset triggers and stored procdures to #
# Update and insert data #
#############################################################################
-
+# Change Auth: JBM #
+# Date: 2006-02-14 #
+# Change: Added error, sleep and comments (ndb) #
+####################################################
# Begin clean up test section
connection master;
@@ -25,12 +28,16 @@
delimiter ;//
INSERT INTO test.t2 VALUES (1, 0.0);
---error 0,1062
+# Expect duplicate error 1022 == ndb
+--error 1022,1062
INSERT INTO test.t2 VALUES (1, 0.0);
#show binlog events;
select * from test.t1;
select * from test.t2;
+# Have to sleep for a few seconds to allow
+# NDB injector thread to populate binlog
+sleep 10;
sync_slave_with_master;
connection slave;
select * from test.t1;
--- 1.1/mysql-test/r/rpl_row_trig004.result 2005-12-22 06:34:57 +01:00
+++ 1.2/mysql-test/r/rpl_row_trig004.result 2006-02-14 23:55:13 +01:00
@@ -12,6 +12,7 @@
CREATE TRIGGER test.t1_bi_t2 BEFORE INSERT ON test.t2 FOR EACH ROW INSERT INTO test.t1 VALUES (NULL, 1.234)//
INSERT INTO test.t2 VALUES (1, 0.0);
INSERT INTO test.t2 VALUES (1, 0.0);
+Got one of the listed errors
select * from test.t1;
n d
1 1.234
--- 1.1/mysql-test/t/rpl_delete_no_where.test 2005-12-22 06:34:59 +01:00
+++ 1.3/mysql-test/t/rpl_delete_no_where.test 2006-02-14 22:58:51 +01:00
@@ -1,2 +1,6 @@
+###################################################
+# By JBM 2006-02-14 added to skip test when NDB #
+##################################################
+-- source include/not_ndb_default.inc
let $engine_type=myisam;
-- source extra/rpl_tests/rpl_delete_no_where.test
--- 1.1/mysql-test/t/rpl_row_trig004.test 2005-12-22 06:35:06 +01:00
+++ 1.2/mysql-test/t/rpl_row_trig004.test 2006-02-14 23:54:59 +01:00
@@ -4,8 +4,12 @@
#############################################################################
# TEST: Use before insert triggers and has the second insert fail #
#############################################################################
+# Change by JBM 2006-02-14 added to skip when NDB default engine #
+# This test has been wrapped to allow multipal engines to use same code #
+#############################################################################
# Includes
+-- source include/not_ndb_default.inc
-- source include/have_binlog_format_row.inc
-- source include/have_innodb.inc
-- source include/master-slave.inc
--- 1.3/mysql-test/t/rpl_EE_err.test 2006-01-11 19:34:55 +01:00
+++ 1.4/mysql-test/t/rpl_EE_err.test 2006-02-14 23:03:25 +01:00
@@ -1,2 +1,7 @@
+########################################################
+# By JBM 2006-02-14 Wrapped to share test code between #
+# engines. Added to skip test when NDB is default #
+########################################################
+-- source include/not_ndb_default.inc
let $engine_type=myisam;
-- source extra/rpl_tests/rpl_EE_err.test
| Thread |
|---|
| • bk commit into 5.1 tree (jmiller:1.2097) | Jonathan Miller | 15 Feb |
