Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2007-12-06 16:49:39+01:00, msvensson@stripped +10 -0
Rename std_data_ln -> ../std_data
mysql-test/suite/rpl/t/rpl_000015-master.opt@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +2 -0
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_000015-master.opt''
mysql-test/suite/rpl/t/rpl_000015-master.opt@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +0 -0
mysql-test/suite/rpl/t/rpl_000015-slave.opt@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +2 -0
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_000015-slave.opt''
mysql-test/suite/rpl/t/rpl_000015-slave.opt@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +0 -0
mysql-test/suite/rpl/t/rpl_LD_INFILE.test@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +2 -2
Rename std_data_ln -> ../std_data
mysql-test/suite/rpl/t/rpl_load_table_from_master.test@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +2 -2
Rename std_data_ln -> ../std_data
mysql-test/suite/rpl/t/rpl_loaddata_fatal.test@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +1 -1
Rename std_data_ln -> ../std_data
mysql-test/suite/rpl/t/rpl_loaddata_m.test@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +2 -2
Rename std_data_ln -> ../std_data
mysql-test/suite/rpl/t/rpl_loaddata_simple.test@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +1 -1
Rename std_data_ln -> ../std_data
mysql-test/suite/rpl/t/rpl_loadfile.test@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +2 -2
Rename std_data_ln -> ../std_data
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +5 -5
Rename std_data_ln -> ../std_data
mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test@stripped, 2007-12-06 16:49:37+01:00, msvensson@stripped +1 -1
Rename std_data_ln -> ../std_data
diff -Nrup a/mysql-test/suite/rpl/t/rpl_000015-master.opt b/mysql-test/suite/rpl/t/rpl_000015-master.opt
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_000015-master.opt 2007-12-06 16:49:37 +01:00
@@ -0,0 +1,2 @@
+--config-file-template=rpl_1slave_base.cnf
+
diff -Nrup a/mysql-test/suite/rpl/t/rpl_000015-slave.opt b/mysql-test/suite/rpl/t/rpl_000015-slave.opt
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_000015-slave.opt 2007-12-06 16:49:37 +01:00
@@ -0,0 +1,2 @@
+--server-id=22 --master-connect-retry=7
+
diff -Nrup a/mysql-test/suite/rpl/t/rpl_LD_INFILE.test b/mysql-test/suite/rpl/t/rpl_LD_INFILE.test
--- a/mysql-test/suite/rpl/t/rpl_LD_INFILE.test 2007-06-27 14:27:29 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_LD_INFILE.test 2007-12-06 16:49:37 +01:00
@@ -16,10 +16,10 @@ DROP TABLE IF EXISTS test.t1;
# Section 1 test
CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));
-LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
DELETE FROM test.t1 WHERE a = 'abashed';
DELETE FROM test.t1;
-LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;
SELECT * FROM test.t1 ORDER BY a DESC;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_load_table_from_master.test b/mysql-test/suite/rpl/t/rpl_load_table_from_master.test
--- a/mysql-test/suite/rpl/t/rpl_load_table_from_master.test 2007-06-27 14:27:29 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_load_table_from_master.test 2007-12-06 16:49:37 +01:00
@@ -71,9 +71,9 @@ sync_with_master;
connection master;
set SQL_LOG_BIN=0;
create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
-load data infile '../std_data_ln/words.dat' into table t1;
+load data infile '../../std_data/words.dat' into table t1;
create table t2 (word char(20) not null)ENGINE=MyISAM;
-load data infile '../std_data_ln/words.dat' into table t2;
+load data infile '../../std_data/words.dat' into table t2;
create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
connection slave;
load table t1 from master;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_loaddata_fatal.test b/mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
--- a/mysql-test/suite/rpl/t/rpl_loaddata_fatal.test 2007-06-27 14:44:05 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_fatal.test 2007-12-06 16:49:37 +01:00
@@ -13,7 +13,7 @@ source include/show_slave_status.inc;
# Now we feed it a load data infile, which should make it stop with a
# fatal error.
connection master;
-LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE t1;
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1;
connection slave;
wait_for_slave_to_stop;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_loaddata_m.test b/mysql-test/suite/rpl/t/rpl_loaddata_m.test
--- a/mysql-test/suite/rpl/t/rpl_loaddata_m.test 2007-12-04 12:52:34 +01:00
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_m.test 2007-12-06 16:49:37 +01:00
@@ -17,14 +17,14 @@ connection master;
# 'test' database should be ignored by the slave
USE test;
CREATE TABLE t1(a INT, b INT, UNIQUE(b));
-LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE test.t1;
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1;
SELECT COUNT(*) FROM test.t1;
# 'mysqltest' database should NOT be ignored by the slave
CREATE DATABASE mysqltest;
USE mysqltest;
CREATE TABLE t1(a INT, b INT, UNIQUE(b));
-LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
+LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
SELECT COUNT(*) FROM mysqltest.t1;
# Now lets check the slave to see what we have :-)
diff -Nrup a/mysql-test/suite/rpl/t/rpl_loaddata_simple.test b/mysql-test/suite/rpl/t/rpl_loaddata_simple.test
--- a/mysql-test/suite/rpl/t/rpl_loaddata_simple.test 2007-06-27 14:27:32 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_simple.test 2007-12-06 16:49:37 +01:00
@@ -1,7 +1,7 @@
--source include/master-slave.inc
CREATE TABLE t1 (word CHAR(20) NOT NULL);
-LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
+LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word;
sync_slave_with_master;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_loadfile.test b/mysql-test/suite/rpl/t/rpl_loadfile.test
--- a/mysql-test/suite/rpl/t/rpl_loadfile.test 2007-06-27 14:27:24 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_loadfile.test 2007-12-06 16:49:37 +01:00
@@ -24,12 +24,12 @@ DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a));
INSERT INTO test.t1 VALUES(1,'test');
-UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=1;
+UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=1;
delimiter |;
create procedure test.p1()
begin
INSERT INTO test.t1 VALUES(2,'test');
- UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=2;
+ UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=2;
end|
delimiter ;|
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2007-06-27 14:27:31 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2007-12-06 16:49:37 +01:00
@@ -37,11 +37,11 @@ CREATE TABLE t3(c1 INT NOT NULL PRIMARY
--disable_query_log
INSERT INTO t1 VALUES ("abirvalg");
-LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
-LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
-LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
-LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
-LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
+LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
+LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
+LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
+LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
+LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
# d1 length 3000
set @d1 = 'dd1';
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test
--- a/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test 2007-06-27 14:27:29 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test 2007-12-06 16:49:37 +01:00
@@ -9,7 +9,7 @@
connection master;
create table t1 (words varchar(20)) engine=myisam;
-load data infile '../std_data_ln/words.dat' into table t1 (words);
+load data infile '../../std_data/words.dat' into table t1 (words);
select count(*) from t1;
save_master_pos;
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2558) | msvensson | 6 Dec |
