database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge bug11754117-45670 fixes from 5.1: fixing result files.

Browse Source
This commit is contained in:
Andrei Elkin
2012-04-21 14:19:06 +03:00
parent 14de6de946
commit 6d74c922af
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
View File

@ -9,10 +9,10 @@ set @@binlog_format=statement;
*** autoincrement field is not the first in PK warning must be there: *** *** autoincrement field is not the first in PK warning must be there: ***
insert into tm set b=null, a=1; insert into tm set b=null, a=1;
Warnings: Warnings:
Note 1592 Statement may not be safe to log in statement format. Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT into autoincrement field which is not the first part in the composed primary key is unsafe.
show warnings; show warnings;
Level Code Message Level Code Message
Note 1592 Statement may not be safe to log in statement format. Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT into autoincrement field which is not the first part in the composed primary key is unsafe.
*** no warning when autoincrement is the first in PK *** no warning when autoincrement is the first in PK
insert into ti set b=null, a=1; insert into ti set b=null, a=1;
show warnings; show warnings;
@ -26,9 +26,14 @@ end//
select multi_part_pk_with_autoinc (3); select multi_part_pk_with_autoinc (3);
multi_part_pk_with_autoinc (3) multi_part_pk_with_autoinc (3)
3 3
Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT into autoincrement field which is not the first part in the composed primary key is unsafe.
*** autoincrement field is not the first in PK warning must be there: *** *** autoincrement field is not the first in PK warning must be there: ***
show warnings; show warnings;
Level Code Message Level Code Message
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. INSERT into autoincrement field which is not the first part in the composed primary key is unsafe.
set @@binlog_format=mixed; set @@binlog_format=mixed;
insert into tm set b=null, a=2; insert into tm set b=null, a=2;
drop table tm, ti; drop table tm, ti;

2
mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
View File

@ -126,7 +126,7 @@ SET @c=2;
SET @@rand_seed1=10000000, @@rand_seed2=1000000; SET @@rand_seed1=10000000, @@rand_seed2=1000000;
INSERT INTO t5 VALUES (NULL, ROUND(RAND() * 1000), @c); INSERT INTO t5 VALUES (NULL, ROUND(RAND() * 1000), @c);
Warnings: Warnings:
Note 1592 Statement may not be safe to log in statement format. Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
SELECT b into @b FROM test.t5; SELECT b into @b FROM test.t5;
UPDATE test.t1 SET a=2; UPDATE test.t1 SET a=2;
SELECT a AS 'ONE' into @a FROM test.t_slave; SELECT a AS 'ONE' into @a FROM test.t_slave;