diff options
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/ansi.result | 2 | ||||
-rw-r--r-- | mysql-test/r/bool.result | 2 | ||||
-rw-r--r-- | mysql-test/r/sql_mode.result | 2 | ||||
-rw-r--r-- | mysql-test/t/bool.test | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/ansi.result b/mysql-test/r/ansi.result index 56676abba33..c515ee9a1e8 100644 --- a/mysql-test/r/ansi.result +++ b/mysql-test/r/ansi.result @@ -2,7 +2,7 @@ drop table if exists t1; set sql_mode="MySQL40"; select @@sql_mode; @@sql_mode -NO_FIELD_OPTIONS,MYSQL40,BROKEN_NOT +NO_FIELD_OPTIONS,MYSQL40,HIGH_NOT_PRECEDENCE set @@sql_mode="ANSI"; select @@sql_mode; @@sql_mode diff --git a/mysql-test/r/bool.result b/mysql-test/r/bool.result index 1ef4b55fc36..184046a2d6f 100644 --- a/mysql-test/r/bool.result +++ b/mysql-test/r/bool.result @@ -33,7 +33,7 @@ a SELECT * FROM t1 where (1 AND a) IS NULL; a NULL -set sql_mode='broken_not'; +set sql_mode='high_not_precedence'; select * from t1 where not a between 2 and 3; a set sql_mode=default; diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result index c25ae99b530..fea99086303 100644 --- a/mysql-test/r/sql_mode.result +++ b/mysql-test/r/sql_mode.result @@ -61,7 +61,7 @@ t1 CREATE TABLE `t1` ( set @@sql_mode="no_field_options,mysql323,mysql40"; show variables like 'sql_mode'; Variable_name Value -sql_mode NO_FIELD_OPTIONS,MYSQL323,MYSQL40,BROKEN_NOT +sql_mode NO_FIELD_OPTIONS,MYSQL323,MYSQL40,HIGH_NOT_PRECEDENCE show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/t/bool.test b/mysql-test/t/bool.test index 644fdbfbf60..53230dd5fa3 100644 --- a/mysql-test/t/bool.test +++ b/mysql-test/t/bool.test @@ -21,7 +21,7 @@ SELECT * FROM t1 where (1 AND a)=1; SELECT * FROM t1 where (1 AND a) IS NULL; # WL#638 - Behaviour of NOT does not follow SQL specification -set sql_mode='broken_not'; +set sql_mode='high_not_precedence'; select * from t1 where not a between 2 and 3; set sql_mode=default; select * from t1 where not a between 2 and 3; |