database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix test cases to work with non-standard --vardir.

Browse Source 
Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to
separate stm/row test cases, the .opt were not moved along with it,
causing a 60-second test duration because of default lock timeout :-(


mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
  bk cp mysql-test/t/mix_innodb_myisam_binlog-master.opt mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
  Rename: mysql-test/t/mix_innodb_myisam_binlog-master.opt -> mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
mysql-test/r/mysqlbinlog_base64.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_load.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_LD_INFILE.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata2.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata_m.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/loaddata.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/mysqlbinlog_base64.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_dd_dump.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_load.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_LD_INFILE.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata2.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata_m.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loadfile.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_load_table_from_master.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loadfile.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_row_001.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_001.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_loaddata_m.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_stop_middle_update.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_drop_db.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_load_table_from_master.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_stop_middle_update.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_func003.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/ndb_backup.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_bank.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_sync.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_bank.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_sync.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_NOW.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_func002.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp011.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig003.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_sp004.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/show_check.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_1.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_layout.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_dd_backuprestore.result:
  Fix test cases to work with non-standard --vardir.
This commit is contained in:
unknown
2006-02-22 10:07:54 +01:00
parent 5eadf344fe
commit a71fb6407f
46 changed files with 102 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/extra/rpl_tests/rpl_row_001.test
View File

@ -2,7 +2,7 @@
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_row.inc
CREATE TABLE t1 (word CHAR(20) NOT NULL); CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word LIMIT 10; SELECT * FROM t1 ORDER BY word LIMIT 10;

6
mysql-test/extra/rpl_tests/rpl_row_UUID.test
View File

@ -56,8 +56,8 @@ SHOW CREATE TABLE test.t1;
# then LOAD DATA INFILE in slave, and use a query to compare. # then LOAD DATA INFILE in slave, and use a query to compare.
# This would have the advantage that it would not assume # This would have the advantage that it would not assume
# the system has a 'diff' # the system has a 'diff'
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_UUID_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_UUID_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql
connection master; connection master;
# Let's cleanup # Let's cleanup
@ -72,7 +72,7 @@ DROP TABLE test.t2;
# will be created. You will need to go to the mysql-test dir and diff # will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching :-) # the files your self to see what is not matching :-)
--exec diff ./var/tmp/rpl_row_UUID_master.sql ./var/tmp/rpl_row_UUID_slave.sql; --exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql;
# Cleanup dump files. # Cleanup dump files.
# Long-term "system rm" is not portable; we could live without # Long-term "system rm" is not portable; we could live without

6
mysql-test/extra/rpl_tests/rpl_row_blob.test
View File

@ -176,10 +176,10 @@ connection master;
--echo --echo
# Post test clean up section # Post test clean up section
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_blob_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_blob_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql
--exec diff ./var/tmp/rpl_row_blob_master.sql ./var/tmp/rpl_row_blob_slave.sql --exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql
DROP TABLE IF EXISTS test.t1; DROP TABLE IF EXISTS test.t1;
DROP TABLE IF EXISTS test.t2; DROP TABLE IF EXISTS test.t2;

4
mysql-test/extra/rpl_tests/rpl_row_charset.test
View File

@ -162,8 +162,8 @@ select hex(c1), hex(c2) from t1;
connection master; connection master;
# Let's have a look at generated SETs. # Let's have a look at generated SETs.
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQLTEST_VARDIR MYSQL_TEST_DIR/var
#--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 #--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001
drop table t1; drop table t1;
sync_slave_with_master; sync_slave_with_master;

8
mysql-test/extra/rpl_tests/rpl_row_func003.test
View File

@ -77,8 +77,8 @@ SET AUTOCOMMIT=1;
# time to dump the databases and so we can see if they match # time to dump the databases and so we can see if they match
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func003_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func003_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_slave.sql
# First lets cleanupi # First lets cleanupi
DROP FUNCTION test.f1; DROP FUNCTION test.f1;
@ -88,9 +88,9 @@ DROP TABLE test.t1;
# the test will show that the diff statement failed and no reject file # the test will show that the diff statement failed and no reject file
# will be created. You will need to go to the mysql-test dir and diff # will be created. You will need to go to the mysql-test dir and diff
# the files yourself to see what is not matching :-) File are located # the files yourself to see what is not matching :-) File are located
# in mysql-test/var/tmp # in $MYSQLTEST_VARDIR/tmp
exec diff ./var/tmp/func003_master.sql ./var/tmp/func003_slave.sql; exec diff $MYSQLTEST_VARDIR/tmp/func003_master.sql $MYSQLTEST_VARDIR/tmp/func003_slave.sql;
# End of 5.0 test case # End of 5.0 test case

8
mysql-test/extra/rpl_tests/rpl_row_sp006.test
View File

@ -68,8 +68,8 @@ sync_slave_with_master;
connection master; connection master;
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > ./var/tmp/sp006_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/sp006_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > ./var/tmp/sp006_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/sp006_slave.sql
DROP PROCEDURE IF EXISTS mysqltest1.p1; DROP PROCEDURE IF EXISTS mysqltest1.p1;
@ -81,9 +81,9 @@ DROP TABLE IF EXISTS mysqltest1.t2;
# the test will show that the diff statement failed and not reject file # the test will show that the diff statement failed and not reject file
# will be created. You will need to go to the mysql-test dir and diff # will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching :-) Failed test # the files your self to see what is not matching :-) Failed test
# Dump files will be located in mysql-test/var/tmp. # Dump files will be located in $MYSQLTEST_VARDIR/tmp.
exec diff ./var/tmp/sp006_master.sql ./var/tmp/sp006_slave.sql; exec diff $MYSQLTEST_VARDIR/tmp/sp006_master.sql $MYSQLTEST_VARDIR/tmp/sp006_slave.sql;
sync_slave_with_master; sync_slave_with_master;

4
mysql-test/include/ndb_backup.inc
View File

@ -6,13 +6,13 @@
# there is no neat way to find the backupid, this is a hack to find it... # there is no neat way to find the backupid, this is a hack to find it...
--exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > var/tmp.dat --exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat
CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM test.backup_info; DELETE FROM test.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
--replace_column 1 <the_backup_id> --replace_column 1 <the_backup_id>

2
mysql-test/include/partition_1.inc
View File

@ -36,7 +36,7 @@ let $fixed_bug16370= 0;
##### Option, for displaying files ##### ##### Option, for displaying files #####
# #
# Attention: Displaying the directory content via "ls var/master-data/test/t*" # Attention: Displaying the directory content via "ls $MYSQLTEST_VARDIR/master-data/test/t*"
# is probably not portable. # is probably not portable.
# let $ls= 0; disables the execution of "ls ....." # let $ls= 0; disables the execution of "ls ....."
let $ls= 0; let $ls= 0;

2
mysql-test/include/partition_layout.inc
View File

@ -9,5 +9,5 @@ eval SHOW CREATE TABLE t1;
# listing of files belonging to the table t1 # listing of files belonging to the table t1
if ($ls) if ($ls)
{ {
--exec ls var/master-data/test/t1* --exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
} }

2
mysql-test/r/mysqlbinlog_base64.result
View File

@ -5,7 +5,7 @@ insert into t1 values (3);
update t1 set a=a+2 where a=2; update t1 set a=a+2 where a=2;
update t1 set a=a+2 where a=3; update t1 set a=a+2 where a=3;
create table t2 (word varchar(20)); create table t2 (word varchar(20));
load data infile '../../std_data/words.dat' into table t2; load data infile '../std_data_ln/words.dat' into table t2;
drop table t1; drop table t1;
drop table t2; drop table t2;
select * from t1; select * from t1;

6
mysql-test/r/ndb_dd_backuprestore.result
View File

@ -29,7 +29,7 @@ pk1 c2 c3 hex(c4)
5 Sweden 496 1 5 Sweden 496 1
CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM test.backup_info; DELETE FROM test.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM test.backup_info; SELECT @the_backup_id:=backup_id FROM test.backup_info;
@the_backup_id:=backup_id @the_backup_id:=backup_id
<the_backup_id> <the_backup_id>
@ -97,7 +97,7 @@ LENGTH(data)
16384 16384
CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM test.backup_info; DELETE FROM test.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM test.backup_info; SELECT @the_backup_id:=backup_id FROM test.backup_info;
@the_backup_id:=backup_id @the_backup_id:=backup_id
<the_backup_id> <the_backup_id>
@ -310,7 +310,7 @@ pk1 c2 c3 hex(c4)
246 TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU 8 1 246 TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU 8 1
CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP; CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM test.backup_info; DELETE FROM test.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM test.backup_info; SELECT @the_backup_id:=backup_id FROM test.backup_info;
@the_backup_id:=backup_id @the_backup_id:=backup_id
<the_backup_id> <the_backup_id>

4
mysql-test/r/ndb_load.result
View File

@ -1,10 +1,10 @@
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB; CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB;
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;
ERROR 23000: Can't write; duplicate key in table 't1' ERROR 23000: Can't write; duplicate key in table 't1'
DROP TABLE t1; DROP TABLE t1;
CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB; CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB;
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;
SELECT * FROM t1 ORDER BY word; SELECT * FROM t1 ORDER BY word;
word word
Aarhus Aarhus

4
mysql-test/r/rpl_LD_INFILE.result
View File

@ -6,10 +6,10 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
DROP TABLE IF EXISTS test.t1; DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a)); CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));
LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
DELETE FROM test.t1 WHERE a = 'abashed'; DELETE FROM test.t1 WHERE a = 'abashed';
DELETE FROM test.t1; DELETE FROM test.t1;
LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
SELECT * FROM test.t1 ORDER BY a DESC; SELECT * FROM test.t1 ORDER BY a DESC;
a a
aberration aberration

4
mysql-test/r/rpl_load_table_from_master.result
View File

@ -29,9 +29,9 @@ drop table t1;
drop table t1; drop table t1;
set SQL_LOG_BIN=0; set SQL_LOG_BIN=0;
create table t1 (word char(20) not null, index(word))ENGINE=MyISAM; create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t1; load data infile '../std_data_ln/words.dat' into table t1;
create table t2 (word char(20) not null)ENGINE=MyISAM; create table t2 (word char(20) not null)ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t2; load data infile '../std_data_ln/words.dat' into table t2;
create table t3 (word char(20) not null primary key)ENGINE=MyISAM; create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
load table t1 from master; load table t1 from master;
load table t2 from master; load table t2 from master;

2
mysql-test/r/rpl_loaddata2.result
View File

@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
CREATE TABLE t1 (word CHAR(20) NOT NULL); CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word; SELECT * FROM t1 ORDER BY word;
word word
Aarhus Aarhus

4
mysql-test/r/rpl_loaddata_m.result
View File

@ -7,14 +7,14 @@ start slave;
drop database if exists mysqltest; drop database if exists mysqltest;
USE test; USE test;
CREATE TABLE t1(a INT, b INT, UNIQUE(b)); CREATE TABLE t1(a INT, b INT, UNIQUE(b));
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1; LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE test.t1;
SELECT COUNT(*) FROM test.t1; SELECT COUNT(*) FROM test.t1;
COUNT(*) COUNT(*)
2 2
CREATE DATABASE mysqltest; CREATE DATABASE mysqltest;
USE mysqltest; USE mysqltest;
CREATE TABLE t1(a INT, b INT, UNIQUE(b)); CREATE TABLE t1(a INT, b INT, UNIQUE(b));
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1; LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
SELECT COUNT(*) FROM mysqltest.t1; SELECT COUNT(*) FROM mysqltest.t1;
COUNT(*) COUNT(*)
2 2

4
mysql-test/r/rpl_loadfile.result
View File

@ -8,11 +8,11 @@ DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1; DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a)); CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a));
INSERT INTO test.t1 VALUES(1,'test'); INSERT INTO test.t1 VALUES(1,'test');
UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=1; UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=1;
create procedure test.p1() create procedure test.p1()
begin begin
INSERT INTO test.t1 VALUES(2,'test'); INSERT INTO test.t1 VALUES(2,'test');
UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=2; UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=2;
end| end|
CALL test.p1(); CALL test.p1();
SELECT * FROM test.t1 ORDER BY blob_column; SELECT * FROM test.t1 ORDER BY blob_column;

2
mysql-test/r/rpl_ndb_bank.result
View File

@ -49,7 +49,7 @@ CREATE DATABASE BANK;
RESET MASTER; RESET MASTER;
CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP; CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM cluster_replication.backup_info; DELETE FROM cluster_replication.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ','; LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info; SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
@the_backup_id:=backup_id @the_backup_id:=backup_id
<the_backup_id> <the_backup_id>

2
mysql-test/r/rpl_ndb_row_001.result
View File

@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
CREATE TABLE t1 (word CHAR(20) NOT NULL); CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word LIMIT 10; SELECT * FROM t1 ORDER BY word LIMIT 10;
word word

2
mysql-test/r/rpl_ndb_sync.result
View File

@ -27,7 +27,7 @@ hex(c2) hex(c3) c1
0 0 DEFGHIJKL 0 0 DEFGHIJKL
CREATE TEMPORARY 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; DELETE FROM cluster_replication.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ','; LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info; SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
@the_backup_id:=backup_id @the_backup_id:=backup_id
<the_backup_id> <the_backup_id>

2
mysql-test/r/rpl_row_001.result
View File

@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
CREATE TABLE t1 (word CHAR(20) NOT NULL); CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word LIMIT 10; SELECT * FROM t1 ORDER BY word LIMIT 10;
word word

2
mysql-test/r/rpl_row_loaddata_m.result
View File

@ -9,7 +9,7 @@ stop slave;
create database mysqltest; create database mysqltest;
use mysqltest; use mysqltest;
create table t1(a int, b int, unique(b)); create table t1(a int, b int, unique(b));
load data infile '../../std_data/rpl_loaddata.dat' into table t1; load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
show binlog events from 102; show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # # master-bin.000001 # Query 1 # #

2
mysql-test/r/rpl_row_stop_middle_update.result
View File

@ -5,7 +5,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
create table t1 (words varchar(20)) engine=myisam; create table t1 (words varchar(20)) engine=myisam;
load data infile '../../std_data/words.dat' into table t1 (words); load data infile '../std_data_ln/words.dat' into table t1 (words);
select count(*) from t1; select count(*) from t1;
count(*) count(*)
70 70

0
mysql-test/t/mix_innodb_myisam_binlog-master.opt → mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
View File

1
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt Normal file
View File

@ -0,0 +1 @@
--loose-innodb_lock_wait_timeout=2

2
mysql-test/t/loaddata.test
View File

@ -135,6 +135,6 @@ select @@character_set_filesystem;
LOAD DATA INFILE 't@002d1' INTO TABLE t1; LOAD DATA INFILE 't@002d1' INTO TABLE t1;
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
--exec rm $MYSQL_TEST_DIR/var/master-data/test/t@002d1 --exec rm $MYSQLTEST_VARDIR/master-data/test/t@002d1
SET character_set_filesystem=default; SET character_set_filesystem=default;
select @@character_set_filesystem; select @@character_set_filesystem;

8
mysql-test/t/mysqlbinlog_base64.test
View File

@ -10,19 +10,19 @@ update t1 set a=a+2 where a=2;
update t1 set a=a+2 where a=3; update t1 set a=a+2 where a=3;
create table t2 (word varchar(20)); create table t2 (word varchar(20));
load data infile '../../std_data/words.dat' into table t2; load data infile '../std_data_ln/words.dat' into table t2;
# #
# Save binlog # Save binlog
# #
--exec $MYSQL_BINLOG --hexdump $MYSQL_TEST_DIR/var/log/master-bin.000001 > $MYSQL_TEST_DIR/var/tmp/mysqlbinlog_base64.sql --exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
# #
# Clear database and restore from binlog # Clear database and restore from binlog
# #
drop table t1; drop table t1;
drop table t2; drop table t2;
--exec $MYSQL test < $MYSQL_TEST_DIR/var/tmp/mysqlbinlog_base64.sql --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
# #
# Verify that all binlog events have been executed # Verify that all binlog events have been executed
@ -33,6 +33,6 @@ select * from t2;
# #
# Test cleanup # Test cleanup
# #
--exec rm $MYSQL_TEST_DIR/var/tmp/mysqlbinlog_base64.sql --exec rm $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
drop table t1; drop table t1;
drop table t2; drop table t2;

4
mysql-test/t/ndb_dd_dump.test
View File

@ -177,7 +177,7 @@ INSERT INTO t2 VALUES
INSERT INTO t3 VALUES INSERT INTO t3 VALUES
(1,1,1); (1,1,1);
--exec $MYSQL_DUMP --skip-comments --compact -Y test > var/tmp/ndb_dd_dump.sql --exec $MYSQL_DUMP --skip-comments --compact -Y test > $MYSQLTEST_VARDIR/tmp/ndb_dd_dump.sql
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
@ -206,7 +206,7 @@ DROP TABLESPACE ts3 ENGINE = NDB;
DROP LOGFILE GROUP lg1 ENGINE = NDB; DROP LOGFILE GROUP lg1 ENGINE = NDB;
DROP LOGFILE GROUP lg2 ENGINE = NDB; DROP LOGFILE GROUP lg2 ENGINE = NDB;
--exec $MYSQL test < var/tmp/ndb_dd_dump.sql --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/ndb_dd_dump.sql
SELECT DISTINCT SELECT DISTINCT
LOGFILE_GROUP_NAME, LOGFILE_GROUP_NAME,

4
mysql-test/t/ndb_load.test
View File

@ -12,12 +12,12 @@ DROP TABLE IF EXISTS t1;
# should give duplicate key # should give duplicate key
CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB; CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=NDB;
--error 1022 --error 1022
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;
DROP TABLE t1; DROP TABLE t1;
# now without a primary key we should be ok # now without a primary key we should be ok
CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB; CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=NDB;
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 ; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1 ;
SELECT * FROM t1 ORDER BY word; SELECT * FROM t1 ORDER BY word;
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/t/rpl_LD_INFILE.test
View File

@ -16,10 +16,10 @@ DROP TABLE IF EXISTS test.t1;
# Section 1 test # Section 1 test
CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a)); CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));
LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
DELETE FROM test.t1 WHERE a = 'abashed'; DELETE FROM test.t1 WHERE a = 'abashed';
DELETE FROM test.t1; DELETE FROM test.t1;
LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; LOAD DATA INFILE '../std_data_ln/words2.dat' INTO TABLE test.t1;
SELECT * FROM test.t1 ORDER BY a DESC; SELECT * FROM test.t1 ORDER BY a DESC;

2
mysql-test/t/rpl_drop_db.test
View File

@ -46,7 +46,7 @@ show tables;
use test; use test;
select * from t1; select * from t1;
system rm var/master-data/mysqltest1/f1.txt; system rm $MYSQLTEST_VARDIR/master-data/mysqltest1/f1.txt;
connection master; connection master;
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
sync_slave_with_master; sync_slave_with_master;

4
mysql-test/t/rpl_load_table_from_master.test
View File

@ -71,9 +71,9 @@ sync_with_master;
connection master; connection master;
set SQL_LOG_BIN=0; set SQL_LOG_BIN=0;
create table t1 (word char(20) not null, index(word))ENGINE=MyISAM; create table t1 (word char(20) not null, index(word))ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t1; load data infile '../std_data_ln/words.dat' into table t1;
create table t2 (word char(20) not null)ENGINE=MyISAM; create table t2 (word char(20) not null)ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t2; load data infile '../std_data_ln/words.dat' into table t2;
create table t3 (word char(20) not null primary key)ENGINE=MyISAM; create table t3 (word char(20) not null primary key)ENGINE=MyISAM;
connection slave; connection slave;
load table t1 from master; load table t1 from master;

2
mysql-test/t/rpl_loaddata2.test
View File

@ -1,7 +1,7 @@
--source include/master-slave.inc --source include/master-slave.inc
CREATE TABLE t1 (word CHAR(20) NOT NULL); CREATE TABLE t1 (word CHAR(20) NOT NULL);
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;
SELECT * FROM t1 ORDER BY word; SELECT * FROM t1 ORDER BY word;
sync_slave_with_master; sync_slave_with_master;

4
mysql-test/t/rpl_loaddata_m.test
View File

@ -17,14 +17,14 @@ connection master;
# 'test' database should be ignored by the slave # 'test' database should be ignored by the slave
USE test; USE test;
CREATE TABLE t1(a INT, b INT, UNIQUE(b)); CREATE TABLE t1(a INT, b INT, UNIQUE(b));
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE test.t1; LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE test.t1;
SELECT COUNT(*) FROM test.t1; SELECT COUNT(*) FROM test.t1;
# 'mysqltest' database should NOT be ignored by the slave # 'mysqltest' database should NOT be ignored by the slave
CREATE DATABASE mysqltest; CREATE DATABASE mysqltest;
USE mysqltest; USE mysqltest;
CREATE TABLE t1(a INT, b INT, UNIQUE(b)); CREATE TABLE t1(a INT, b INT, UNIQUE(b));
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE mysqltest.t1; LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE mysqltest.t1;
SELECT COUNT(*) FROM mysqltest.t1; SELECT COUNT(*) FROM mysqltest.t1;
# Now lets check the slave to see what we have :-) # Now lets check the slave to see what we have :-)

4
mysql-test/t/rpl_loadfile.test
View File

@ -24,12 +24,12 @@ DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a)); CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, PRIMARY KEY(a));
INSERT INTO test.t1 VALUES(1,'test'); INSERT INTO test.t1 VALUES(1,'test');
UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=1; UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=1;
delimiter |; delimiter |;
create procedure test.p1() create procedure test.p1()
begin begin
INSERT INTO test.t1 VALUES(2,'test'); INSERT INTO test.t1 VALUES(2,'test');
UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=2; UPDATE test.t1 SET blob_column=LOAD_FILE('../std_data_ln/words2.dat') WHERE a=2;
end| end|
delimiter ;| delimiter ;|

10
mysql-test/t/rpl_ndb_bank.test
View File

@ -117,10 +117,10 @@ RESET MASTER;
--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT --exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT
# there is no neat way to find the backupid, this is a hack to find it... # there is no neat way to find the backupid, this is a hack to find it...
--exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > var/tmp.dat --exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat
CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP; CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT) ENGINE = HEAP;
DELETE FROM cluster_replication.backup_info; DELETE FROM cluster_replication.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ','; LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
--replace_column 1 <the_backup_id> --replace_column 1 <the_backup_id>
SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info; SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
let the_backup_id=`select @the_backup_id`; let the_backup_id=`select @the_backup_id`;
@ -191,17 +191,17 @@ while ($1)
# 1. dump database BANK on both master and slave # 1. dump database BANK on both master and slave
# 2. compare, there should be no difference # 2. compare, there should be no difference
# #
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > ./var/tmp/master_BANK.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > $MYSQLTEST_VARDIR/tmp/master_BANK.sql
--connection master --connection master
use test; use test;
create table t1 (a int primary key) engine=ndb; create table t1 (a int primary key) engine=ndb;
insert into t1 values (1); insert into t1 values (1);
--sync_slave_with_master --sync_slave_with_master
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > ./var/tmp/slave_BANK.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info BANK ACCOUNT_TYPE ACCOUNT GL TRANSACTION > $MYSQLTEST_VARDIR/tmp/slave_BANK.sql
--connection master --connection master
drop table t1; drop table t1;
--exec diff ./var/tmp/master_BANK.sql ./var/tmp/slave_BANK.sql --exec diff $MYSQLTEST_VARDIR/tmp/master_BANK.sql $MYSQLTEST_VARDIR/tmp/slave_BANK.sql
--dec $2 --dec $2
} }

4
mysql-test/t/rpl_ndb_sync.test
View File

@ -26,10 +26,10 @@ SELECT hex(c2),hex(c3),c1 FROM t2 ORDER BY c1;
# take a backup on master # take a backup on master
--exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT --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 --exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > $MYSQLTEST_VARDIR/tmp.dat
CREATE TEMPORARY 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; DELETE FROM cluster_replication.backup_info;
LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ','; LOAD DATA INFILE '../tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
--replace_column 1 <the_backup_id> --replace_column 1 <the_backup_id>
SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info; SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;
let the_backup_id=`select @the_backup_id` ; let the_backup_id=`select @the_backup_id` ;

12
mysql-test/t/rpl_row_NOW.test
View File

@ -50,8 +50,8 @@ sync_slave_with_master;
connection master; connection master;
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > ./var/tmp/NOW_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/NOW_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > ./var/tmp/NOW_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info mysqltest1 > $MYSQLTEST_VARDIR/tmp/NOW_slave.sql
# lets cleanup # lets cleanup
DROP TABLE IF EXISTS mysqltest1.t1; DROP TABLE IF EXISTS mysqltest1.t1;
@ -61,13 +61,13 @@ DROP FUNCTION mysqltest1.f1;
# the test will show that the diff statement failed and not reject file # the test will show that the diff statement failed and not reject file
# will be created. You will need to go to the mysql-test dir and diff # will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching :-) The failed dump # the files your self to see what is not matching :-) The failed dump
# files will be located in mysql-test/var/tmp # files will be located in $MYSQLTEST_VARDIR/tmp
exec diff ./var/tmp/NOW_master.sql ./var/tmp/NOW_slave.sql; exec diff $MYSQLTEST_VARDIR/tmp/NOW_master.sql $MYSQLTEST_VARDIR/tmp/NOW_slave.sql;
# If all is good, when can cleanup our dump files. # If all is good, when can cleanup our dump files.
system rm ./var/tmp/NOW_master.sql; system rm $MYSQLTEST_VARDIR/tmp/NOW_master.sql;
system rm ./var/tmp/NOW_slave.sql; system rm $MYSQLTEST_VARDIR/tmp/NOW_slave.sql;
sync_slave_with_master; sync_slave_with_master;
# End of 5.1 test case # End of 5.1 test case

6
mysql-test/t/rpl_row_func002.test
View File

@ -84,8 +84,8 @@ connection master;
# time to dump the databases and so we can see if they match # time to dump the databases and so we can see if they match
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func002_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func002_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/func002_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func002_slave.sql
# Cleanup # Cleanup
DROP FUNCTION test.f1; DROP FUNCTION test.f1;
@ -97,7 +97,7 @@ sync_slave_with_master;
# the files your self to see what is not matching :-). The files are located # the files your self to see what is not matching :-). The files are located
# in mysql-test/var/tmp # in mysql-test/var/tmp
exec diff ./var/tmp/func002_master.sql ./var/tmp/func002_slave.sql; exec diff $MYSQLTEST_VARDIR/tmp/func002_master.sql $MYSQLTEST_VARDIR/tmp/func002_slave.sql;
# End of 5.0 test case # End of 5.0 test case

12
mysql-test/t/rpl_row_sp001.test
View File

@ -119,8 +119,8 @@ SELECT * FROM t2 ORDER BY a;
# time to dump the databases and so we can see if they match # time to dump the databases and so we can see if they match
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp001_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp001_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp001_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp001_slave.sql
# First lets cleanup # First lets cleanup
@ -135,12 +135,12 @@ sync_slave_with_master;
# the test will show that the diff statement failed and not reject file # the test will show that the diff statement failed and not reject file
# will be created. You will need to go to the mysql-test dir and diff # will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching :-) Failed dump files # the files your self to see what is not matching :-) Failed dump files
# will be located in mysql-test/var/tmp # will be located in $MYSQLTEST_VARDIR/tmp
--exec diff ./var/tmp/sp001_master.sql ./var/tmp/sp001_slave.sql; --exec diff $MYSQLTEST_VARDIR/tmp/sp001_master.sql $MYSQLTEST_VARDIR/tmp/sp001_slave.sql;
# If all is good, when can cleanup our dump files. # If all is good, when can cleanup our dump files.
system rm ./var/tmp/sp001_master.sql; system rm $MYSQLTEST_VARDIR/tmp/sp001_master.sql;
system rm ./var/tmp/sp001_slave.sql; system rm $MYSQLTEST_VARDIR/tmp/sp001_slave.sql;
# End of 5.0 test case # End of 5.0 test case

12
mysql-test/t/rpl_row_sp011.test
View File

@ -79,8 +79,8 @@ CALL test.p1();
sync_slave_with_master; sync_slave_with_master;
#SELECT * FROM test.t2; #SELECT * FROM test.t2;
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp011_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp011_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp011_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp011_slave.sql
# Cleanup # Cleanup
connection master; connection master;
@ -100,12 +100,12 @@ sync_slave_with_master;
# the test will show that the diff statement failed and not reject file # the test will show that the diff statement failed and not reject file
# will be created. You will need to go to the mysql-test dir and diff # will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching :-) Failed test # the files your self to see what is not matching :-) Failed test
# Will leave dump files in mysql-test/var/tmp # Will leave dump files in $MYSQLTEST_VARDIR/tmp
exec diff ./var/tmp/sp011_master.sql ./var/tmp/sp011_slave.sql; exec diff $MYSQLTEST_VARDIR/tmp/sp011_master.sql $MYSQLTEST_VARDIR/tmp/sp011_slave.sql;
# If all is good, when can cleanup our dump files. # If all is good, when can cleanup our dump files.
system rm ./var/tmp/sp011_master.sql; system rm $MYSQLTEST_VARDIR/tmp/sp011_master.sql;
system rm ./var/tmp/sp011_slave.sql; system rm $MYSQLTEST_VARDIR/tmp/sp011_slave.sql;
# End of 5.0 test case # End of 5.0 test case

2
mysql-test/t/rpl_row_stop_middle_update.test
View File

@ -9,7 +9,7 @@
connection master; connection master;
create table t1 (words varchar(20)) engine=myisam; create table t1 (words varchar(20)) engine=myisam;
load data infile '../../std_data/words.dat' into table t1 (words); load data infile '../std_data_ln/words.dat' into table t1 (words);
select count(*) from t1; select count(*) from t1;
save_master_pos; save_master_pos;

8
mysql-test/t/rpl_row_trig001.test
View File

@ -75,8 +75,8 @@ let $message=<End test section 2 (Tiggers & SP)>;
# time to dump the databases and so we can see if they match # time to dump the databases and so we can see if they match
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/trig001_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/trig001_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/trig001_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/trig001_slave.sql
# Cleanup # Cleanup
connection master; connection master;
@ -93,8 +93,8 @@ sync_slave_with_master;
# the test will show that the diff statement failed and not reject file # the test will show that the diff statement failed and not reject file
# will be created. You will need to go to the mysql-test dir and diff # will be created. You will need to go to the mysql-test dir and diff
# the files your self to see what is not matching :-) Failed tests # the files your self to see what is not matching :-) Failed tests
# will leave dump files in mysql-test/var/tmp # will leave dump files in $MYSQLTEST_VARDIR/tmp
exec diff ./var/tmp/trig001_master.sql ./var/tmp/trig001_slave.sql; exec diff $MYSQLTEST_VARDIR/tmp/trig001_master.sql $MYSQLTEST_VARDIR/tmp/trig001_slave.sql;
# End of 5.0 test case # End of 5.0 test case

6
mysql-test/t/rpl_row_trig003.test
View File

@ -125,8 +125,8 @@ connection master;
# time to dump the databases and so we can see if they match # time to dump the databases and so we can see if they match
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/trg003_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/trg003_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/trg003_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/trg003_slave.sql
# cleanup # cleanup
--disable_warnings --disable_warnings
@ -147,6 +147,6 @@ DROP TABLE IF EXISTS test.t2;
DROP TABLE IF EXISTS test.t3; DROP TABLE IF EXISTS test.t3;
--enable_warnings --enable_warnings
exec diff ./var/tmp/trg003_master.sql ./var/tmp/trg003_slave.sql; exec diff $MYSQLTEST_VARDIR/tmp/trg003_master.sql $MYSQLTEST_VARDIR/tmp/trg003_slave.sql;
# End of 5.0 test case # End of 5.0 test case

6
mysql-test/t/rpl_sp004.test
View File

@ -76,8 +76,8 @@ SELECT * FROM test.t1;
SELECT * FROM test.t2; SELECT * FROM test.t2;
#SELECT * FROM test.t3; #SELECT * FROM test.t3;
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp004_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql
--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/sp004_slave.sql --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_slave.sql
# Cleanup # Cleanup
connection master; connection master;
@ -91,7 +91,7 @@ sync_slave_with_master;
# If the test fails, you will need to diff the dumps to see why. # If the test fails, you will need to diff the dumps to see why.
-- exec diff ./var/tmp/sp004_master.sql ./var/tmp/sp004_slave.sql -- exec diff $MYSQLTEST_VARDIR/tmp/sp004_master.sql $MYSQLTEST_VARDIR/tmp/sp004_slave.sql
# End of 5.0 test case # End of 5.0 test case

2
mysql-test/t/show_check.test
View File

@ -393,7 +393,7 @@ SHOW TABLE STATUS like 't1';
--error 1033 --error 1033
show create table t1; show create table t1;
drop table if exists t1; drop table if exists t1;
system rm -f var/master-data/test/t1.frm ; system rm -f $MYSQLTEST_VARDIR/master-data/test/t1.frm ;
# End of 4.1 tests # End of 4.1 tests