1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fix (binlog_unsafe).

Browse Source
This commit is contained in:
Alexander Nozdrin 2009-12-15 10:25:46 +03:00
parent 5466618420
commit 83aa3cf4e3
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog/r/binlog_unsafe.result
View File

@ -355,6 +355,7 @@ master-bin.000001 13657 Write_rows 1 13695 table_id: 48
master-bin.000001 13695 Write_rows 1 13729 table_id: 47 flags: STMT_END_F master-bin.000001 13695 Write_rows 1 13729 table_id: 47 flags: STMT_END_F
master-bin.000001 13729 Query 1 13798 COMMIT master-bin.000001 13729 Query 1 13798 COMMIT
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
SET SESSION binlog_format = STATEMENT;
CREATE TABLE t1 (a VARCHAR(1000)); CREATE TABLE t1 (a VARCHAR(1000));
INSERT INTO t1 VALUES (CURRENT_USER()); INSERT INTO t1 VALUES (CURRENT_USER());
Warnings: Warnings:

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

@ -434,6 +434,7 @@ SET SESSION binlog_format = STATEMENT;
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
CREATE TABLE t2 (a INT, b INT PRIMARY KEY AUTO_INCREMENT); CREATE TABLE t2 (a INT, b INT PRIMARY KEY AUTO_INCREMENT);
CREATE TABLE t3 (a INT, b INT PRIMARY KEY AUTO_INCREMENT); CREATE TABLE t3 (a INT, b INT PRIMARY KEY AUTO_INCREMENT);
# The purpose of this function is to insert into t1 so that the second # The purpose of this function is to insert into t1 so that the second
# column is auto_increment'ed. # column is auto_increment'ed.
delimiter |; delimiter |;
@ -463,6 +464,7 @@ DROP TABLE t1,t2,t3;
# generate a warning. Each INSERT statement below should generate a # generate a warning. Each INSERT statement below should generate a
# warning. # warning.
# #
SET SESSION binlog_format = STATEMENT;
CREATE TABLE t1 (a VARCHAR(1000)); CREATE TABLE t1 (a VARCHAR(1000));
INSERT INTO t1 VALUES (CURRENT_USER()); #marked unsafe before BUG#47995 INSERT INTO t1 VALUES (CURRENT_USER()); #marked unsafe before BUG#47995