diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-03-26 07:22:42 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-03-26 07:22:42 +0100 |
| commit | bd025736107e715f40c9c3e7b9884c7337e72417 (patch) | |
| tree | 47a04a0e1240027756234831e3d3131aaa31de68 /mysql-test/include/commit.inc | |
| parent | 9cf83298334ca9a89052e409fb6df2065a8fc203 (diff) | |
| download | mariadb-git-bd025736107e715f40c9c3e7b9884c7337e72417.tar.gz | |
After merge fixes
mysql-test/include/commit.inc:
Adjust path
Add missing drop tables
mysql-test/mysql-test-run.pl:
Remove duplicate printout
mysql-test/lib/mtr_report.pm:
Only print each test that has failed once
mysql-test/r/commit_1innodb.result:
Adjust path
Add missing drop table
mysql-test/suite/binlog/r/binlog_multi_engine.result:
Remove merge error - extra s
mysql-test/suite/binlog/r/binlog_unsafe.result:
Remove drop of non existing view
mysql-test/suite/binlog/t/binlog_unsafe.test:
Remove drop of non existing view
Diffstat (limited to 'mysql-test/include/commit.inc')
| -rw-r--r-- | mysql-test/include/commit.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index 38c123295fb..0e6c13f9a4a 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -267,7 +267,7 @@ select * from t2; insert into t2 (a) values (1026); --replace_result $MYSQLTEST_VARDIR .. --error ER_DUP_ENTRY -eval load data infile "../std_data_ln/words.dat" into table t1 (a) set a:=f2(26); +eval load data infile "../../std_data/words.dat" into table t1 (a) set a:=f2(26); select * from t2; rollback; @@ -740,6 +740,6 @@ call p_verify_status_increment(0, 0, 0, 0); --echo # --echo # Cleanup --echo # -drop table t1; +drop table t1, t2, t3; drop procedure p_verify_status_increment; drop function f1; |