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.2085 06/02/08 16:52:34 jmiller@stripped +10 -0
Merge jmiller@stripped:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
mysql-test/t/rpl_load_from_master.test
1.27 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734
1.16 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a
1.10 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
mysql-test/t/rpl_skip_error.test
1.8 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
mysql-test/t/rpl_replicate_do.test
1.27 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
mysql-test/t/rpl_load_from_master.test
1.26 06/02/08 16:52:26 jmiller@stripped +0 -0
Merge rename: mysql-test/t/rpl000009.test -> mysql-test/t/rpl_load_from_master.test
mysql-test/r/rpl_skip_error.result
1.8 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
mysql-test/r/rpl_row_log.result
1.3 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
mysql-test/r/rpl_replicate_do.result
1.35 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
mysql-test/r/rpl_insert_id.result
1.15 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
mysql-test/extra/rpl_tests/rpl_log.test
1.30 06/02/08 16:52:26 jmiller@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734
1.15 06/02/08 16:52:26 jmiller@stripped +0 -0
Merge rename: mysql-test/t/rpl000004.test -> BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a
1.9 06/02/08 16:52:26 jmiller@stripped +0 -0
Merge rename: mysql-test/r/rpl000004.result -> BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a
# 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/RESYNC
--- 1.2/mysql-test/r/rpl_row_log.result 2006-02-06 23:06:17 +01:00
+++ 1.3/mysql-test/r/rpl_row_log.result 2006-02-08 16:52:26 +01:00
@@ -12,7 +12,7 @@
insert into t1 values (NULL);
drop table t1;
create table t1 (word char(20) not null)ENGINE=MyISAM;
-load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
+load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
select count(*) from t1;
count(*)
69
--- 1.14/mysql-test/r/rpl_insert_id.result 2006-02-07 19:18:27 +01:00
+++ 1.15/mysql-test/r/rpl_insert_id.result 2006-02-08 16:52:26 +01:00
@@ -9,13 +9,13 @@
insert into t1 values (1),(2),(3);
insert into t1 values (null);
insert into t2 values (null,last_insert_id());
-select * from t1;
+select * from t1 ORDER BY a;
a
1
2
3
4
-select * from t2;
+select * from t2 ORDER BY b;
b c
1 4
drop table t1;
@@ -45,21 +45,21 @@
insert into t1 values (10);
insert into t1 values (null),(null),(null);
insert into t2 values (5,0);
-insert into t2 (c) select * from t1;
-select * from t2;
+insert into t2 (c) select * from t1 ORDER BY a;
+select * from t2 ORDER BY b;
b c
5 0
6 10
7 11
8 12
9 13
-select * from t1;
+select * from t1 ORDER BY a;
a
10
11
12
13
-select * from t2;
+select * from t2 ORDER BY b;
b c
5 0
6 10
@@ -72,4 +72,4 @@
CREATE TABLE t1 ( a INT UNIQUE );
SET FOREIGN_KEY_CHECKS=0;
INSERT INTO t1 VALUES (1),(1);
-ERROR 23000: Duplicate entry '1' for key 1
+Got one of the listed errors
--- 1.34/mysql-test/r/rpl_replicate_do.result 2006-02-07 20:54:34 +01:00
+++ 1.35/mysql-test/r/rpl_replicate_do.result 2006-02-08 16:52:26 +01:00
@@ -16,7 +16,7 @@
update t1 set m=20 where m=16;
delete from t1 where m=17;
create table t11 select * from t1;
-select * from t1;
+select * from t1 ORDER BY m;
m
15
20
--- 1.8/mysql-test/r/rpl000004.result 2006-01-24 08:30:46 +01:00
+++ 1.10/BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a 2006-02-08 16:52:26 +01:00
@@ -5,11 +5,11 @@
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
set SQL_LOG_BIN=0;
-create table t1 (word char(20) not null, index(word));
+create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
load data infile '../std_data_ln/words.dat' into table t1;
-create table t2 (word char(20) not null);
+create table t2 (word char(20) not null)ENGINE=MyISAM;
load data infile '../std_data_ln/words.dat' into table t2;
-create table t3 (word char(20) not null primary key);
+create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
load table t1 from master;
load table t2 from master;
load table t3 from master;
--- 1.7/mysql-test/r/rpl_skip_error.result 2006-01-26 17:54:27 +01:00
+++ 1.8/mysql-test/r/rpl_skip_error.result 2006-02-08 16:52:26 +01:00
@@ -8,7 +8,7 @@
insert into t1 values (1);
insert into t1 values (1);
insert into t1 values (2),(3);
-select * from t1;
+select * from t1 ORDER BY n;
n
1
2
--- 1.14/mysql-test/t/rpl000004.test 2006-01-24 08:30:48 +01:00
+++ 1.16/BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734 2006-02-08 16:52:26 +01:00
@@ -1,11 +1,19 @@
+######################################
+# Change Author: JBM
+# Change Date: 2006-02-02
+# Change: Added ENGINE=MyISAM
+# Reason: LOAD FROM MASTER is only supported from
+# MyISAM, therefore there is no reason for this test
+# To use anyother Engine
+######################################
source include/master-slave.inc;
set SQL_LOG_BIN=0;
-create table t1 (word char(20) not null, index(word));
+create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
load data infile '../std_data_ln/words.dat' into table t1;
-create table t2 (word char(20) not null);
+create table t2 (word char(20) not null)ENGINE=MyISAM;
load data infile '../std_data_ln/words.dat' into table t2;
-create table t3 (word char(20) not null primary key);
+create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
connection slave;
load table t1 from master;
load table t2 from master;
--- 1.26/mysql-test/t/rpl_replicate_do.test 2006-02-07 20:54:35 +01:00
+++ 1.27/mysql-test/t/rpl_replicate_do.test 2006-02-08 16:52:26 +01:00
@@ -21,7 +21,7 @@
save_master_pos;
connection slave;
sync_with_master;
-select * from t1;
+select * from t1 ORDER BY m;
select * from t2;
--error 1146
select * from t11;
--- 1.25/mysql-test/t/rpl000009.test 2006-01-24 08:30:48 +01:00
+++ 1.27/mysql-test/t/rpl_load_from_master.test 2006-02-08 16:52:26 +01:00
@@ -1,5 +1,11 @@
# This one assumes we are ignoring updates on tables in database mysqltest2,
# but doing the ones in database mysqltest
+#################################################################
+# Change Author: JBM
+# Change Date: 2006-02-02
+# Change: Added ENGINE=MyISAM
+# Reason: LOAD from master is only supported by MyISAM
+#################################################################
source include/master-slave.inc;
--disable_warnings
@@ -19,12 +25,12 @@
connection slave;
sync_with_master;
create database mysqltest2;
-create table mysqltest2.foo (n int);
+create table mysqltest2.foo (n int)ENGINE=MyISAM;
insert into mysqltest2.foo values(4);
connection master;
-create table mysqltest2.foo (n int);
+create table mysqltest2.foo (n int)ENGINE=MyISAM;
insert into mysqltest2.foo values(5);
-create table mysqltest.bar (m int);
+create table mysqltest.bar (m int)ENGINE=MyISAM;
insert into mysqltest.bar values(15);
save_master_pos;
connection slave;
@@ -49,13 +55,13 @@
create database mysqltest2;
create database mysqltest;
show databases;
-create table mysqltest2.t1(n int, s char(20));
-create table mysqltest2.t2(n int, s text);
+create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
+create table mysqltest2.t2(n int, s text)ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three');
insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen');
-create table mysqltest.t1(n int, s char(20));
-create table mysqltest.t2(n int, s text);
+create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM;
+create table mysqltest.t2(n int, s text)ENGINE=MyISAM;
insert into mysqltest.t1 values (1, 'one test'), (2, 'two test'), (3, 'three test');
insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'),
(13, 'thirteen test');
@@ -69,21 +75,21 @@
# Create mysqltest2 and mysqltest3 on slave; we expect that LOAD DATA FROM
# MASTER will neither touch database mysqltest nor mysqltest3
create database mysqltest2;
-create table mysqltest2.t1(n int, s char(20));
+create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest2.t1 values (1, 'original foo.t1');
-create table mysqltest2.t3(n int, s char(20));
+create table mysqltest2.t3(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest2.t3 values (1, 'original foo.t3');
create database mysqltest3;
-create table mysqltest3.t1(n int, s char(20));
+create table mysqltest3.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest3.t1 values (1, 'original foo2.t1');
# Create mysqltest, and mysqltest.t1, to check that it gets replaced,
# and mysqltest.t3 to check that it is not touched (there is no
# mysqltest.t3 on master)
create database mysqltest;
-create table mysqltest.t1(n int, s char(20));
+create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest.t1 values (1, 'original bar.t1');
-create table mysqltest.t3(n int, s char(20));
+create table mysqltest.t3(n int, s char(20))ENGINE=MyISAM;
insert into mysqltest.t3 values (1, 'original bar.t3');
load data from master;
--- 1.29/mysql-test/extra/rpl_tests/rpl_log.test 2006-01-24 13:56:43 +01:00
+++ 1.30/mysql-test/extra/rpl_tests/rpl_log.test 2006-02-08 16:52:26 +01:00
@@ -30,21 +30,25 @@
connection master;
reset master;
-create table t1(n int not null auto_increment primary key);
+eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type;
insert into t1 values (NULL);
drop table t1;
-create table t1 (word char(20) not null);
+eval create table t1 (word char(20) not null)ENGINE=$engine_type;
load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
select count(*) from t1;
drop table t1;
--replace_result $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events;
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events from 102 limit 1;
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events from 102 limit 2;
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events from 102 limit 2,1;
flush logs;
@@ -64,7 +68,7 @@
# To make it predictable, we do a useless update now, but which has the
# interest of making the slave catch both rotate events.
-create table t5 (a int);
+eval create table t5 (a int)ENGINE=$engine_type;
drop table t5;
# Sync slave and force it to start on another binary log
@@ -82,14 +86,16 @@
# Create some entries for second log
-create table t1 (n int);
+eval create table t1 (n int)ENGINE=$engine_type;
insert into t1 values (1);
drop table t1;
--replace_result $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events;
--replace_result $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events in 'master-bin.000002';
show binary logs;
save_master_pos;
@@ -99,9 +105,11 @@
show binary logs;
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events in 'slave-bin.000001' from 4;
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events in 'slave-bin.000002' from 4;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
--- 1.7/mysql-test/t/rpl_skip_error.test 2006-01-26 17:54:28 +01:00
+++ 1.8/mysql-test/t/rpl_skip_error.test 2006-02-08 16:52:26 +01:00
@@ -1,3 +1,6 @@
+##########################################
+# 2006-02-07 By JBM: Added order by
+#########################################
source include/master-slave.inc;
create table t1 (n int not null primary key);
@@ -11,7 +14,7 @@
save_master_pos;
connection slave;
sync_with_master;
-select * from t1;
+select * from t1 ORDER BY n;
connection master;
drop table t1;
| Thread |
|---|
| • bk commit into 5.1 tree (jmiller:1.2085) | Jonathan Miller | 8 Feb |
