database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity

Fixes to tests and test results.

Browse Source
This commit is contained in:
mats@kindahl-laptop.dnsalias.net
2007-06-19 11:09:22 +02:00
parent 6a51e0f8a2
commit 1447f6318f
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/binlog_unsafe.result
View File

@@ -5,9 +5,9 @@ CREATE TABLE t3 (b INT AUTO_INCREMENT PRIMARY KEY);
CREATE VIEW v1(a,b) AS SELECT a,b FROM t2,t3;
INSERT INTO t1 SELECT UUID();
Warnings:
Warning 1588 Statement is not safe to log in statement format.
Warning 1589 Statement is not safe to log in statement format.
SHOW WARNINGS;
Level Warning
Code 1588
Code 1589
Message Statement is not safe to log in statement format.
DROP TABLE t1,t2,t3;

4
mysql-test/r/rpl_loaddata_fatal.result
View File

@@ -65,7 +65,7 @@ Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 1589
Last_Errno 1590
Last_Error Fatal error: Not enough memory
Skip_Counter 0
Exec_Master_Log_Pos 325
@@ -83,7 +83,7 @@ Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1589
Last_SQL_Errno 1590
Last_SQL_Error Fatal error: Not enough memory
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;

8
mysql-test/r/rpl_udf.result
View File

@@ -182,19 +182,19 @@ CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
affected rows: 0
INSERT INTO t1 VALUES(myfunc_int(100), myfunc_double(50.00));
Warnings:
Warning 1588 Statement is not safe to log in statement format.
Warning 1589 Statement is not safe to log in statement format.
affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(10), myfunc_double(5.00));
Warnings:
Warning 1588 Statement is not safe to log in statement format.
Warning 1589 Statement is not safe to log in statement format.
affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(200), myfunc_double(25.00));
Warnings:
Warning 1588 Statement is not safe to log in statement format.
Warning 1589 Statement is not safe to log in statement format.
affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(1), myfunc_double(500.00));
Warnings:
Warning 1588 Statement is not safe to log in statement format.
Warning 1589 Statement is not safe to log in statement format.
affected rows: 1
SELECT * FROM t1 ORDER BY sum;
sum price

1
mysql-test/t/binlog_innodb.test
View File

@@ -1,4 +1,5 @@
source include/have_innodb.inc;
source include/have_log_bin.inc;
SET BINLOG_FORMAT=MIXED;

2
mysql-test/t/binlog_unsafe.test
View File

@@ -1,6 +1,8 @@
# Test to check that a warning is generated for unsafe statements
# executed under statement mode logging.
source include/have_log_bin.inc;
SET BINLOG_FORMAT=STATEMENT;
CREATE TABLE t1 (a CHAR(40));

7
mysql-test/t/multi_update.test
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 */;

2
mysql-test/t/rpl_row_basic_11bugs.test
View File

@@ -211,7 +211,7 @@ insert into t1 values (1,1),(2,2);
insert into t2 values (1,1),(4,4);
connection master;
--error ER_DUP_ENTRY_WITH_KEY_NAME
error ER_DUP_ENTRY;
UPDATE t2,t1 SET t2.a=t1.a+2;
select * from t2 /* must be (3,1), (4,4) */;
sync_slave_with_master;