diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-15 10:25:46 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-15 10:25:46 +0300 |
| commit | 2915b523cbb493a59c604be0657b8a3732bb8bc7 (patch) | |
| tree | bcd80369f352107bbcd48d726cbb45225864a607 /mysql-test | |
| parent | 5606aed1839702cc545f740f27c88a3197920b89 (diff) | |
| download | mariadb-git-2915b523cbb493a59c604be0657b8a3732bb8bc7.tar.gz | |
Post-merge fix (binlog_unsafe).
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_unsafe.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_unsafe.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_unsafe.result b/mysql-test/suite/binlog/r/binlog_unsafe.result index 679a27b09ae..5ad12d953ab 100644 --- a/mysql-test/suite/binlog/r/binlog_unsafe.result +++ b/mysql-test/suite/binlog/r/binlog_unsafe.result @@ -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 13729 Query 1 13798 COMMIT DROP TABLE t1,t2,t3; +SET SESSION binlog_format = STATEMENT; CREATE TABLE t1 (a VARCHAR(1000)); INSERT INTO t1 VALUES (CURRENT_USER()); Warnings: diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test index 21a926b47ff..51a5b1d4864 100644 --- a/mysql-test/suite/binlog/t/binlog_unsafe.test +++ b/mysql-test/suite/binlog/t/binlog_unsafe.test @@ -434,6 +434,7 @@ SET SESSION binlog_format = STATEMENT; CREATE TABLE t1 (a INT); CREATE TABLE t2 (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 # column is auto_increment'ed. delimiter |; @@ -463,6 +464,7 @@ DROP TABLE t1,t2,t3; # generate a warning. Each INSERT statement below should generate a # warning. # +SET SESSION binlog_format = STATEMENT; CREATE TABLE t1 (a VARCHAR(1000)); INSERT INTO t1 VALUES (CURRENT_USER()); #marked unsafe before BUG#47995 |