database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

perfschema compilation, test and misc fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2020-02-15 18:25:57 +01:00
parent 81cffda2e6
commit 7af733a5a2
403 changed files with 20147 additions and 63173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/perfschema/r/setup_objects.result
View File

@ -25,13 +25,7 @@ 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
@ -88,11 +82,7 @@ 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;