1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-13 13:47:59 +03:00

Fixes to tests and test results.

mysql-test/r/binlog_unsafe.result:
  Result change
mysql-test/r/rpl_loaddata_fatal.result:
  Result change
mysql-test/r/rpl_udf.result:
  Result change
mysql-test/t/binlog_innodb.test:
  Test requires binary log
mysql-test/t/binlog_unsafe.test:
  Test requires binary log
mysql-test/t/multi_update.test:
  Test requires binary log.
  Error changed for a statement.
mysql-test/t/rpl_row_basic_11bugs.test:
  Error changed for a statement.
This commit is contained in:
unknown
2007-06-19 11:09:22 +02:00
parent 511ef0cc29
commit 312ae6ecfc
7 changed files with 16 additions and 12 deletions

View File

@@ -3,7 +3,8 @@
#
# Requires grants, so won't work with embedded server test
-- source include/not_embedded.inc
source include/not_embedded.inc;
source include/have_log_bin.inc;
--disable_warnings
drop table if exists t1,t2,t3;
@@ -594,7 +595,7 @@ set @@session.binlog_format= mixed;
insert into t1 values (1,1),(2,2);
insert into t2 values (1,1),(4,4);
reset master;
--error ER_DUP_ENTRY_WITH_KEY_NAME
error ER_DUP_ENTRY;
UPDATE t2,t1 SET t2.a=t1.a+2;
# check
select * from t2 /* must be (3,1), (4,4) */;
@@ -607,7 +608,7 @@ delete from t2;
insert into t1 values (1,2),(3,4),(4,4);
insert into t2 values (1,2),(3,4),(4,4);
reset master;
--error ER_DUP_ENTRY_WITH_KEY_NAME
error ER_DUP_ENTRY;
UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a;
show master status /* there must be the UPDATE query event */;