diff options
| author | He Zhenxing <hezx@mysql.com> | 2008-09-06 12:49:43 +0800 |
|---|---|---|
| committer | He Zhenxing <hezx@mysql.com> | 2008-09-06 12:49:43 +0800 |
| commit | 4299844ad5272d7eac8eddfb9262c97145f79c0a (patch) | |
| tree | aa899254abac8bad3c7503ffc6d9a13e90d6d391 /mysql-test/t | |
| parent | 6e86e058230d1bfef0aa590f51987f1b6cb82512 (diff) | |
| download | mariadb-git-4299844ad5272d7eac8eddfb9262c97145f79c0a.tar.gz | |
Postfix of tests after merge
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/csv.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog_row.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog_row_big.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog_row_trans.test | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test index 52b73af9fd7..eb93288b0aa 100644 --- a/mysql-test/t/csv.test +++ b/mysql-test/t/csv.test @@ -1796,7 +1796,7 @@ lock tables t1 read; connect (con1,localhost,root,,); --connection con1 --remove_file $MYSQLD_DATADIR/test/t1.CSV ---replace_result $MYSQLD_DATADIR '' 13 2 +--replace_result $MYSQLD_DATADIR MYSQLD_DATADIR/ ./ MYSQLD_DATADIR/ 13 2 # EE_FILENOTFOUND 29 --error 29 select * from t1; diff --git a/mysql-test/t/mysqlbinlog_row.test b/mysql-test/t/mysqlbinlog_row.test index 9d94e1f55e7..9b41c63d195 100644 --- a/mysql-test/t/mysqlbinlog_row.test +++ b/mysql-test/t/mysqlbinlog_row.test @@ -443,4 +443,4 @@ flush logs; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9]*[.][0-9]{1,3})[0-9e+-]*[^ ]*(.*(FLOAT|DOUBLE).*[*].)/\1...\2/ ---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 diff --git a/mysql-test/t/mysqlbinlog_row_big.test b/mysql-test/t/mysqlbinlog_row_big.test index 62c8c7df327..bad39255bac 100644 --- a/mysql-test/t/mysqlbinlog_row_big.test +++ b/mysql-test/t/mysqlbinlog_row_big.test @@ -115,7 +115,7 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ ---exec $MYSQL_BINLOG -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/$mysqlbinlog_output +--exec $MYSQL_BINLOG -v -v $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/$mysqlbinlog_output --echo # --echo # Cleanup. diff --git a/mysql-test/t/mysqlbinlog_row_trans.test b/mysql-test/t/mysqlbinlog_row_trans.test index d84b1743783..24abc441c4c 100644 --- a/mysql-test/t/mysqlbinlog_row_trans.test +++ b/mysql-test/t/mysqlbinlog_row_trans.test @@ -151,7 +151,7 @@ FLUSH LOGS; let $MYSQLD_DATADIR= `select @@datadir`; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ ---exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLTEST_VARDIR/log/master-bin.000001 +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 --echo # --echo # Cleanup. |