diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/stage_mdl_table.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/stage_mdl_table.result | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_table.result b/mysql-test/suite/perfschema/r/stage_mdl_table.result index e058c81a960..5ba0ba04fca 100644 --- a/mysql-test/suite/perfschema/r/stage_mdl_table.result +++ b/mysql-test/suite/perfschema/r/stage_mdl_table.result @@ -1,19 +1,4 @@ -<<<<<<< HEAD connect con1, localhost, user1, , ; -======= -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. ->>>>>>> merge-perfschema-5.7 begin; insert into test.t1 values (1), (2), (3); commit; @@ -35,9 +20,9 @@ user1 stage/sql/Sending data STATEMENT user1 stage/sql/End of update loop STATEMENT user1 stage/sql/Query end STATEMENT user1 stage/sql/Commit STATEMENT -user1 stage/sql/Closing tables STATEMENT +user1 stage/sql/closing tables STATEMENT user1 stage/sql/Unlocking tables STATEMENT -user1 stage/sql/Closing tables STATEMENT +user1 stage/sql/closing tables STATEMENT user1 stage/sql/Starting cleanup STATEMENT user1 stage/sql/Freeing items STATEMENT user1 stage/sql/Reset for next command STATEMENT @@ -47,20 +32,13 @@ user2 statement/sql/alter_table alter table test.t1 add column (b int) username event_name nesting_event_type user2 stage/sql/Waiting for table metadata lock STATEMENT username event_name nesting_event_type -<<<<<<< HEAD -user2 stage/sql/Init STATEMENT -user2 stage/sql/Checking permissions STATEMENT -user2 stage/sql/Init for update STATEMENT -======= user2 stage/sql/starting STATEMENT user2 stage/sql/checking permissions STATEMENT -user2 stage/sql/checking permissions STATEMENT -user2 stage/sql/init STATEMENT ->>>>>>> 258e16fa2de... WIP 5.7 P_S +user2 stage/sql/init for update STATEMENT user2 stage/sql/Opening tables STATEMENT user2 stage/sql/After opening tables STATEMENT -user2 stage/sql/Setup STATEMENT -user2 stage/sql/Creating table STATEMENT +user2 stage/sql/setup STATEMENT +user2 stage/sql/creating table STATEMENT user2 stage/sql/After create STATEMENT connection con1; commit; |