diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-08 15:28:00 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-10 06:30:42 -0500 |
| commit | 8b2e642aa214db729161252b96f36bfbae3add21 (patch) | |
| tree | 006dcc588623c7c7ee508eca3534259f62244f2c /mysql-test/suite/rpl/t/rpl_stm_user_variables.test | |
| parent | f556aa9b5f3685dfcf1b365d2461316cbd16e169 (diff) | |
| download | mariadb-git-8b2e642aa214db729161252b96f36bfbae3add21.tar.gz | |
MDEV-7635: Update tests to adapt to the new default sql_mode
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_stm_user_variables.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_stm_user_variables.test | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_stm_user_variables.test b/mysql-test/suite/rpl/t/rpl_stm_user_variables.test index 74e54f9624d..493ea4cd967 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_user_variables.test +++ b/mysql-test/suite/rpl/t/rpl_stm_user_variables.test @@ -32,7 +32,7 @@ CREATE TABLE t1 (`tinyint` TINYINT, -- echo ### insert max unsigned -- echo ### a) declarative --- eval INSERT INTO t1 VALUES ($max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long,$max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long); +-- eval INSERT IGNORE INTO t1 VALUES ($max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long,$max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long, $max_unsigned_long); -- echo ######################################### -- query_vertical SELECT * FROM t1 @@ -47,7 +47,7 @@ CREATE TABLE t1 (`tinyint` TINYINT, TRUNCATE t1; -- echo ### b) user var -INSERT INTO t1 VALUES (@positive, +INSERT IGNORE INTO t1 VALUES (@positive, @positive, @positive, @positive, @@ -77,7 +77,7 @@ TRUNCATE t1; -- echo ### insert min signed -- echo ### a) declarative --- eval INSERT INTO t1 VALUES ($min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long,$min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long); +-- eval INSERT IGNORE INTO t1 VALUES ($min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long,$min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long, $min_signed_long); -- echo ######################################### -- query_vertical SELECT * FROM t1 @@ -92,7 +92,7 @@ TRUNCATE t1; TRUNCATE t1; -- echo ### b) user var -INSERT INTO t1 VALUES (@negative, +INSERT IGNORE INTO t1 VALUES (@negative, @negative, @negative, @negative, @@ -135,7 +135,7 @@ DROP TABLE t1; ##################################################################### --source include/rpl_reset.inc -- connection master - +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE t1 ( c INT, PRIMARY KEY (c)) Engine=MyISAM; # offending trigger that would reset the unsigned flag for aux before @@ -146,6 +146,7 @@ SET @aux = 10294947273192243200; SET @aux1= @aux; -- error ER_DUP_ENTRY INSERT INTO t1 VALUES (@aux) , (@aux1); +SET sql_mode = DEFAULT; -- sync_slave_with_master |