diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/setup_objects.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/setup_objects.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/setup_objects.result b/mysql-test/suite/perfschema/r/setup_objects.result index c29aaa2114f..0f363015623 100644 --- a/mysql-test/suite/perfschema/r/setup_objects.result +++ b/mysql-test/suite/perfschema/r/setup_objects.result @@ -25,7 +25,13 @@ insert into performance_schema.setup_objects values ('TABLE', 'db4', 't1', 'NO', 'YES'); insert into performance_schema.setup_objects values ('TABLE', 'db4', '%', 'YES', 'NO'); +<<<<<<< HEAD set sql_mode= ''; +======= +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; +Warnings: +Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. +>>>>>>> 258e16fa2de... WIP 5.7 P_S insert into performance_schema.setup_objects values ('SOMETHING', 'bad1', 'bad1', 'YES', 'NO'); ERROR 23000: Cannot add or update a child row: a foreign key constraint fails @@ -82,7 +88,11 @@ TABLE db3 t1 YES YES TABLE db3 t2 NO NO TABLE db4 % YES NO TABLE db4 t1 NO YES +<<<<<<< HEAD set sql_mode= DEFAULT; +======= +SET sql_mode = default; +>>>>>>> 258e16fa2de... WIP 5.7 P_S drop database if exists db1; drop database if exists db2; drop database if exists db3; |