1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

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
This commit is contained in:
unknown
2008-03-26 07:22:42 +01:00
parent 9cf8329833
commit bd02573610
7 changed files with 10 additions and 11 deletions

View File

@ -263,7 +263,7 @@ rollback;
select * from t2;
a
insert into t2 (a) values (1026);
load data infile "../std_data_ln/words.dat" into table t1 (a) set a:=f2(26);
load data infile "../../std_data/words.dat" into table t1 (a) set a:=f2(26);
ERROR 23000: Duplicate entry '26' for key 'a'
select * from t2;
a
@ -879,6 +879,6 @@ SUCCESS
#
# Cleanup
#
drop table t1;
drop table t1, t2, t3;
drop procedure p_verify_status_increment;
drop function f1;