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

After merge fixes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/r/binlog_multi_engine.result
View File

@ -37,7 +37,7 @@ mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1b
mysqld-bin.000001 # Query # # use `test`; TRUNCATE t1n
RESET MASTER;
SET SESSION BINLOG_FORMAT=MIXED;
INSERTs INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;