diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result | 98 |
1 files changed, 2 insertions, 96 deletions
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result index 25b44c4f44d..dee9ca7489c 100644 --- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result +++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result @@ -1,15 +1,3 @@ -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. update performance_schema.setup_instruments set enabled='NO' where name='wait/io/table/sql/handler'; delete from performance_schema.setup_actors @@ -53,85 +41,6 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name; truncate performance_schema.events_waits_summary_by_host_by_event_name; truncate performance_schema.events_waits_summary_global_by_event_name; truncate performance_schema.events_waits_history_long; -<<<<<<< HEAD -======= -show global variables like "performance_schema%"; -Variable_name Value -performance_schema ON -performance_schema_accounts_size 100 -performance_schema_digests_size 200 -performance_schema_events_stages_history_long_size 1000 -performance_schema_events_stages_history_size 10 -performance_schema_events_statements_history_long_size 1000 -performance_schema_events_statements_history_size 10 -performance_schema_events_transactions_history_long_size 1000 -performance_schema_events_transactions_history_size 10 -performance_schema_events_waits_history_long_size 10000 -performance_schema_events_waits_history_size 10 -performance_schema_hosts_size 100 -performance_schema_max_cond_classes 80 -performance_schema_max_cond_instances 1000 -performance_schema_max_digest_length 1024 -performance_schema_max_file_classes 80 -performance_schema_max_file_handles 32768 -performance_schema_max_file_instances 10000 -performance_schema_max_index_stat 5000 -performance_schema_max_memory_classes 320 -performance_schema_max_metadata_locks 10000 -performance_schema_max_mutex_classes 210 -performance_schema_max_mutex_instances 5000 -performance_schema_max_prepared_statements_instances 100 -performance_schema_max_program_instances 5000 -performance_schema_max_rwlock_classes 50 -performance_schema_max_rwlock_instances 5000 -performance_schema_max_socket_classes 10 -performance_schema_max_socket_instances 1000 -performance_schema_max_sql_text_length 1024 -performance_schema_max_stage_classes 150 -performance_schema_max_statement_classes 193 -performance_schema_max_statement_stack 10 -performance_schema_max_table_handles 1000 -performance_schema_max_table_instances 500 -performance_schema_max_table_lock_stat 500 -performance_schema_max_thread_classes 50 -performance_schema_max_thread_instances 200 -performance_schema_session_connect_attrs_size 2048 -performance_schema_setup_actors_size 100 -performance_schema_setup_objects_size 100 -performance_schema_users_size 100 -show global status like "performance_schema%"; -Variable_name Value -Performance_schema_accounts_lost 0 -Performance_schema_cond_classes_lost 0 -Performance_schema_cond_instances_lost 0 -Performance_schema_digest_lost 0 -Performance_schema_file_classes_lost 0 -Performance_schema_file_handles_lost 0 -Performance_schema_file_instances_lost 0 -Performance_schema_hosts_lost 0 -Performance_schema_index_stat_lost 0 -Performance_schema_locker_lost 0 -Performance_schema_memory_classes_lost 0 -Performance_schema_metadata_lock_lost 0 -Performance_schema_mutex_classes_lost 0 -Performance_schema_mutex_instances_lost 0 -Performance_schema_nested_statement_lost 0 -Performance_schema_prepared_statements_lost 0 -Performance_schema_program_lost 0 -Performance_schema_rwlock_classes_lost 0 -Performance_schema_rwlock_instances_lost 0 -Performance_schema_session_connect_attrs_lost 0 -Performance_schema_socket_classes_lost 0 -Performance_schema_socket_instances_lost 0 -Performance_schema_stage_classes_lost 0 -Performance_schema_statement_classes_lost 0 -Performance_schema_table_handles_lost 0 -Performance_schema_table_instances_lost 0 -Performance_schema_table_lock_stat_lost 0 -Performance_schema_thread_classes_lost 0 -Performance_schema_thread_instances_lost 0 -Performance_schema_users_lost 0 ->>>>>>> 258e16fa2de... WIP 5.7 P_S "================== Step 1 ==================" call dump_thread(); username status @@ -274,13 +183,8 @@ a b c d select * from test.t3 force index(index_b) where b=5; a b c d 105 5 5 1 -<<<<<<< HEAD connection default; -"================== Step 3 ==================" -======= -"================== con1 marker ==================" "================== Step 3-A ==================" ->>>>>>> merge-perfschema-5.7 call dump_thread(); username event_name count_star user1 wait/io/table/sql/handler 0 @@ -338,8 +242,10 @@ object_type object_schema object_name count_star TABLE test t1 10 TABLE test t2 12 TABLE test t3 14 +connection con1; flush tables; "================== con1 FLUSH ==================" +connection default; "================== Step 3-B ==================" call dump_thread(); username event_name count_star |