remove disable_abort_on_error from precedence.test

was left over from testing

2 files changed, 12 insertions, 17 deletions

diff --git a/mysql-test/r/precedence.result b/mysql-test/r/precedence.result
index 7584375061d..34304d980c0 100644
--- a/mysql-test/r/precedence.result
+++ b/mysql-test/r/precedence.result
@@ -7981,11 +7981,10 @@ create or replace view v1 as select ! BINARY 1, BINARY ! 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
 select !cast(1 as char charset binary) AS `! BINARY 1`,cast(!1 as char charset binary) AS `BINARY ! 1`
-create or replace view v1 as select ! NOT 1, NOT ! 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NOT 1, NOT ! 1' at line 1
+create or replace view v1 as select ! (NOT 1), NOT ! 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
-select !cast(1 as char charset binary) AS `! BINARY 1`,cast(!1 as char charset binary) AS `BINARY ! 1`
+select 1 <> 0 AS `! (NOT 1)`,1 <> 0 AS `NOT ! 1`
 create or replace view v1 as select ! ~ 1, ~ ! 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
@@ -7994,29 +7993,26 @@ create or replace view v1 as select - BINARY 1, BINARY - 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
 select -cast(1 as char charset binary) AS `- BINARY 1`,cast(-1 as char charset binary) AS `BINARY - 1`
-create or replace view v1 as select - NOT 1, NOT - 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NOT 1, NOT - 1' at line 1
+create or replace view v1 as select - (NOT 1), NOT - 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
-select -cast(1 as char charset binary) AS `- BINARY 1`,cast(-1 as char charset binary) AS `BINARY - 1`
+select -!1 AS `- (NOT 1)`,!-1 AS `NOT - 1`
 create or replace view v1 as select - ~ 1, ~ - 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
 select -~1 AS `- ~ 1`,~-1 AS `~ - 1`
-create or replace view v1 as select BINARY NOT 1, NOT BINARY 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NOT 1, NOT BINARY 1' at line 1
+create or replace view v1 as select BINARY (NOT 1), NOT BINARY 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
-select -~1 AS `- ~ 1`,~-1 AS `~ - 1`
+select cast(!1 as char charset binary) AS `BINARY (NOT 1)`,!cast(1 as char charset binary) AS `NOT BINARY 1`
 create or replace view v1 as select BINARY ~ 1, ~ BINARY 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
 select cast(~1 as char charset binary) AS `BINARY ~ 1`,~cast(1 as char charset binary) AS `~ BINARY 1`
-create or replace view v1 as select NOT ~ 1, ~ NOT 1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'NOT 1' at line 1
+create or replace view v1 as select NOT ~ 1, ~ (NOT 1);
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
-select cast(~1 as char charset binary) AS `BINARY ~ 1`,~cast(1 as char charset binary) AS `~ BINARY 1`
+select !~1 AS `NOT ~ 1`,~!1 AS `~ (NOT 1)`
 create or replace view v1 as select 1 IS TRUE IS FALSE, 2 IS FALSE IS UNKNOWN, 3 IS UNKNOWN IS NULL, 4 IS NULL IS TRUE;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
diff --git a/mysql-test/t/precedence.test b/mysql-test/t/precedence.test
index 28e915a118c..ad367c23603 100644
--- a/mysql-test/t/precedence.test
+++ b/mysql-test/t/precedence.test
@@ -2,7 +2,6 @@
 # A fairly exhastive test for operator precedence
 #
 
-disable_abort_on_error;
 disable_warnings;
 
 #################### I couldn't come up with a test where precedence changes the result here
@@ -4759,7 +4758,7 @@ Select view_definition from information_schema.views where table_schema='test' a
 create or replace view v1 as select ! BINARY 1, BINARY ! 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 
-create or replace view v1 as select ! NOT 1, NOT ! 1;
+create or replace view v1 as select ! (NOT 1), NOT ! 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 
 create or replace view v1 as select ! ~ 1, ~ ! 1;
@@ -4768,19 +4767,19 @@ Select view_definition from information_schema.views where table_schema='test' a
 create or replace view v1 as select - BINARY 1, BINARY - 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 
-create or replace view v1 as select - NOT 1, NOT - 1;
+create or replace view v1 as select - (NOT 1), NOT - 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 
 create or replace view v1 as select - ~ 1, ~ - 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 
-create or replace view v1 as select BINARY NOT 1, NOT BINARY 1;
+create or replace view v1 as select BINARY (NOT 1), NOT BINARY 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 
 create or replace view v1 as select BINARY ~ 1, ~ BINARY 1;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 
-create or replace view v1 as select NOT ~ 1, ~ NOT 1;
+create or replace view v1 as select NOT ~ 1, ~ (NOT 1);
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 
 create or replace view v1 as select 1 IS TRUE IS FALSE, 2 IS FALSE IS UNKNOWN, 3 IS UNKNOWN IS NULL, 4 IS NULL IS TRUE;