database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fix portability issues with rpl test suite.

Browse Source
This commit is contained in:
Vladislav Vaintroub
2018-10-12 16:43:45 +01:00
parent 6120ae4aca
commit 00c40efcd6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/rpl/t/rpl_drop_db.test
View File

@@ -13,8 +13,8 @@ insert into mysqltest1.t1 values (1);
select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt'; select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
create table mysqltest1.t2 (n int); create table mysqltest1.t2 (n int);
create table mysqltest1.t3 (n int); create table mysqltest1.t3 (n int);
--replace_result \\ / 66 39 93 39 17 39 247 39 "File exists" "Directory not empty" --replace_result \\ / 66 39 93 39 17 39 247 39 41 39 "File exists" "Directory not empty"
--error 1010 --error ER_DB_DROP_RMDIR
drop database mysqltest1; drop database mysqltest1;
use mysqltest1; use mysqltest1;
show tables; show tables;
@@ -30,8 +30,8 @@ while ($1)
} }
--enable_query_log --enable_query_log
--replace_result \\ / 66 39 93 39 17 39 247 39 "File exists" "Directory not empty" --replace_result \\ / 66 39 93 39 17 39 247 39 41 39 "File exists" "Directory not empty"
--error 1010 --error ER_DB_DROP_RMDIR
drop database mysqltest1; drop database mysqltest1;
use mysqltest1; use mysqltest1;
show tables; show tables;

2
mysql-test/suite/rpl/t/rpl_mdev382.test
View File

@@ -257,7 +257,7 @@ let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
--source include/show_binlog_events2.inc --source include/show_binlog_events2.inc
let $pos2= query_get_value(SHOW MASTER STATUS, Position, 1); let $pos2= query_get_value(SHOW MASTER STATUS, Position, 1);
--exec $MYSQL_BINLOG --short-form --start-position=$binlog_start --stop-position=$pos2 --rewrite-db='test->ts`et' $MYSQLD_DATADIR/master-bin.000002 --exec $MYSQL_BINLOG --short-form --start-position=$binlog_start --stop-position=$pos2 "--rewrite-db=test->ts`et" $MYSQLD_DATADIR/master-bin.000002
DROP TABLE t1; DROP TABLE t1;
--source include/rpl_end.inc --source include/rpl_end.inc