summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-10-04 07:41:35 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-10-04 07:41:35 +0200
commitb6ebadaa66ee68b1880c0e10669543d1ba058c18 (patch)
tree75506bd02a8186a013b5eb16a425de0c1d96bc71
parent7d4b2b984779e695d0c233d11173b2965d25ef27 (diff)
parentfe449affcf99fcf63f620994b544eb96d2504cda (diff)
downloadmariadb-git-b6ebadaa66ee68b1880c0e10669543d1ba058c18.tar.gz
Merge branch '10.6' into 10.7
-rw-r--r--CMakeLists.txt6
-rw-r--r--Docs/README-wsrep6
-rw-r--r--Docs/myisam.txt2
-rw-r--r--client/mysql_upgrade.c6
-rw-r--r--client/mysqlshow.c14
-rw-r--r--include/my_dbug.h8
-rw-r--r--include/my_pthread.h1
-rw-r--r--include/my_sys.h11
m---------libmariadb0
-rw-r--r--mysql-test/main/alter_table-big.test1
-rw-r--r--mysql-test/main/analyze_stmt_privileges.result6
-rw-r--r--mysql-test/main/analyze_stmt_privileges2.result1794
-rw-r--r--mysql-test/main/bootstrap.test2
-rw-r--r--mysql-test/main/bootstrap_innodb.test2
-rw-r--r--mysql-test/main/create_or_replace_permission.result2
-rw-r--r--mysql-test/main/cte_grant.result4
-rw-r--r--mysql-test/main/cte_nonrecursive_not_embedded.result2
-rw-r--r--mysql-test/main/cte_recursive.result586
-rw-r--r--mysql-test/main/cte_recursive.test664
-rw-r--r--mysql-test/main/flush-innodb-notembedded.result2
-rw-r--r--mysql-test/main/flush_notembedded.result4
-rw-r--r--mysql-test/main/gis_notembedded.result2
-rw-r--r--mysql-test/main/grant.result92
-rw-r--r--mysql-test/main/grant2.result22
-rw-r--r--mysql-test/main/grant4.result26
-rw-r--r--mysql-test/main/grant5.result61
-rw-r--r--mysql-test/main/grant5.test72
-rw-r--r--mysql-test/main/grant_cache_no_prot.result6
-rw-r--r--mysql-test/main/grant_cache_ps_prot.result6
-rw-r--r--mysql-test/main/grant_explain_non_select.result68
-rw-r--r--mysql-test/main/grant_lowercase_fs.result4
-rw-r--r--mysql-test/main/information_schema_db.result16
-rw-r--r--mysql-test/main/insert_notembedded.result6
-rw-r--r--mysql-test/main/insert_returning.result64
-rw-r--r--mysql-test/main/insert_returning.test70
-rw-r--r--mysql-test/main/invisible_field_grant_completely.result4
-rw-r--r--mysql-test/main/invisible_field_grant_system.result4
-rw-r--r--mysql-test/main/kill.result227
-rw-r--r--mysql-test/main/kill.test298
-rw-r--r--mysql-test/main/kill_debug.result239
-rw-r--r--mysql-test/main/kill_debug.test318
-rw-r--r--mysql-test/main/long_host.result34
-rw-r--r--mysql-test/main/lowercase_fs_off.result2
-rw-r--r--mysql-test/main/myisam_debug_keys.result4924
-rw-r--r--mysql-test/main/myisam_debug_keys.test64
-rw-r--r--mysql-test/main/mysql_tzinfo_to_sql_symlink.result43
-rw-r--r--mysql-test/main/mysql_tzinfo_to_sql_symlink.test17
-rw-r--r--mysql-test/main/mysql_upgrade.result6
-rw-r--r--mysql-test/main/mysql_upgrade.test12
-rw-r--r--mysql-test/main/mysqlbinlog.result2
-rw-r--r--mysql-test/main/mysqldump.result16
-rw-r--r--mysql-test/main/mysqldump.test35
-rw-r--r--mysql-test/main/openssl_1.result6
-rw-r--r--mysql-test/main/opt_trace_security.result2
-rw-r--r--mysql-test/main/partition_explicit_prune.result88
-rw-r--r--mysql-test/main/partition_explicit_prune.test43
-rw-r--r--mysql-test/main/partition_grant.result4
-rw-r--r--mysql-test/main/plugin_not_embedded.result2
-rw-r--r--mysql-test/main/ps_ddl.result12
-rw-r--r--mysql-test/main/ps_ddl.test14
-rw-r--r--mysql-test/main/ps_grant.result4
-rw-r--r--mysql-test/main/show_check.result8
-rw-r--r--mysql-test/main/sp-security-anchor-type.result18
-rw-r--r--mysql-test/main/sp-security.result28
-rw-r--r--mysql-test/main/status.result8
-rw-r--r--mysql-test/main/timezone_grant.result12
-rw-r--r--mysql-test/main/trigger_notembedded.result10
-rw-r--r--mysql-test/main/union.result85
-rw-r--r--mysql-test/main/union.test70
-rw-r--r--mysql-test/main/view.result28
-rw-r--r--mysql-test/main/view.test40
-rw-r--r--mysql-test/main/view_grant.result122
-rw-r--r--mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result2
-rw-r--r--mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test2
-rw-r--r--mysql-test/suite/compat/oracle/r/sp-security.result20
-rw-r--r--mysql-test/suite/encryption/r/debug_key_management.result1
-rw-r--r--mysql-test/suite/encryption/t/debug_key_management.test1
-rw-r--r--mysql-test/suite/engines/funcs/r/rpl_sp.result2
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_storedproc_06.result32
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_trig_03.result12
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_trig_03e.result68
-rw-r--r--mysql-test/suite/funcs_1/r/is_columns.result6
-rw-r--r--mysql-test/suite/funcs_1/r/is_table_constraints.result2
-rw-r--r--mysql-test/suite/funcs_1/r/is_triggers.result4
-rw-r--r--mysql-test/suite/funcs_1/r/is_user_privileges.result16
-rw-r--r--mysql-test/suite/funcs_1/r/memory_storedproc_06.result32
-rw-r--r--mysql-test/suite/funcs_1/r/memory_trig_03.result12
-rw-r--r--mysql-test/suite/funcs_1/r/memory_trig_03e.result68
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_storedproc_06.result32
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_trig_03.result12
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_trig_03e.result68
-rw-r--r--mysql-test/suite/funcs_1/r/storedproc.result2
-rw-r--r--mysql-test/suite/galera/r/galera_roles.result20
-rw-r--r--mysql-test/suite/galera/r/rename.result2
-rw-r--r--mysql-test/suite/gcol/t/virtual_index_drop.test1
-rw-r--r--mysql-test/suite/innodb/r/innodb-table-online.result18
-rw-r--r--mysql-test/suite/innodb/r/log_file_name_debug.result3
-rw-r--r--mysql-test/suite/innodb/t/alter_dml_apply.test1
-rw-r--r--mysql-test/suite/innodb/t/alter_mdl_timeout.test1
-rw-r--r--mysql-test/suite/innodb/t/autoinc_debug.test1
-rw-r--r--mysql-test/suite/innodb/t/blob-crash.test7
-rw-r--r--mysql-test/suite/innodb/t/innodb-table-online.test25
-rw-r--r--mysql-test/suite/innodb/t/log_file_name_debug.test4
-rw-r--r--mysql-test/suite/innodb/t/online_table_rebuild.test1
-rw-r--r--mysql-test/suite/mariabackup/alter_copy_excluded.test1
-rw-r--r--mysql-test/suite/mariabackup/alter_copy_race.test1
-rw-r--r--mysql-test/suite/mariabackup/big_innodb_log.test2
-rw-r--r--mysql-test/suite/parts/r/alter_table.result8
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result10
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result10
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_6.result6
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result4
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result4
-rw-r--r--mysql-test/suite/perfschema/r/connect_attrs.result2
-rw-r--r--mysql-test/suite/perfschema/r/dml_accounts.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_cond_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_digest.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_program.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_stages_current.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_stages_history.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_stages_history_long.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_statements_current.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_statements_history.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_statements_history_long.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_transactions_current.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_transactions_history.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_waits_current.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_waits_history.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_waits_history_long.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_instance.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_file_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_fs_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_fs_by_instance.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_global_status.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_host_cache.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_hosts.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_metadata_locks.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_mutex_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_os_global_by_type.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_performance_timers.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_replication_applier_status.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_rwlock_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_session_connect_attrs.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_session_status.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_setup_consumers.result6
-rw-r--r--mysql-test/suite/perfschema/r/dml_setup_instruments.result6
-rw-r--r--mysql-test/suite/perfschema/r/dml_setup_timers.result6
-rw-r--r--mysql-test/suite/perfschema/r/dml_socket_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_status_by_account.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_status_by_host.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_status_by_thread.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_status_by_user.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_table_handles.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_threads.result6
-rw-r--r--mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_tiws_by_table.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_tlws_by_table.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_users.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_uvar_by_thread.result14
-rw-r--r--mysql-test/suite/perfschema/r/misc.result2
-rw-r--r--mysql-test/suite/perfschema/r/privilege.result128
-rw-r--r--mysql-test/suite/perfschema/r/setup_actors.result2
-rw-r--r--mysql-test/suite/perfschema/r/setup_actors_enabled.result2
-rw-r--r--mysql-test/suite/roles/definer.result8
-rw-r--r--mysql-test/suite/roles/recursive.result16
-rw-r--r--mysql-test/suite/roles/recursive_dbug.result16
-rw-r--r--mysql-test/suite/roles/role_case_sensitive-10744.result4
-rw-r--r--mysql-test/suite/roles/role_grant_propagate-29458.result2
-rw-r--r--mysql-test/suite/roles/roles_tables_priv-29465.result6
-rw-r--r--mysql-test/suite/roles/set_and_drop.result18
-rw-r--r--mysql-test/suite/roles/set_default_role_clear.result4
-rw-r--r--mysql-test/suite/roles/set_default_role_for.result4
-rw-r--r--mysql-test/suite/roles/set_default_role_invalid.result6
-rw-r--r--mysql-test/suite/roles/set_default_role_new_connection.result6
-rw-r--r--mysql-test/suite/roles/set_role-5232.result2
-rw-r--r--mysql-test/suite/roles/set_role-database-recursive.result6
-rw-r--r--mysql-test/suite/roles/set_role-database-simple.result12
-rw-r--r--mysql-test/suite/roles/set_role-multiple-role.result6
-rw-r--r--mysql-test/suite/roles/set_role-recursive.result8
-rw-r--r--mysql-test/suite/roles/set_role-simple.result4
-rw-r--r--mysql-test/suite/roles/set_role-table-column-priv.result4
-rw-r--r--mysql-test/suite/roles/set_role-table-simple.result4
-rw-r--r--mysql-test/suite/rpl/r/rpl_row_img_sequence.result2290
-rw-r--r--mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result767
-rw-r--r--mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result797
-rw-r--r--mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result796
-rw-r--r--mysql-test/suite/rpl/r/rpl_sp.result2
-rw-r--r--mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test1
-rw-r--r--mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf (renamed from mysql-test/suite/rpl/t/rpl_row_img_sequence.cnf)0
-rw-r--r--mysql-test/suite/rpl/t/rpl_row_img_sequence_full.test48
-rw-r--r--mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf21
-rw-r--r--mysql-test/suite/rpl/t/rpl_row_img_sequence_min.test (renamed from mysql-test/suite/rpl/t/rpl_row_img_sequence.test)29
-rw-r--r--mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf21
-rw-r--r--mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.test51
-rw-r--r--mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test1
-rw-r--r--mysql-test/suite/sql_sequence/alter_notembedded.result8
-rw-r--r--mysql-test/suite/sql_sequence/grant.result10
-rw-r--r--mysql-test/suite/sql_sequence/gtid.result10
-rw-r--r--mysql-test/suite/sql_sequence/replication.result4
-rw-r--r--mysql-test/suite/stress/t/deadlock_drop_table.test1
-rw-r--r--mysql-test/suite/sys_vars/t/sysvars_debug.test1
-rw-r--r--mysql-test/suite/versioning/r/not_embedded.result2
-rw-r--r--mysys/mf_keycache.c6
-rw-r--r--plugin/auth_gssapi/CMakeLists.txt1
-rw-r--r--plugin/wsrep_info/mysql-test/wsrep_info/suite.pm2
-rw-r--r--sql/debug_sync.cc27
-rw-r--r--sql/event_queue.cc2
-rw-r--r--sql/field.cc6
-rw-r--r--sql/gcalc_slicescan.cc4
-rw-r--r--sql/ha_partition.cc15
-rw-r--r--sql/handler.cc9
-rw-r--r--sql/item.h1
-rw-r--r--sql/item_create.cc2
-rw-r--r--sql/item_func.cc2
-rw-r--r--sql/item_subselect.cc44
-rw-r--r--sql/item_subselect.h1
-rw-r--r--sql/log.cc10
-rw-r--r--sql/log.h2
-rw-r--r--sql/log_event.cc4
-rw-r--r--sql/mdl.cc6
-rw-r--r--sql/mysqld.cc2
-rw-r--r--sql/net_serv.cc4
-rw-r--r--sql/parse_file.cc21
-rw-r--r--sql/records.cc4
-rw-r--r--sql/rpl_injector.h4
-rw-r--r--sql/rpl_parallel.cc12
-rw-r--r--sql/rpl_record.cc6
-rw-r--r--sql/semisync_master.cc6
-rw-r--r--sql/share/errmsg-utf8.txt38
-rw-r--r--sql/slave.cc8
-rw-r--r--sql/sp_head.cc2
-rw-r--r--sql/sql_acl.cc13
-rw-r--r--sql/sql_analyse.cc60
-rw-r--r--sql/sql_base.cc35
-rw-r--r--sql/sql_binlog.cc15
-rw-r--r--sql/sql_cache.cc5
-rw-r--r--sql/sql_class.cc7
-rw-r--r--sql/sql_class.h12
-rw-r--r--sql/sql_cte.cc100
-rw-r--r--sql/sql_cte.h20
-rw-r--r--sql/sql_debug.h168
-rw-r--r--sql/sql_lex.cc24
-rw-r--r--sql/sql_lex.h2
-rw-r--r--sql/sql_parse.cc28
-rw-r--r--sql/sql_prepare.cc4
-rw-r--r--sql/sql_priv.h1
-rw-r--r--sql/sql_repl.cc8
-rw-r--r--sql/sql_show.cc30
-rw-r--r--sql/sql_string.cc11
-rw-r--r--sql/sql_string.h51
-rw-r--r--sql/sql_table.cc10
-rw-r--r--sql/sql_trigger.cc29
-rw-r--r--sql/sql_trigger.h4
-rw-r--r--sql/sql_tvc.cc2
-rw-r--r--sql/sql_udf.cc5
-rw-r--r--sql/sql_union.cc9
-rw-r--r--sql/sql_view.cc84
-rw-r--r--sql/sql_yacc.yy47
-rw-r--r--sql/table.cc69
-rw-r--r--sql/table.h67
-rw-r--r--sql/tztime.cc3
-rw-r--r--sql/wsrep_high_priority_service.cc8
-rw-r--r--sql/wsrep_mysqld.cc7
-rw-r--r--sql/wsrep_server_service.cc2
-rw-r--r--sql/wsrep_sst.cc2
-rw-r--r--sql/wsrep_thd.cc2
-rw-r--r--storage/connect/bsonudf.cpp4
-rw-r--r--storage/connect/global.h2
-rw-r--r--storage/connect/ha_connect.cc18
-rw-r--r--storage/connect/ha_connect.h22
-rw-r--r--storage/connect/jdbconn.cpp10
-rw-r--r--storage/connect/json.cpp6
-rw-r--r--storage/connect/jsonudf.cpp4
-rw-r--r--storage/connect/libdoc.cpp38
-rw-r--r--storage/connect/mysql-test/connect/r/mysql.result22
-rw-r--r--storage/connect/mysql-test/connect/r/odbc_postgresql.result24
-rw-r--r--storage/connect/mysql-test/connect/t/mysql.test20
-rw-r--r--storage/connect/mysql-test/connect/t/odbc_postgresql.sql3
-rw-r--r--storage/connect/mysql-test/connect/t/odbc_postgresql.test6
-rw-r--r--storage/connect/plugutil.cpp17
-rw-r--r--storage/connect/tabbson.cpp4
-rw-r--r--storage/connect/tabodbc.cpp2
-rw-r--r--storage/connect/tabwmi.cpp2
-rw-r--r--storage/connect/valblk.cpp2
-rw-r--r--storage/federatedx/federatedx_txn.cc19
-rw-r--r--storage/federatedx/ha_federatedx.cc4
-rw-r--r--storage/innobase/btr/btr0defragment.cc2
-rw-r--r--storage/innobase/dict/dict0stats_bg.cc2
-rw-r--r--storage/innobase/fts/fts0fts.cc78
-rw-r--r--storage/innobase/fts/fts0opt.cc2
-rw-r--r--storage/innobase/handler/ha_innodb.cc17
-rw-r--r--storage/innobase/include/ha_prototypes.h7
-rw-r--r--storage/innobase/include/srv0start.h5
-rw-r--r--storage/innobase/que/que0que.cc4
-rw-r--r--storage/innobase/row/row0log.cc4
-rw-r--r--storage/innobase/srv/srv0srv.cc2
-rw-r--r--storage/innobase/srv/srv0start.cc28
-rw-r--r--storage/maria/ma_check.c2
-rw-r--r--storage/maria/ma_loghandler.c6
-rw-r--r--storage/maria/ma_pagecache.c17
-rw-r--r--storage/maria/unittest/ma_pagecache_single.c6
-rw-r--r--storage/myisam/ha_myisam.cc32
-rw-r--r--storage/myisam/mi_check.c2
-rw-r--r--storage/myisam/mi_create.c10
-rw-r--r--storage/rocksdb/CMakeLists.txt2
-rw-r--r--storage/spider/mysql-test/spider/bugfix/include/restart_spider.inc8
-rw-r--r--storage/spider/mysql-test/spider/bugfix/r/mdev_29352.result12
-rw-r--r--storage/spider/mysql-test/spider/bugfix/t/mdev_29352.test11
-rw-r--r--storage/spider/spd_group_by_handler.cc2
-rw-r--r--storage/spider/spd_ping_table.cc11
344 files changed, 13372 insertions, 5519 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 011b2c3a754..b25844713a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -257,9 +257,11 @@ ENDIF()
INCLUDE(wsrep)
-OPTION(WITH_DBUG_TRACE "Enable DBUG_ENTER()/DBUG_EXIT()" ON)
+OPTION(WITH_DBUG_TRACE "Enable DBUG_ENTER()/DBUG_RETURN()/DBUG_PRINT()" ON)
IF(WITH_DBUG_TRACE)
- ADD_DEFINITIONS(-DDBUG_TRACE)
+ FOREACH(LANG C CXX)
+ SET(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} -DDBUG_TRACE")
+ ENDFOREACH()
ENDIF()
# Always enable debug sync for debug builds.
diff --git a/Docs/README-wsrep b/Docs/README-wsrep
index 79278ed8927..2e3bf52219d 100644
--- a/Docs/README-wsrep
+++ b/Docs/README-wsrep
@@ -365,7 +365,7 @@ wsrep_forced_binlog_format=none
special value NONE, meaning that there is no forced binlog format in effect.
This variable was introduced to support STATEMENT format replication during
rolling schema upgrade processing. However, in most cases ROW replication
- is valid for asymmetrict schema replication.
+ is valid for asymmetric schema replication.
State snapshot transfer options.
@@ -416,7 +416,7 @@ wsrep_sst_donor=
6. ONLINE SCHEMA UPGRADE
- Schema upgrades mean any data definition statements (DDL statemnents) run
+ Schema upgrades mean any data definition statements (DDL statements) run
for the database. They change the database structure and are non-
transactional.
@@ -429,7 +429,7 @@ wsrep_sst_donor=
With earlier releases, DDL processing happened always by Total Order
Isolation (TOI) method. With TOI, the DDL was scheduled to be processed in
- same transaction seqeuncing 'slot' in each cluster node.
+ same transaction sequencing 'slot' in each cluster node.
The processing is secured by locking the affected table from any other use.
With TOI method, the whole cluster has part of the database locked for the
duration of the DDL processing.
diff --git a/Docs/myisam.txt b/Docs/myisam.txt
index db41fb911ca..f959d8eb775 100644
--- a/Docs/myisam.txt
+++ b/Docs/myisam.txt
@@ -177,7 +177,7 @@ HA_EXTRA_NO_KEYREAD=8 Normal read of records (def)
HA_EXTRA_NO_USER_CHANGE=9 No user is allowed to write
HA_EXTRA_KEY_CACHE=10
HA_EXTRA_NO_KEY_CACHE=11
-HA_EXTRA_WAIT_LOCK=12 Wait until file is avalably (def)
+HA_EXTRA_WAIT_LOCK=12 Wait until file is available (def)
HA_EXTRA_NO_WAIT_LOCK=13 If file is locked, return quickly
HA_EXTRA_WRITE_CACHE=14 Use write cache in ha_write()
HA_EXTRA_FLUSH_CACHE=15 flush write_record_cache
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 0834bfc6128..d026c347c82 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -935,7 +935,7 @@ static int run_mysqlcheck_upgrade(my_bool mysql_db_only)
return 0;
}
verbose("Phase %d/%d: Checking and upgrading %s", ++phase, phases_total, what);
- print_conn_args("mysqlcheck");
+ print_conn_args("mariadb-check");
retch= run_tool(mysqlcheck_path,
NULL, /* Send output from mysqlcheck directly to screen */
defaults_file,
@@ -1451,7 +1451,7 @@ int main(int argc, char **argv)
}
/* Find mysql */
- find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name);
+ find_tool(mysql_path, IF_WIN("mariadb.exe", "mariadb"), self_name);
open_mysql_upgrade_file();
@@ -1459,7 +1459,7 @@ int main(int argc, char **argv)
exit(upgrade_already_done(0) == 0);
/* Find mysqlcheck */
- find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name);
+ find_tool(mysqlcheck_path, IF_WIN("mariadb-check.exe", "mariadb-check"), self_name);
if (opt_systables_only && !opt_silent)
printf("The --upgrade-system-tables option was used, user tables won't be touched.\n");
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 9b31d87225c..23bafa3ccea 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -506,7 +506,7 @@ list_dbs(MYSQL *mysql,const char *wild)
MYSQL_RES *tresult = mysql_list_tables(mysql,(char*)NULL);
if (mysql_affected_rows(mysql) > 0)
{
- sprintf(tables,"%6lu",(ulong) mysql_affected_rows(mysql));
+ snprintf(tables, sizeof(tables), "%6lu",(ulong) mysql_affected_rows(mysql));
rowcount = 0;
if (opt_verbose > 1)
{
@@ -527,13 +527,13 @@ list_dbs(MYSQL *mysql,const char *wild)
}
}
}
- sprintf(rows,"%12lu",rowcount);
+ snprintf(rows, sizeof(rows), "%12lu", rowcount);
}
}
else
{
- sprintf(tables,"%6d",0);
- sprintf(rows,"%12d",0);
+ snprintf(tables, sizeof(tables), "%6d" ,0);
+ snprintf(rows, sizeof(rows), "%12d", 0);
}
mysql_free_result(tresult);
}
@@ -651,7 +651,7 @@ list_tables(MYSQL *mysql,const char *db,const char *table)
}
else
{
- sprintf(fields,"%8u",(uint) mysql_num_fields(rresult));
+ snprintf(fields, sizeof(fields), "%8u", (uint) mysql_num_fields(rresult));
mysql_free_result(rresult);
if (opt_verbose > 1)
@@ -667,10 +667,10 @@ list_tables(MYSQL *mysql,const char *db,const char *table)
rowcount += (unsigned long) strtoull(rrow[0], (char**) 0, 10);
mysql_free_result(rresult);
}
- sprintf(rows,"%10lu",rowcount);
+ snprintf(rows, sizeof(rows), "%10lu", rowcount);
}
else
- sprintf(rows,"%10d",0);
+ snprintf(rows, sizeof(rows), "%10d", 0);
}
}
}
diff --git a/include/my_dbug.h b/include/my_dbug.h
index eb4536559f1..02caadbff48 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -77,6 +77,9 @@ extern int (*dbug_sanity)(void);
_db_stack_frame_.line= 0; \
} while(0)
+#define DBUG_PRINT(keyword,arglist) \
+ do if (_db_pargs_(__LINE__,keyword)) _db_doprnt_ arglist; while(0)
+
#ifdef HAVE_ATTRIBUTE_CLEANUP
#define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_ __attribute__((cleanup(_db_return_))); \
_db_enter_ (a,__FILE__,__LINE__,&_db_stack_frame_)
@@ -94,15 +97,15 @@ extern int (*dbug_sanity)(void);
#define DBUG_ENTER(a)
#define DBUG_RETURN(a1) return(a1)
#define DBUG_VOID_RETURN return
+#define DBUG_PRINT(keyword,arglist) do{} while(0)
#endif
#define DBUG_EXECUTE(keyword,a1) \
do {if (_db_keyword_(0, (keyword), 0)) { a1 }} while(0)
#define DBUG_EXECUTE_IF(keyword,a1) \
do {if (_db_keyword_(0, (keyword), 1)) { a1 }} while(0)
+
#define DBUG_IF(keyword) _db_keyword_(0, (keyword), 1)
-#define DBUG_PRINT(keyword,arglist) \
- do if (_db_pargs_(__LINE__,keyword)) _db_doprnt_ arglist; while(0)
#define DBUG_PUSH_EMPTY if (_dbug_on_) { DBUG_PUSH(""); }
#define DBUG_POP_EMPTY if (_dbug_on_) { DBUG_POP(); }
@@ -167,6 +170,7 @@ extern void _db_suicide_(void);
#define DBUG_LEAVE
#define DBUG_RETURN(a1) do { return(a1); } while(0)
#define DBUG_VOID_RETURN do { return; } while(0)
+#define DBUG_PRINT(keyword, arglist) do { } while(0)
#define DBUG_EXECUTE(keyword,a1) do { } while(0)
#define DBUG_EXECUTE_IF(keyword,a1) do { } while(0)
#define DBUG_IF(keyword) 0
diff --git a/include/my_pthread.h b/include/my_pthread.h
index c81f3ec7d40..3e68538b424 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -436,6 +436,7 @@ void safe_mutex_free_deadlock_data(safe_mutex_t *mp);
#define my_cond_wait(A,B) safe_cond_wait((A), (B), __FILE__, __LINE__)
#else
+#define safe_mutex_is_owner(mp) (1)
#define safe_mutex_assert_owner(mp) do {} while (0)
#define safe_mutex_assert_not_owner(mp) do {} while (0)
#define safe_mutex_setflags(mp, F) do {} while (0)
diff --git a/include/my_sys.h b/include/my_sys.h
index 6a0c92b4a07..0f49077b6d0 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -958,6 +958,17 @@ extern ulonglong my_getcputime(void);
#define hrtime_sec_part(X) ((ulong)((X).val % HRTIME_RESOLUTION))
#define my_time(X) hrtime_to_time(my_hrtime_coarse())
+/**
+ Make high resolution time from two parts.
+*/
+
+static inline my_hrtime_t make_hr_time(my_time_t time, ulong time_sec_part)
+{
+ my_hrtime_t res= {((ulonglong) time)*1000000 + time_sec_part};
+ return res;
+}
+
+
#if STACK_DIRECTION < 0
#define available_stack_size(CUR,END) (long) ((char*)(CUR) - (char*)(END))
#else
diff --git a/libmariadb b/libmariadb
-Subproject a6665e65c05c00f9df983a0f788a643ca7bc084
+Subproject 380ee32375bb36b68796c1c3eb09285f03fea5f
diff --git a/mysql-test/main/alter_table-big.test b/mysql-test/main/alter_table-big.test
index b010815955f..66f95938107 100644
--- a/mysql-test/main/alter_table-big.test
+++ b/mysql-test/main/alter_table-big.test
@@ -5,6 +5,7 @@
--source include/big_test.inc
# We are using some debug-only features in this test
--source include/have_debug.inc
+--source include/have_debug_sync.inc
# Also we are using SBR to check that statements are executed
# in proper order.
--source include/have_binlog_format_mixed_or_statement.inc
diff --git a/mysql-test/main/analyze_stmt_privileges.result b/mysql-test/main/analyze_stmt_privileges.result
index d54b5b37863..092f577e1bd 100644
--- a/mysql-test/main/analyze_stmt_privileges.result
+++ b/mysql-test/main/analyze_stmt_privileges.result
@@ -11,11 +11,11 @@ CREATE USER u1@localhost;
grant ALL on db.v1 to u1@localhost;
connect con1,localhost,u1,,;
select * from db.t1;
-ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table `db`.`t1`
explain select * from db.t1;
-ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table `db`.`t1`
analyze select * from db.t1;
-ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table `db`.`t1`
select * from db.v1;
i c
2 bar
diff --git a/mysql-test/main/analyze_stmt_privileges2.result b/mysql-test/main/analyze_stmt_privileges2.result
index f269aaf540b..2b75f736a22 100644
--- a/mysql-test/main/analyze_stmt_privileges2.result
+++ b/mysql-test/main/analyze_stmt_privileges2.result
@@ -29,89 +29,89 @@ connection con1;
# because the query itself cannot be executed
#------------------------------------------------------------------------
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -283,71 +283,71 @@ connection con1;
# Expectation: Can only run SELECT, EXPLAIN SELECT, ANALYZE SELECT
#------------------------------------------------------------------------
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
a b
10 NULL
@@ -634,77 +634,77 @@ ANALYZE INSERT INTO t1 SELECT * FROM t2;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 3.00 100.00 100.00
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -879,29 +879,29 @@ connection con1;
# read columns fail with ER_COLUMNACCESS_DENIED_ERROR
#------------------------------------------------------------------------
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
EXPLAIN UPDATE t1 SET a = 10;
id select_type table type possible_keys key key_len ref rows Extra
@@ -922,47 +922,47 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 't1'
DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -1138,47 +1138,47 @@ connection con1;
#------------------------------------------------------------------------
# Note: ANALYZE DELETE FROM t1 USING t1, t2 ... fails due to MDEV-7043
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
EXPLAIN DELETE FROM t1;
id select_type table type possible_keys key key_len ref rows Extra
@@ -1193,35 +1193,35 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
ANALYZE DELETE FROM t1 WHERE a = 10;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 't1'
DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -1394,47 +1394,47 @@ connection con1;
# Expectation: Can run DELETE, EXPLAIN DELETE, ANALYZE DELETE
#------------------------------------------------------------------------
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
EXPLAIN DELETE FROM t1;
id select_type table type possible_keys key key_len ref rows Extra
@@ -1465,23 +1465,23 @@ ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run everything: SELECT access to the column `a`
@@ -2077,89 +2077,89 @@ connection con1;
# Expectation: Cannot run anything
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -2252,89 +2252,89 @@ connection con1;
# Expectation: Cannot run anything
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -2430,71 +2430,71 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
a b
EXPLAIN SELECT * FROM v1;
@@ -2612,71 +2612,71 @@ connection con1;
# Expectation: Can run SELECT, EXPLAIN SELECT, ANALYZE SELECT
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
a b
EXPLAIN SELECT * FROM v1;
@@ -2838,77 +2838,77 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE INSERT INTO v1 SELECT * FROM t2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -3005,29 +3005,29 @@ connection con1;
# (it could have revealed the structure of the view).
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
EXPLAIN UPDATE v1 SET a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -3045,47 +3045,47 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -3181,29 +3181,29 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
EXPLAIN UPDATE v1 SET a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -3220,43 +3220,43 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE SELECT * FROM v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE SELECT * FROM v1 WHERE a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
@@ -3356,29 +3356,29 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
EXPLAIN UPDATE v1 SET a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -3395,29 +3395,29 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
a b
EXPLAIN SELECT * FROM v1;
@@ -3532,47 +3532,47 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
EXPLAIN DELETE FROM v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -3585,35 +3585,35 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE DELETE FROM v1 WHERE a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -3708,47 +3708,47 @@ connection con1;
# which don't read any columns
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
EXPLAIN DELETE FROM v1;
id select_type table type possible_keys key key_len ref rows Extra
@@ -3763,35 +3763,35 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
ANALYZE DELETE FROM v1 WHERE a = 10;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 'v1'
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -4123,89 +4123,89 @@ connection con1;
# Expectation: Cannot run anything
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant SHOW VIEW on the outer view
@@ -4219,89 +4219,89 @@ connection con1;
# Expectation: Cannot run anything
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant SHOW VIEW, SELECT(a) on the outer view
@@ -4317,71 +4317,71 @@ connection con1;
# when only `a` column is involved
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT a FROM v2;
a
EXPLAIN SELECT a FROM v2;
@@ -4391,17 +4391,17 @@ ANALYZE SELECT a FROM v2;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 39 39.00 100.00 0.00 Using where
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT a FROM v2 WHERE a = 10;
a
EXPLAIN SELECT a FROM v2 WHERE a = 10;
@@ -4411,11 +4411,11 @@ ANALYZE SELECT a FROM v2 WHERE a = 10;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 39 39.00 100.00 0.00 Using where
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant SELECT on the outer view
@@ -4432,71 +4432,71 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
a b
EXPLAIN SELECT * FROM v2;
@@ -4529,71 +4529,71 @@ connection con1;
# Expectation: Can run SELECT, EXPLAIN SELECT, ANALYZE SELECT
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
a b
EXPLAIN SELECT * FROM v2;
@@ -4649,77 +4649,77 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE INSERT INTO v2 SELECT * FROM t2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant UPDATE on the outer view
@@ -4738,29 +4738,29 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
EXPLAIN UPDATE v2 SET a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -4778,47 +4778,47 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant UPDATE, SHOW VIEW on the outer view
@@ -4834,29 +4834,29 @@ connection con1;
# which do not read any columns
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
EXPLAIN UPDATE v2 SET a = 10;
id select_type table type possible_keys key key_len ref rows Extra
@@ -4878,47 +4878,47 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 'v2'
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant DELETE on the outer view
@@ -4936,47 +4936,47 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
EXPLAIN DELETE FROM v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -4989,35 +4989,35 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE DELETE FROM v2 WHERE a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant DELETE, SELECT on the outer view
@@ -5034,43 +5034,43 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
diff --git a/mysql-test/main/bootstrap.test b/mysql-test/main/bootstrap.test
index e2f882f1d19..f7bddf23408 100644
--- a/mysql-test/main/bootstrap.test
+++ b/mysql-test/main/bootstrap.test
@@ -8,7 +8,7 @@ drop table if exists t1;
# Add the datadir to the bootstrap command
let $MYSQLD_DATADIR= `select @@datadir`;
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --default-storage-engine=MyISAM --loose-skip-innodb --plugin-maturity=unknown;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --tmpdir=$MYSQL_TMP_DIR --default-storage-engine=MyISAM --loose-skip-innodb --plugin-maturity=unknown;
#
# Check that --bootstrap reads from stdin
#
diff --git a/mysql-test/main/bootstrap_innodb.test b/mysql-test/main/bootstrap_innodb.test
index ddaefb32155..eb3d09c0e74 100644
--- a/mysql-test/main/bootstrap_innodb.test
+++ b/mysql-test/main/bootstrap_innodb.test
@@ -19,7 +19,7 @@ rollback to savepoint s1;
insert t1 values (5);
commit;
EOF
-exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
+exec $MYSQLD_BOOTSTRAP_CMD --datadir=$datadir --tmpdir=$MYSQL_TMP_DIR --innodb < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1;
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
source include/start_mysqld.inc;
diff --git a/mysql-test/main/create_or_replace_permission.result b/mysql-test/main/create_or_replace_permission.result
index b9938e4270a..1ea15d9621b 100644
--- a/mysql-test/main/create_or_replace_permission.result
+++ b/mysql-test/main/create_or_replace_permission.result
@@ -32,7 +32,7 @@ CREATE OR REPLACE DATABASE db2;
ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'db2'
USE db1;
CREATE OR REPLACE TABLE t1(id INT);
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `db1`.`t1`
CREATE OR REPLACE PROCEDURE proc1 (OUT cnt INT) BEGIN END;
ERROR 42000: alter routine command denied to user 'mysqltest_1'@'localhost' for routine 'db1.proc1'
CREATE OR REPLACE FUNCTION lookup RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
diff --git a/mysql-test/main/cte_grant.result b/mysql-test/main/cte_grant.result
index 2ee31be3435..96588d26b6c 100644
--- a/mysql-test/main/cte_grant.result
+++ b/mysql-test/main/cte_grant.result
@@ -51,7 +51,7 @@ c
select d from mysqltest.v2;
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'd' in table 'v2'
select * from mysqltest.v3;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
connection root;
grant select on mysqltest.v3 to mysqltest_1@localhost;
connection user1;
@@ -116,7 +116,7 @@ revoke SELECT on db.t1 from foo@localhost;
connection con1;
with cte as (select * from t1 where i < 4)
select * from cte;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db`.`t1`
disconnect con1;
connection default;
drop database db;
diff --git a/mysql-test/main/cte_nonrecursive_not_embedded.result b/mysql-test/main/cte_nonrecursive_not_embedded.result
index c96a1ec2849..fa4d97d7bc5 100644
--- a/mysql-test/main/cte_nonrecursive_not_embedded.result
+++ b/mysql-test/main/cte_nonrecursive_not_embedded.result
@@ -39,7 +39,7 @@ cte3 AS
cte4 AS
(SELECT cte2.a FROM t2,cte2 WHERE cte2.a = t2.a)
SELECT * FROM cte4 as r;
-ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table `db`.`t2`
disconnect u1;
connection default;
DROP USER 'u1'@'localhost';
diff --git a/mysql-test/main/cte_recursive.result b/mysql-test/main/cte_recursive.result
index e0d86c082a1..adbe02363b3 100644
--- a/mysql-test/main/cte_recursive.result
+++ b/mysql-test/main/cte_recursive.result
@@ -5016,6 +5016,592 @@ t2 CREATE TABLE `t2` (
set @@sql_mode=default;
drop table t1,t2;
#
+# MDEV-29361: Embedded recursive / non-recursive CTE within
+# the scope of another embedded CTE with the same name
+#
+create table t1 (a int);
+insert into t1 values (4), (5);
+create table t2 (a int);
+insert into t2 values (6), (8);
+create table t3 (a int);
+insert into t3 values (1), (9);
+with recursive
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1;
+a
+4
+5
+6
+7
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2;
+a
+6
+8
+10
+with
+cte as
+(
+with recursive
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1
+where s1.a in (
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+a
+6
+with
+cte as
+(
+with recursive
+x(a) as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select s1.a from x as s1, x
+where s1.a = x.a and
+x.a in (
+with recursive
+x(a) as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+a
+6
+with
+cte as
+(
+with
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1
+where s1.a in (
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+ERROR 42S02: Table 'test.x' doesn't exist
+with
+cte as
+(
+with recursive
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1
+where s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+a
+6
+7
+with
+cte as
+(
+with
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1
+where s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+ERROR 42S02: Table 'test.x' doesn't exist
+with
+cte as
+(
+with recursive
+y as
+(
+select a from t1 union select a+1 from y as r1 where a < 7
+)
+select * from y as s1
+where s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+ERROR 42S02: Table 'test.x' doesn't exist
+with
+cte as
+(
+with
+y(a) as
+(
+select a+5 from t1
+)
+select * from y as s1
+where s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+ERROR 42S02: Table 'test.x' doesn't exist
+with
+cte as
+(
+select (
+with
+x as
+(
+select a from x as r1
+)
+select * from x as s1
+where s1.a in (
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+) as r
+from t3
+)
+select * from cte;
+ERROR 42S02: Table 'test.x' doesn't exist
+with
+cte as
+(
+select (
+with
+x as
+(
+select a from x as r1
+)
+select * from x as s1
+where s1.a < 5 and
+s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+) as r
+from t3
+)
+select * from cte;
+ERROR 42S02: Table 'test.x' doesn't exist
+with
+cte as
+(
+select (
+with recursive
+x(a) as
+(
+select a+3 from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1
+where s1.a < 8 and
+s1.a in (
+with recursive
+x(a) as
+(
+select a-2 from t2
+union
+select a+1 from x as r2 where a < 10
+)
+select a from x as s2
+)
+) as r
+from t3
+)
+select * from cte;
+r
+7
+7
+with
+cte as
+(
+select (
+with recursive
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1
+where s1.a in (
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+) as r
+from t3
+)
+select * from cte;
+r
+6
+6
+create table x (a int);
+insert into x values (3), (7), (1), (5), (6);
+with
+cte as
+(
+select (
+with
+x as
+(
+select ( select a from x as r1 ) as a from t1
+)
+select * from x as s1
+where s1.a in (
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x s2
+)
+) as r
+from t3
+)
+select * from cte;
+ERROR 21000: Subquery returns more than 1 row
+with
+cte as
+(
+select (
+with
+x as
+(
+select ( select a from x ) as a from t1
+)
+select exists (
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x
+)
+) as r
+from t3
+)
+select * from cte;
+r
+1
+1
+with
+cte_e as
+(
+with
+cte as
+(
+select (
+with
+x as
+(
+select ( select a from x ) from t1
+)
+select exists (
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x
+)
+) as r
+from t3
+)
+select * from cte
+)
+select s1.*, s2.* from cte_e as s1, cte_e as s2;
+r r
+1 1
+1 1
+1 1
+1 1
+with
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1;
+a
+4
+5
+2
+6
+7
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2;
+a
+6
+8
+5
+9
+3
+7
+with recursive
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1;
+a
+4
+5
+6
+7
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2;
+a
+6
+8
+10
+with
+cte as
+(
+with
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1
+where s1.a in (
+with recursive
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+a
+6
+with
+cte as
+(
+with
+x as
+(
+select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1
+where s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+a
+4
+6
+7
+with
+cte as
+(
+with recursive
+y as
+(
+select a from t1 union select a+1 from y as r1 where a < 7
+)
+select * from y as s1
+where s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+a
+5
+6
+7
+with
+cte as
+(
+with
+y(a) as
+(
+select a+5 from t1
+)
+select * from y as s1
+where s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+)
+select * from cte;
+a
+9
+with
+cte as
+(
+select (
+with
+x as
+(
+select a from x as r1
+)
+select * from x as s1
+where s1.a in (
+with
+recursive x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+) as r
+from t3
+)
+select * from cte;
+r
+6
+6
+with
+cte as
+(
+select (
+with
+x as
+(
+select a from x as r1
+)
+select * from x as s1
+where s1.a < 5 and
+s1.a in (
+with
+x as
+(
+select a from t2
+union
+select a+2 from x as r2 where a < 10
+)
+select a from x as s2
+)
+) as r
+from t3
+)
+select * from cte;
+r
+3
+3
+drop table t1,t2,t3,x;
+#
# End of 10.3 tests
#
#
diff --git a/mysql-test/main/cte_recursive.test b/mysql-test/main/cte_recursive.test
index 5afd445ead0..069997b0288 100644
--- a/mysql-test/main/cte_recursive.test
+++ b/mysql-test/main/cte_recursive.test
@@ -3210,6 +3210,670 @@ set @@sql_mode=default;
drop table t1,t2;
--echo #
+--echo # MDEV-29361: Embedded recursive / non-recursive CTE within
+--echo # the scope of another embedded CTE with the same name
+--echo #
+
+create table t1 (a int);
+insert into t1 values (4), (5);
+create table t2 (a int);
+insert into t2 values (6), (8);
+create table t3 (a int);
+insert into t3 values (1), (9);
+
+
+with recursive
+x as
+(
+ select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1;
+
+with recursive
+x as
+(
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+)
+select a from x as s2;
+
+# All recursive CTEs with name x are embedded in in the definition of 'cte',
+# without this embedding CTE the bug could not be reproduced
+
+# two recursive CTEs with name x, the second CTE is in the scope
+# of the first one, but does not use it
+# before fix of this bug: wrong result set
+
+with
+cte as
+(
+ with recursive
+ x as
+ (
+ select a from t1 union select a+1 from x as r1 where a < 7
+ )
+ select * from x as s1
+ where s1.a in (
+ with recursive
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# two recursive CTEs with name x, the second CTE is in the scope of the first
+# one, but does not use it; there are two non-recursive references to the latter
+# before fix of this bug: wrong result set
+
+with
+cte as
+(
+ with recursive
+ x(a) as
+ (
+ select a from t1 union select a+1 from x as r1 where a < 7
+ )
+ select s1.a from x as s1, x
+ where s1.a = x.a and
+ x.a in (
+ with recursive
+ x(a) as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r1 belongs to the definition of CTE x from non-RECURSIVE with clause
+# before fix of this bug: infinite sequence of recursive calls
+
+--error ER_NO_SUCH_TABLE
+with
+cte as
+(
+ with
+ x as
+ (
+ select a from t1 union select a+1 from x as r1 where a < 7
+ )
+ select * from x as s1
+ where s1.a in (
+ with recursive
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r2 belongs to the definition of CTE x from non-RECURSIVE with clause
+# yet it is in the scope of another CTE with the same name
+# before fix of this bug: crash in With_element::get_name()
+
+with
+cte as
+(
+ with recursive
+ x as
+ (
+ select a from t1 union select a+1 from x as r1 where a < 7
+ )
+ select * from x as s1
+ where s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r1 is in the definition of CTE x from non-RECURSIVE with clause, thus
+# although x as r2 is in the scope of the first CTE x an error is expected
+# before fix of this bug: crash in With_element::get_name()
+
+--error ER_NO_SUCH_TABLE
+with
+cte as
+(
+ with
+ x as
+ (
+ select a from t1 union select a+1 from x as r1 where a < 7
+ )
+ select * from x as s1
+ where s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r2 belongs to the definition of CTE x from non-RECURSIVE with clause
+# and in the scope of recursive CTE y, but does not use the latter
+# before fix of this bug: crash in With_element::get_name()
+
+--error ER_NO_SUCH_TABLE
+with
+cte as
+(
+ with recursive
+ y as
+ (
+ select a from t1 union select a+1 from y as r1 where a < 7
+ )
+ select * from y as s1
+ where s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r2 belongs to the definition of CTE x from non-RECURSIVE with clause
+# and in the scope of non-recursive CTE y, but does not use the latter
+# before fix of this bug: crash in With_element::get_name()
+
+--error ER_NO_SUCH_TABLE
+with
+cte as
+(
+ with
+ y(a) as
+ (
+ select a+5 from t1
+ )
+ select * from y as s1
+ where s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# in the subquery of the embedding CTE cte:
+# x as r1 is in the definition of CTE x from non-RECURSIVE with clause;
+# x as t2 is in the definition of CTE x from RECURSIVE with clause;
+# an error is expected to be reported for x as r1
+# before fix of this bug: infinite sequence of recursive calls
+
+--error ER_NO_SUCH_TABLE
+with
+cte as
+(
+ select (
+ with
+ x as
+ (
+ select a from x as r1
+ )
+ select * from x as s1
+ where s1.a in (
+ with recursive
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+ ) as r
+ from t3
+)
+select * from cte;
+
+
+# in the subquery of the embedding CTE cte:
+# x as r1 is in the definition of CTE x from non-RECURSIVE with clause, thus
+# although x as r2 is in the scope of the first CTE x an error is expected
+# before fix of this bug: crash in With_element::get_name()
+
+--error ER_NO_SUCH_TABLE
+with
+cte as
+(
+ select (
+ with
+ x as
+ (
+ select a from x as r1
+ )
+ select * from x as s1
+ where s1.a < 5 and
+ s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+ ) as r
+ from t3
+)
+select * from cte;
+
+
+# in the subquery of the embedding CTE cte:
+# two recursive CTEs with name x, the second CTE is in the scope
+# of the first one, but does not use it
+# before fix of this bug: wrong result set
+
+with
+cte as
+(
+ select (
+ with recursive
+ x(a) as
+ (
+ select a+3 from t1 union select a+1 from x as r1 where a < 7
+ )
+ select * from x as s1
+ where s1.a < 8 and
+ s1.a in (
+ with recursive
+ x(a) as
+ (
+ select a-2 from t2
+ union
+ select a+1 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+ ) as r
+ from t3
+)
+select * from cte;
+
+
+# in the subquery of the embedding CTE cte:
+# two recursive CTEs with name x, the second CTE is in the scope
+# of the first one, but does not use it
+# before fix of this bug: Subquery returns more than 1 row
+
+with
+cte as
+(
+ select (
+ with recursive
+ x as
+ (
+ select a from t1 union select a+1 from x as r1 where a < 7
+ )
+ select * from x as s1
+ where s1.a in (
+ with recursive
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+ ) as r
+ from t3
+)
+select * from cte;
+
+
+create table x (a int);
+insert into x values (3), (7), (1), (5), (6);
+
+
+# in the subquery of the embedding CTE cte:
+# one non-recursive CTEs with name x using table t in a subquery, the second
+# CTE x is recursive and is in the scope of the first one, but does not use it;
+# the query uses both CTE with name x.
+# before fix of this bug: infinite sequence of recursive calls
+
+--error ER_SUBQUERY_NO_1_ROW
+with
+cte as
+(
+ select (
+ with
+ x as
+ (
+ select ( select a from x as r1 ) as a from t1
+ )
+ select * from x as s1
+ where s1.a in (
+ with recursive
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x s2
+ )
+ ) as r
+ from t3
+)
+select * from cte;
+
+
+# in the subquery of the embedding CTE cte:
+# one non-recursive CTEs with name x using table t, the second CTE x is
+# recursive and is in the scope of the first one, but does not use it;
+# the query uses only the second CTE with name x.
+# before fix of this bug: Subquery returns more than 1 row
+
+with
+cte as
+(
+ select (
+ with
+ x as
+ (
+ select ( select a from x ) as a from t1
+ )
+ select exists (
+ with recursive
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x
+ )
+ ) as r
+ from t3
+)
+select * from cte;
+
+
+# in the subquery of the embedding CTE cte embedded in the CTE cte_e
+# one non-recursive CTEs with name x uses table t1, the second CTE x is
+# recursive and is in the scope of the first one, but does not use it;
+# CTE cte uses only the second CTE with name x;
+# the query has two refeences to cte_e
+# before fix of this bug: infinite sequence of recursive calls
+
+with
+cte_e as
+(
+ with
+ cte as
+ (
+ select (
+ with
+ x as
+ (
+ select ( select a from x ) from t1
+ )
+ select exists (
+ with recursive
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x
+ )
+ ) as r
+ from t3
+ )
+ select * from cte
+)
+select s1.*, s2.* from cte_e as s1, cte_e as s2;
+
+
+# check : with base table x all queries abobe that returned error
+# message ER_NO_SUCH_TABLE now return proper result sets
+
+with
+x as
+(
+ select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1;
+
+with
+x as
+(
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+)
+select a from x as s2;
+
+with recursive
+x as
+(
+ select a from t1 union select a+1 from x as r1 where a < 7
+)
+select * from x as s1;
+
+with recursive
+x as
+(
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+)
+select a from x as s2;
+
+
+# x as r1 is bound to table x, x as s1 is bound to the first CTE x
+# x as r2 and x as s2 are bound to the second CTE x
+# before fix of this bug: infinite sequence of recursive calls
+
+with
+cte as
+(
+ with
+ x as
+ (
+ select a from t1 union select a+1 from x as r1 where a < 7
+ )
+ select * from x as s1
+ where s1.a in (
+ with recursive
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r1 is bound to table x, x as s1 is bound to the first CTE x
+# x as r1 is bound to the first CTE x, x as s2 is bound to the second CTE x
+# before fix of this bug: crash in With_element::get_name()
+
+with
+cte as
+(
+ with
+ x as
+ (
+ select a from t1 union select a+1 from x as r1 where a < 7
+ )
+ select * from x as s1
+ where s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r2 is bound to table x, x as s2 is bound to CTE x
+# before fix of this bug: crash in With_element::get_name()
+
+with
+cte as
+(
+ with recursive
+ y as
+ (
+ select a from t1 union select a+1 from y as r1 where a < 7
+ )
+ select * from y as s1
+ where s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r2 is bound to table x, x as s2 is bound to CTE x
+# before fix of this bug: crash in With_element::get_name()
+
+with
+cte as
+(
+ with
+ y(a) as
+ (
+ select a+5 from t1
+ )
+ select * from y as s1
+ where s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+)
+select * from cte;
+
+
+# x as r1 is bound to table x, x as s1 is bound to the first CTE x
+# x as r2 and x as s2 are bound to the second CTE x
+# before fix of this bug: infinite sequence of recursive calls
+
+with
+cte as
+(
+ select (
+ with
+ x as
+ (
+ select a from x as r1
+ )
+ select * from x as s1
+ where s1.a in (
+ with
+ recursive x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+ ) as r
+ from t3
+)
+select * from cte;
+
+
+# x as r1 is bound to table x, x as s1 is bound to the first CTE x
+# x as r2 is bound to the first CTE x, x as s2 is bound to the second CTE x
+# before fix of this bug: crash in With_element::get_name()
+
+with
+cte as
+(
+ select (
+ with
+ x as
+ (
+ select a from x as r1
+ )
+ select * from x as s1
+ where s1.a < 5 and
+ s1.a in (
+ with
+ x as
+ (
+ select a from t2
+ union
+ select a+2 from x as r2 where a < 10
+ )
+ select a from x as s2
+ )
+ ) as r
+ from t3
+)
+select * from cte;
+
+
+drop table t1,t2,t3,x;
+
+--echo #
--echo # End of 10.3 tests
--echo #
diff --git a/mysql-test/main/flush-innodb-notembedded.result b/mysql-test/main/flush-innodb-notembedded.result
index 0b63a7b3519..279e52ae1cf 100644
--- a/mysql-test/main/flush-innodb-notembedded.result
+++ b/mysql-test/main/flush-innodb-notembedded.result
@@ -30,7 +30,7 @@ disconnect con1;
connection default;
connect con1, localhost, user5;
FLUSH TABLE db1.t1 FOR EXPORT;
-ERROR 42000: SELECT command denied to user 'user5'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user5'@'localhost' for table `db1`.`t1`
disconnect con1;
connection default;
DROP USER user1@localhost, user2@localhost, user3@localhost,
diff --git a/mysql-test/main/flush_notembedded.result b/mysql-test/main/flush_notembedded.result
index f4c83ff2361..25ddeba17d3 100644
--- a/mysql-test/main/flush_notembedded.result
+++ b/mysql-test/main/flush_notembedded.result
@@ -38,13 +38,13 @@ CREATE VIEW v2 AS SELECT * FROM performance_schema.accounts;
FLUSH TABLE information_schema.collations WITH READ LOCK;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
FLUSH TABLE performance_schema.accounts WITH READ LOCK;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
FLUSH TABLE information_schema.colums WITH READ LOCK;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
FLUSH TABLE information_schema.collations FOR EXPORT;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
FLUSH TABLE performance_schema.accounts FOR EXPORT;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
FLUSH TABLE information_schema.colums FOR EXPORT;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
#
diff --git a/mysql-test/main/gis_notembedded.result b/mysql-test/main/gis_notembedded.result
index e03ffeb5b23..0c469e3a72e 100644
--- a/mysql-test/main/gis_notembedded.result
+++ b/mysql-test/main/gis_notembedded.result
@@ -39,7 +39,7 @@ create user foo@localhost;
grant execute on mysql.* to foo@localhost;
connect foo, localhost, foo;
call mysql.AddGeometryColumn('', 'mysql', 'proc', 'c', 10);
-ERROR 42000: ALTER command denied to user 'foo'@'localhost' for table 'proc'
+ERROR 42000: ALTER command denied to user 'foo'@'localhost' for table `mysql`.`proc`
disconnect foo;
connection default;
drop user foo@localhost;
diff --git a/mysql-test/main/grant.result b/mysql-test/main/grant.result
index b5cf08441f3..5e86ea3d810 100644
--- a/mysql-test/main/grant.result
+++ b/mysql-test/main/grant.result
@@ -545,9 +545,9 @@ ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for column
update mysqltest_1.t2, mysqltest_2.t2 set d=20 where d=1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'd' in table 't2'
update mysqltest_1.t1, mysqltest_2.t2 set d=20 where d=1;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t1`
update mysqltest_2.t1, mysqltest_1.t2 set c=20 where b=1;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_2`.`t1`
update mysqltest_2.t1, mysqltest_2.t2 set d=10 where s=2;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 's' in table 't1'
update mysqltest_1.t1, mysqltest_2.t2 set a=10,d=10;
@@ -573,14 +573,14 @@ connection conn2;
use mysqltest_1;
update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;
update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t1`
use mysqltest_2;
update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t1`
update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't2'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t2`
update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t1`
connection master;
select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
a q b r
@@ -647,7 +647,7 @@ grant all on mysqltest.t1 to mysqltest_1@localhost;
connect user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK;
connection user1;
alter table t1 rename t2;
-ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t2`
disconnect user1;
connection root;
revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
@@ -836,7 +836,7 @@ grant insert, create on db27515.t2 to user27515@localhost;
connect conn27515, localhost, user27515, , db27515;
connection conn27515;
rename table t1 to t2;
-ERROR 42000: DROP command denied to user 'user27515'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'user27515'@'localhost' for table `db27515`.`t1`
disconnect conn27515;
connection master;
revoke all privileges, grant option from user27515@localhost;
@@ -1068,13 +1068,13 @@ GRANT SELECT ON mysqltest2.* TO 'mysqltest_1'@'localhost' IDENTIFIE
GRANT SHOW VIEW,SELECT ON mysqltest2.v_yy TO 'mysqltest_1'@'localhost' IDENTIFIED BY 'mysqltest_1';
connect mysqltest_1, localhost, mysqltest_1, mysqltest_1,;
SHOW CREATE VIEW mysqltest2.v_nn;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`v_nn`
SHOW CREATE TABLE mysqltest2.v_nn;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`v_nn`
SHOW CREATE VIEW mysqltest2.v_yn;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_yn'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`v_yn`
SHOW CREATE TABLE mysqltest2.v_yn;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_yn'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`v_yn`
SHOW CREATE TABLE mysqltest2.v_ny;
View Create View character_set_client collation_connection
v_ny CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_ny` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn` latin1 latin1_swedish_ci
@@ -1082,13 +1082,13 @@ SHOW CREATE VIEW mysqltest2.v_ny;
View Create View character_set_client collation_connection
v_ny CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_ny` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn` latin1 latin1_swedish_ci
SHOW CREATE TABLE mysqltest3.t_nn;
-ERROR 42000: SHOW command denied to user 'mysqltest_1'@'localhost' for table 't_nn'
+ERROR 42000: SHOW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest3`.`t_nn`
SHOW CREATE VIEW mysqltest3.t_nn;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't_nn'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest3`.`t_nn`
SHOW CREATE VIEW mysqltest3.v_nn;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest3`.`v_nn`
SHOW CREATE TABLE mysqltest3.v_nn;
-ERROR 42000: SHOW command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'
+ERROR 42000: SHOW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest3`.`v_nn`
SHOW CREATE TABLE mysqltest2.t_nn;
Table Create Table
t_nn CREATE TABLE `t_nn` (
@@ -1153,17 +1153,17 @@ Grants for mysqltest_1@localhost
GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT ON `mysqltest1`.`t1` TO `mysqltest_1`@`localhost`
RENAME TABLE t1 TO t2;
-ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
disconnect conn42;
connection default;
GRANT DROP ON mysqltest1.t1 TO mysqltest_1@localhost;
connect conn42,localhost,mysqltest_1,,mysqltest1;
RENAME TABLE t1 TO t2;
-ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
disconnect conn42;
connection default;
GRANT ALTER ON mysqltest1.t1 TO mysqltest_1@localhost;
@@ -1173,9 +1173,9 @@ Grants for mysqltest_1@localhost
GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT, DROP, ALTER ON `mysqltest1`.`t1` TO `mysqltest_1`@`localhost`
RENAME TABLE t1 TO t2;
-ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t2`
ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t2`
disconnect conn42;
connection default;
GRANT INSERT, CREATE ON mysqltest1.t1 TO mysqltest_1@localhost;
@@ -1209,9 +1209,9 @@ GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT, CREATE, ALTER ON `mysqltest1`.`t1` TO `mysqltest_1`@`localhost`
GRANT SELECT, CREATE, ALTER ON `mysqltest1`.`t2` TO `mysqltest_1`@`localhost`
RENAME TABLE t1 TO t2;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
disconnect conn42;
connection default;
DROP USER mysqltest_1@localhost;
@@ -1253,7 +1253,7 @@ GRANT DELETE ON t1 TO bug23556@localhost;
connection bug23556;
USE bug23556;
TRUNCATE t1;
-ERROR 42000: DROP command denied to user 'bug23556'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'bug23556'@'localhost' for table `bug23556`.`t1`
connection default;
USE bug23556;
REVOKE DELETE ON t1 FROM bug23556@localhost;
@@ -1331,16 +1331,16 @@ CREATE PROCEDURE mysqltest1.p1() SQL SECURITY INVOKER
SELECT 1;
connect bug27337_con1,localhost,mysqltest_1,,mysqltest2;
CREATE TABLE t1(c INT);
-ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`t1`
CALL mysqltest1.p1();
1
1
CREATE TABLE t1(c INT);
-ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`t1`
disconnect bug27337_con1;
connect bug27337_con2,localhost,mysqltest_1,,mysqltest2;
CREATE TABLE t1(c INT);
-ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`t1`
SHOW TABLES;
Tables_in_mysqltest2
connection default;
@@ -1382,9 +1382,9 @@ EXECUTE stmt1;
ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest1'
connection bug27337_con2;
SHOW COLUMNS FROM mysqltest2.t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest2`.`t2`
EXECUTE stmt2;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest2`.`t2`
connection default;
disconnect bug27337_con1;
disconnect bug27337_con2;
@@ -1506,11 +1506,11 @@ CALL p1;
ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for column 'b' in table 't1'
# - Check table-level privileges...
SELECT a FROM t2;
-ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table `mysqltest1`.`t2`
EXECUTE s2;
-ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table `mysqltest1`.`t2`
CALL p2;
-ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table `mysqltest1`.`t2`
# - Check database-level privileges...
SHOW TABLES FROM mysqltest2;
ERROR 42000: Access denied for user 'testuser'@'localhost' to database 'mysqltest2'
@@ -1645,9 +1645,9 @@ ERROR 42000: execute command denied to user 'mysqluser1'@'localhost' for routine
select mysqltest1.f1();
ERROR 42000: execute command denied to user 'mysqluser1'@'localhost' for routine 'mysqltest1.f1'
select * from mysqltest1.t11;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 't11'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t11`
select * from mysqltest1.t22;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 't22'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t22`
disconnect bug36544_con2;
connection default;
#
@@ -1669,9 +1669,9 @@ ERROR 42000: execute command denied to user 'mysqluser1'@'localhost' for routine
select mysqltest1.f1();
ERROR 42000: execute command denied to user 'mysqluser1'@'localhost' for routine 'mysqltest1.f1'
select * from mysqltest1.t11;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 't11'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t11`
select * from mysqltest1.t22;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 't22'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t22`
disconnect bug36544_con3;
connection default;
#
@@ -1722,7 +1722,7 @@ create table t1 (i INT);
connect user1,localhost,mysqltest,,mysqltest;
connection user1;
insert into t1 values (1);
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t1`
create table t2 (i INT);
create table t4 (i INT);
connection default;
@@ -1734,20 +1734,20 @@ flush privileges;
connection user1;
insert into t2 values (1);
create table if not exists t1 select * from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t1`
create table if not exists t3 select * from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't3'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t3`
create table if not exists t4 select * from t2;
Warnings:
Note 1050 Table 't4' already exists
create table if not exists t5 select * from t2;
create table t6 select * from t2;
create table t7 select * from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't7'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t7`
create table t4 select * from t2;
ERROR 42S01: Table 't4' already exists
create table t1 select * from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t1`
connection default;
drop table t1,t2,t4,t5,t6;
revoke create on mysqltest.* from mysqltest@localhost;
@@ -1910,7 +1910,7 @@ connect con1,localhost,testbug,,db1;
SELECT * FROM `../db2/tb2`;
ERROR 42S02: Table 'db1.../db2/tb2' doesn't exist
SELECT * FROM `../db2`.tb2;
-ERROR 42000: SELECT command denied to user 'testbug'@'localhost' for table 'tb2'
+ERROR 42000: SELECT command denied to user 'testbug'@'localhost' for table `../db2`.`tb2`
SELECT * FROM `#mysql50#/../db2/tb2`;
ERROR 42000: Incorrect table name '#mysql50#/../db2/tb2'
connection default;
@@ -1976,7 +1976,7 @@ connect con1,localhost,mysqltest_u1,,mysqltest_db1;
connection con1;
SHOW CREATE TABLE t1;
-ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t1`
connection default;
disconnect con1;
@@ -2782,10 +2782,10 @@ CREATE DATABASE db;
CREATE TABLE db.t (a INT);
connect con1,localhost,foo,,;
GRANT ALL ON db.t TO foo;
-ERROR 42000: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW ... command denied to user 'foo'@'localhost' for table 't'
+ERROR 42000: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW ... command denied to user 'foo'@'localhost' for table `db`.`t`
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT OPTION, REFERENCES,
INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON db.t TO foo;
-ERROR 42000: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW ... command denied to user 'foo'@'localhost' for table 't'
+ERROR 42000: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW ... command denied to user 'foo'@'localhost' for table `db`.`t`
connection default;
disconnect con1;
DROP USER foo;
diff --git a/mysql-test/main/grant2.result b/mysql-test/main/grant2.result
index 5307cfcaf8a..9d9b4c80292 100644
--- a/mysql-test/main/grant2.result
+++ b/mysql-test/main/grant2.result
@@ -108,9 +108,9 @@ GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT, INSERT ON `mysqltest`.* TO `mysqltest_1`@`localhost`
insert into t1 values (1, 'I can''t change it!');
update t1 set data='I can change it!' where id = 1;
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t1`
insert into t1 values (1, 'XXX') on duplicate key update data= 'I can change it!';
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t1`
select * from t1;
id data
1 I can't change it!
@@ -127,7 +127,7 @@ connection mrugly;
grant select (a,b) on t1 to mysqltest_2@localhost;
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 't1'
grant select on t1 to mysqltest_3@localhost;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t1`
disconnect mrugly;
connection default;
drop table t1;
@@ -312,7 +312,7 @@ grant create user on *.* to mysqltest_2@localhost;
connect user3,localhost,mysqltest_2,,;
connection user3;
select host,user,password,plugin,authentication_string from mysql.user where user like 'mysqltest_%' ;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysql`.`user`
create user mysqltest_A@'%';
rename user mysqltest_A@'%' to mysqltest_B@'%';
drop user mysqltest_B@'%';
@@ -328,7 +328,7 @@ Grants for mysqltest_3@localhost
GRANT USAGE ON *.* TO `mysqltest_3`@`localhost`
GRANT INSERT, UPDATE, DELETE ON `mysql`.* TO `mysqltest_3`@`localhost`
select host,user,password,plugin,authentication_string from mysql.user where user like 'mysqltest_%' ;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysql`.`user`
insert into mysql.global_priv set host='%', user='mysqltest_B';
create user mysqltest_A@'%';
rename user mysqltest_B@'%' to mysqltest_C@'%';
@@ -476,9 +476,9 @@ create table t1 (i int);
connect user1,localhost,mysqltest_u1,,mysqltest_1;
connection user1;
show create table mysqltest_2.t1;
-ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_2`.`t1`
create table t1 like mysqltest_2.t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_2`.`t1`
connection default;
grant select on mysqltest_2.t1 to mysqltest_u1@localhost;
connection user1;
@@ -533,7 +533,7 @@ USE db1;
SELECT c FROM t2;
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
SELECT * FROM t2;
-ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table `db1`.`t2`
SELECT * FROM t1 JOIN t2 USING (b);
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
connection default;
@@ -629,7 +629,7 @@ CREATE TEMPORARY TABLE t4 SELECT * FROM t1;
# temporary table without additional privileges.
CREATE TEMPORARY TABLE t5(a INT) ENGINE = MyISAM;
CREATE TEMPORARY TABLE t6(a INT) ENGINE = MERGE UNION = (t5);
-ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u1'@'localhost' for table 't5'
+ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t5`
# Check that we allow creation of MERGE table with no underlying table
# without additional privileges.
CREATE TEMPORARY TABLE t6(a INT) ENGINE = MERGE UNION = ();
@@ -657,7 +657,7 @@ ALTER TABLE t6 UNION = ();
# Check that we do *not* allow altering of MERGE table with underlying
# temporary table without additional privileges.
ALTER TABLE t6 UNION = (t5);
-ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u1'@'localhost' for table 't5'
+ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t5`
#
# Simple INSERT and INSERT ... SELECT.
#
@@ -902,7 +902,7 @@ CREATE TEMPORARY TABLE t9(a INT);
CREATE TEMPORARY TABLE t10(a INT) ENGINE = MERGE UNION = (t7, t8);
ALTER TABLE t10 UNION = (t9);
ALTER TABLE t10 UNION = (mysqltest_db2.t2_1);
-ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u5'@'localhost' for table 't2_1'
+ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u5'@'localhost' for table `mysqltest_db2`.`t2_1`
CREATE TEMPORARY TABLE mysqltest_db2.t2_2(a INT) ENGINE = MERGE UNION = (t7, t8);
ALTER TABLE mysqltest_db2.t2_2 UNION = (t9);
ALTER TABLE mysqltest_db2.t2_2 UNION = ();
diff --git a/mysql-test/main/grant4.result b/mysql-test/main/grant4.result
index 56318bd8e8c..bc38f281e8e 100644
--- a/mysql-test/main/grant4.result
+++ b/mysql-test/main/grant4.result
@@ -30,23 +30,23 @@ a int(11) YES NULL
** SHOW COLUMNS
** Should fail because there are no privileges on any column combination.
show columns from mysqltest_db1.t_no_priv;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't_no_priv'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t_no_priv`
** However, select from I_S.COLUMNS will succeed but not show anything:
select column_name as 'Field',column_type as 'Type',is_nullable as 'Null',column_key as 'Key',column_default as 'Default',extra as 'Extra' from information_schema.columns where table_schema='mysqltest_db1' and table_name='t_no_priv';
Field Type Null Key Default Extra
** CREATE TABLE ... LIKE ... require SELECT privleges and will fail.
create table test.t_no_priv like mysqltest_db1.column_priv_only;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'column_priv_only'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`column_priv_only`
** Just to be sure... SELECT also fails.
select * from mysqltest_db1.t_column_priv_only;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't_column_priv_only'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t_column_priv_only`
** SHOW CREATE TABLE ... require any privileges on all columns (the entire table).
** First we try and fail on a table with only one column privilege.
show create table mysqltest_db1.t_column_priv_only;
-ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table 't_column_priv_only'
+ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t_column_priv_only`
** Now we do the same on a table with SELECT privileges.
@@ -72,7 +72,7 @@ t_select_priv CREATE TABLE `t_select_priv` (
** SHOW CREATE TABLE will fail if there is no grants at all:
show create table mysqltest_db1.t_no_priv;
-ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table 't_no_priv'
+ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t_no_priv`
connection default;
use mysqltest_db1;
@@ -97,7 +97,7 @@ SELECT * FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name='t5';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT INDEX_COMMENT IGNORED
** SHOW INDEX FROM t5 will fail because we don't have any privileges on any column combination.
SHOW INDEX FROM t5;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't5'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t5`
** SHOW INDEX FROM t6 will succeed because there exist a privilege on a column combination on t6.
SHOW INDEX FROM t6;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored
@@ -108,20 +108,20 @@ Table Op Msg_type Msg_text
mysqltest_db1.t6 check status OK
** With no privileges access is naturally denied:
CHECK TABLE t5;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't5'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t5`
** CHECKSUM TABLE requires SELECT privileges on the table. The following should fail:
CHECKSUM TABLE t6;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't6'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t6`
** And this should work:
CHECKSUM TABLE t_select_priv;
Table Checksum
mysqltest_db1.t_select_priv 0
SHOW CREATE VIEW v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`v5`
SHOW CREATE VIEW v6;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v6'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`v6`
SHOW CREATE VIEW v2;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`v2`
SHOW CREATE VIEW v3;
View Create View character_set_client collation_connection
v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t_select_priv`.`a` AS `a`,`t_select_priv`.`b` AS `b` from `t_select_priv` latin1 latin1_swedish_ci
@@ -193,10 +193,10 @@ mysqltest_db1.t1 check error Corrupt
# The below statement should fail before repairing t1.
# Otherwise info about such repair will be missing from its result-set.
repair table mysqltest_db1.t1, mysqltest_db1.t2;
-ERROR 42000: SELECT, INSERT command denied to user 'mysqltest_u1'@'localhost' for table 't2'
+ERROR 42000: SELECT, INSERT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t2`
# The same is true for CHECK TABLE statement.
check table mysqltest_db1.t1, mysqltest_db1.t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t2`
check table mysqltest_db1.t1;
Table Op Msg_type Msg_text
mysqltest_db1.t1 check warning Table is marked as crashed
diff --git a/mysql-test/main/grant5.result b/mysql-test/main/grant5.result
index ebe48953c54..3947fd72bd4 100644
--- a/mysql-test/main/grant5.result
+++ b/mysql-test/main/grant5.result
@@ -185,6 +185,67 @@ GRANT USAGE ON *.* TO `test-user`@`%`
SET DEFAULT ROLE `r``o'l"e` FOR `test-user`@`%`
DROP ROLE `r``o'l"e`;
DROP USER 'test-user';
+#
+# MDEV-28548: ER_TABLEACCESS_DENIED_ERROR is missing information about DB
+#
+create database db1;
+create user foo@localhost;
+grant create on db1.* to foo@localhost;
+connect con1,localhost,foo,,db1;
+create table t(t int);
+show columns in t;
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`t`
+show columns in db1.t;
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`t`
+create view t_v as select * from t;
+ERROR 42000: CREATE VIEW command denied to user 'foo'@'localhost' for table `db1`.`t_v`
+show create view t_v;
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`t_v`
+create table t2(id int primary key, b int);
+create table t3(a int, b int, CONSTRAINT `fk_db2_db1_t1`
+ FOREIGN KEY (a)
+REFERENCES `db1 `.t1 (a)
+ON DELETE CASCADE
+ON UPDATE RESTRICT);
+ERROR 42000: Incorrect database name 'db1 '
+create table t3(a int, b int, CONSTRAINT `fk_db2_db3_t1`
+ FOREIGN KEY (a)
+REFERENCES db3.t1 (a)
+ON DELETE CASCADE
+ON UPDATE RESTRICT);
+ERROR 42000: REFERENCES command denied to user 'foo'@'localhost' for table `db3`.`t1`
+create table t1(a int, b int, CONSTRAINT `fk_db2_db3_t1`
+ FOREIGN KEY (a)
+REFERENCES t2 (id)
+ON DELETE CASCADE
+ON UPDATE RESTRICT);
+ERROR 42000: REFERENCES command denied to user 'foo'@'localhost' for table `db1`.`t2`
+connection default;
+disconnect con1;
+grant create view, select on db1.* to foo@localhost;
+connect con1,localhost,foo,,db1;
+create view t_v as select * from t;
+show grants;
+Grants for foo@localhost
+GRANT USAGE ON *.* TO `foo`@`localhost`
+GRANT SELECT, CREATE, CREATE VIEW ON `db1`.* TO `foo`@`localhost`
+show create view t_v;
+ERROR 42000: SHOW VIEW command denied to user 'foo'@'localhost' for table `db1`.`t_v`
+connection default;
+disconnect con1;
+grant show view on db1.* to foo@localhost;
+connect con1,localhost,foo,,db1;
+show grants;
+Grants for foo@localhost
+GRANT USAGE ON *.* TO `foo`@`localhost`
+GRANT SELECT, CREATE, CREATE VIEW, SHOW VIEW ON `db1`.* TO `foo`@`localhost`
+show create view t_v;
+View Create View character_set_client collation_connection
+t_v CREATE ALGORITHM=UNDEFINED DEFINER=`foo`@`localhost` SQL SECURITY DEFINER VIEW `t_v` AS select `t`.`t` AS `t` from `t` latin1 latin1_swedish_ci
+connection default;
+disconnect con1;
+drop database db1;
+drop user foo@localhost;
# End of 10.3 tests
create user u1@h identified with 'mysql_native_password' using 'pwd';
ERROR HY000: Password hash should be a 41-digit hexadecimal number
diff --git a/mysql-test/main/grant5.test b/mysql-test/main/grant5.test
index 0b4a63ab075..3a972efa0fc 100644
--- a/mysql-test/main/grant5.test
+++ b/mysql-test/main/grant5.test
@@ -138,6 +138,78 @@ SHOW GRANTS FOR 'test-user';
DROP ROLE `r``o'l"e`;
DROP USER 'test-user';
+--echo #
+--echo # MDEV-28548: ER_TABLEACCESS_DENIED_ERROR is missing information about DB
+--echo #
+
+create database db1;
+create user foo@localhost;
+grant create on db1.* to foo@localhost;
+
+--connect (con1,localhost,foo,,db1)
+create table t(t int);
+--error ER_TABLEACCESS_DENIED_ERROR
+show columns in t;
+--error ER_TABLEACCESS_DENIED_ERROR
+show columns in db1.t;
+# CREATE_VIEW_ACL needed
+--error ER_TABLEACCESS_DENIED_ERROR
+create view t_v as select * from t;
+# show create view needs to have SELECT_ACL and SHOW_VIEW_ACL
+--error ER_TABLEACCESS_DENIED_ERROR
+show create view t_v;
+
+create table t2(id int primary key, b int);
+
+# Reference non existing DB with wrong DB name
+--error ER_WRONG_DB_NAME
+create table t3(a int, b int, CONSTRAINT `fk_db2_db1_t1`
+ FOREIGN KEY (a)
+ REFERENCES `db1 `.t1 (a)
+ ON DELETE CASCADE
+ ON UPDATE RESTRICT);
+
+# Reference non-existing DB (with qualified DB name)
+--error ER_TABLEACCESS_DENIED_ERROR
+create table t3(a int, b int, CONSTRAINT `fk_db2_db3_t1`
+ FOREIGN KEY (a)
+ REFERENCES db3.t1 (a)
+ ON DELETE CASCADE
+ ON UPDATE RESTRICT);
+
+# Reference DB (with not qualified DB name)
+--error ER_TABLEACCESS_DENIED_ERROR
+create table t1(a int, b int, CONSTRAINT `fk_db2_db3_t1`
+ FOREIGN KEY (a)
+ REFERENCES t2 (id)
+ ON DELETE CASCADE
+ ON UPDATE RESTRICT);
+
+--connection default
+--disconnect con1
+# Add CREATE_VIEW_ACL and SELECT_ACL
+grant create view, select on db1.* to foo@localhost;
+
+--connect (con1,localhost,foo,,db1)
+create view t_v as select * from t;
+show grants;
+--error ER_TABLEACCESS_DENIED_ERROR
+show create view t_v;
+
+--connection default
+--disconnect con1
+# Add SHOW_VIEW_ACL
+grant show view on db1.* to foo@localhost;
+
+--connect (con1,localhost,foo,,db1)
+show grants;
+show create view t_v;
+
+--connection default
+--disconnect con1
+drop database db1;
+drop user foo@localhost;
+
--echo # End of 10.3 tests
#
diff --git a/mysql-test/main/grant_cache_no_prot.result b/mysql-test/main/grant_cache_no_prot.result
index 780fb254b76..1ecfc308422 100644
--- a/mysql-test/main/grant_cache_no_prot.result
+++ b/mysql-test/main/grant_cache_no_prot.result
@@ -154,7 +154,7 @@ a b c a
1 1 1 test.t1
2 2 2 test.t1
select * from t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest`.`t2`
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 6
@@ -170,7 +170,7 @@ select "user3";
user3
user3
select * from t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t1`
select a from t1;
a
1
@@ -178,7 +178,7 @@ a
select c from t1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
select * from t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t2`
select mysqltest.t1.c from test.t1,mysqltest.t1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
show status like "Qcache_queries_in_cache";
diff --git a/mysql-test/main/grant_cache_ps_prot.result b/mysql-test/main/grant_cache_ps_prot.result
index 9dcf8c4aa8f..d6f343d6459 100644
--- a/mysql-test/main/grant_cache_ps_prot.result
+++ b/mysql-test/main/grant_cache_ps_prot.result
@@ -154,7 +154,7 @@ a b c a
1 1 1 test.t1
2 2 2 test.t1
select * from t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest`.`t2`
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 6
@@ -170,7 +170,7 @@ select "user3";
user3
user3
select * from t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t1`
select a from t1;
a
1
@@ -178,7 +178,7 @@ a
select c from t1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
select * from t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t2`
select mysqltest.t1.c from test.t1,mysqltest.t1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
show status like "Qcache_queries_in_cache";
diff --git a/mysql-test/main/grant_explain_non_select.result b/mysql-test/main/grant_explain_non_select.result
index 53b7d687d6c..8400b03ce9f 100644
--- a/mysql-test/main/grant_explain_non_select.result
+++ b/mysql-test/main/grant_explain_non_select.result
@@ -10,13 +10,13 @@ connect con1,localhost,privtest,,;
connection con1;
USE privtest_db;
EXPLAIN INSERT INTO t1 VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT INSERT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -32,36 +32,36 @@ connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
connection con1;
EXPLAIN REPLACE INTO t1 VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT INSERT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
EXPLAIN REPLACE INTO t1 VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
REVOKE INSERT ON privtest_db.t1 FROM 'privtest'@'localhost';
GRANT DELETE ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
EXPLAIN REPLACE INTO t1 VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT INSERT, DELETE ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -77,13 +77,13 @@ connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
connection con1;
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT UPDATE ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -100,13 +100,13 @@ REVOKE UPDATE ON privtest_db.t1 FROM 'privtest'@'localhost';
GRANT SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT UPDATE, SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -123,13 +123,13 @@ connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
connection con1;
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT DELETE ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -138,21 +138,21 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
DELETE FROM t1 WHERE a = 10;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 't1'
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
GRANT SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
GRANT DELETE, SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
diff --git a/mysql-test/main/grant_lowercase_fs.result b/mysql-test/main/grant_lowercase_fs.result
index e883067eca0..413c3f482a6 100644
--- a/mysql-test/main/grant_lowercase_fs.result
+++ b/mysql-test/main/grant_lowercase_fs.result
@@ -6,12 +6,12 @@ GRANT SELECT ON db1.* to USER_1@localhost;
connect con1,localhost,user_1,,db1;
CREATE TABLE t1(f1 int);
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db1`.`t1`
connect con2,localhost,USER_1,,db1;
SELECT * FROM t1;
f1
CREATE TABLE t2(f1 int);
-ERROR 42000: CREATE command denied to user 'USER_1'@'localhost' for table 't2'
+ERROR 42000: CREATE command denied to user 'USER_1'@'localhost' for table `db1`.`t2`
connection default;
disconnect con1;
disconnect con2;
diff --git a/mysql-test/main/information_schema_db.result b/mysql-test/main/information_schema_db.result
index b8a18179e75..6a6e5c49851 100644
--- a/mysql-test/main/information_schema_db.result
+++ b/mysql-test/main/information_schema_db.result
@@ -163,17 +163,17 @@ use testdb_1;
revoke select,show view on v6 from testdb_2@localhost;
connection testdb_2;
show fields from testdb_1.v5;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v5`
show create view testdb_1.v5;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v5`
show fields from testdb_1.v6;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v6'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v6`
show create view testdb_1.v6;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v6'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v6`
show fields from testdb_1.v7;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v7'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v7`
show create view testdb_1.v7;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v7'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v7`
show create view v4;
View Create View character_set_client collation_connection
v4 CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_2`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `v3`.`f1` AS `f1`,`v3`.`f2` AS `f2` from `testdb_1`.`v3` latin1 latin1_swedish_ci
@@ -191,7 +191,7 @@ show create view v2;
View Create View character_set_client collation_connection
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_2`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `v1`.`f1` AS `f1` from `testdb_1`.`v1` latin1 latin1_swedish_ci
show create view testdb_1.v1;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v1`
select table_name from information_schema.columns a
where a.table_name = 'v2';
table_name
@@ -238,7 +238,7 @@ where table_name='v1';
table_schema table_name view_definition
testdb_1 v1
show create view testdb_1.v1;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `testdb_1`.`v1`
connection default;
drop user mysqltest_1@localhost;
drop database testdb_1;
diff --git a/mysql-test/main/insert_notembedded.result b/mysql-test/main/insert_notembedded.result
index 8dd4aa7d71e..5df69cc8ffe 100644
--- a/mysql-test/main/insert_notembedded.result
+++ b/mysql-test/main/insert_notembedded.result
@@ -38,7 +38,7 @@ INNER JOIN view_stations AS stations
ON table_source.id = stations.icao
LEFT JOIN table_target AS old
USING (mexs_id);
-ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'table_target'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table `meow`.`table_target`
REPLACE INTO view_target2
SELECT stations.mexs_id AS mexs_id, datetime AS messzeit
FROM table_source
@@ -46,7 +46,7 @@ INNER JOIN view_stations AS stations
ON table_source.id = stations.icao
LEFT JOIN view_target2 AS old
USING (mexs_id);
-ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'view_target2'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table `meow`.`view_target2`
REPLACE INTO view_target3
SELECT stations.mexs_id AS mexs_id, datetime AS messzeit
FROM table_source
@@ -70,7 +70,7 @@ ON table_source.id = stations.icao
LEFT JOIN table_target AS old
USING (mexs_id);
REPLACE INTO table_target2 VALUES ('00X45Y78','2006-07-12 07:50:00');
-ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'table_target2'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table `meow`.`table_target2`
REPLACE INTO view_target2 VALUES ('12X45Y78','2006-07-12 07:50:00');
SELECT stations.mexs_id AS mexs_id, datetime AS messzeit
FROM table_source
diff --git a/mysql-test/main/insert_returning.result b/mysql-test/main/insert_returning.result
index a3cde7b1270..1976c1ca02e 100644
--- a/mysql-test/main/insert_returning.result
+++ b/mysql-test/main/insert_returning.result
@@ -400,10 +400,10 @@ f(id2)
14
EXPLAIN INSERT INTO t2 SELECT * FROM t1 WHERE id1=8 RETURNING id2;
id select_type table type possible_keys key key_len ref rows Extra
-1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1
+1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1
EXPLAIN EXTENDED INSERT INTO t1 SELECT * FROM t1 WHERE id1=9 RETURNING val1;
id select_type table type possible_keys key key_len ref rows filtered Extra
-1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
+1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
EXPLAIN FORMAT="json" INSERT INTO t1 SELECT * FROM t1 WHERE id1=10 RETURNING val1;
EXPLAIN
{
@@ -433,7 +433,7 @@ Warning 1062 Duplicate entry '7' for key 'PRIMARY'
Warning 1062 Duplicate entry '8' for key 'PRIMARY'
ANALYZE INSERT INTO t2 SELECT * FROM t1 WHERE id1=11 RETURNING *;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
-1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table
+1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table
SELECT * FROM t2;
id2 val2
1 a
@@ -615,3 +615,61 @@ DROP TABLE ins_duplicate;
DROP VIEW v1;
DROP VIEW v2;
DROP FUNCTION f;
+#
+# MDEV-25028: ASAN use-after-poison in base_list_iterator::next or
+# Assertion `sl->join == 0' upon INSERT .. RETURNING via PS
+#
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (b INT);
+PREPARE stmt1 FROM "INSERT INTO t1 SELECT * FROM t1 WHERE a IN (SELECT b FROM t2) RETURNING a";
+EXECUTE stmt1;
+a
+PREPARE stmt2 FROM "INSERT INTO t1 SELECT * FROM t1 WHERE a IN (SELECT b FROM t2) RETURNING (SELECT b FROM t2)";
+EXECUTE stmt2;
+(SELECT b FROM t2)
+DROP TABLE t1, t2;
+#
+# MDEV-25187: Assertion `inited == NONE || table->open_by_handler'
+# failed or Direct leak in init_dynamic_array2 upon INSERT .. RETURNING
+# and memory leak in init_dynamic_array2
+#
+CREATE TABLE t (a INT, KEY (a));
+CREATE TABLE t1 (f INT);
+INSERT INTO t VALUES (1),(2);
+INSERT INTO t1 SELECT a FROM t WHERE 1 NOT IN (SELECT a FROM t) RETURNING f;
+f
+DROP TABLE t, t1;
+#
+# MDEV-28740: crash in INSERT RETURNING subquery in prepared statements
+#
+CREATE TABLE t1 (
+id INTEGER NOT NULL,
+data VARCHAR(30),
+PRIMARY KEY (id)
+)ENGINE=MyISAM;
+EXECUTE IMMEDIATE 'INSERT INTO t1 (id, data) VALUES ((SELECT CAST(1 AS SIGNED INTEGER) AS anon_1), ?) RETURNING t1.id' using 'hi';
+id
+1
+DROP TABLE t1;
+#
+# MDEV-27165: crash in base_list_iterator::next
+#
+CREATE TABLE t1 ( id int, a int);
+CREATE TABLE t2 ( id int);
+INSERT INTO t1 VALUES (( SELECT 1 from t2),999999999999) RETURNING id;
+ERROR 22003: Out of range value for column 'a' at row 1
+EXECUTE immediate "INSERT INTO t1 VALUES (( SELECT 1 from t2),999999999999) RETURNING id ";
+ERROR 22003: Out of range value for column 'a' at row 1
+EXECUTE immediate "INSERT INTO t1 VALUES (( SELECT 1 from t2),9) RETURNING id ";
+id
+NULL
+DROP TABLE t1, t2;
+#
+# MDEV-29686: Assertion `slave == 0' failed in
+# st_select_lex_node::attach_single
+#
+CREATE TABLE t (a INT);
+INSERT t WITH cte AS (SELECT 1) SELECT * FROM cte RETURNING *;
+a
+1
+DROP TABLE t;
diff --git a/mysql-test/main/insert_returning.test b/mysql-test/main/insert_returning.test
index 6c8e71a4617..837d61d2c16 100644
--- a/mysql-test/main/insert_returning.test
+++ b/mysql-test/main/insert_returning.test
@@ -326,3 +326,73 @@ DROP TABLE ins_duplicate;
DROP VIEW v1;
DROP VIEW v2;
DROP FUNCTION f;
+
+--echo #
+--echo # MDEV-25028: ASAN use-after-poison in base_list_iterator::next or
+--echo # Assertion `sl->join == 0' upon INSERT .. RETURNING via PS
+--echo #
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (b INT);
+
+PREPARE stmt1 FROM "INSERT INTO t1 SELECT * FROM t1 WHERE a IN (SELECT b FROM t2) RETURNING a";
+EXECUTE stmt1;
+
+PREPARE stmt2 FROM "INSERT INTO t1 SELECT * FROM t1 WHERE a IN (SELECT b FROM t2) RETURNING (SELECT b FROM t2)";
+EXECUTE stmt2;
+
+DROP TABLE t1, t2;
+
+--echo #
+--echo # MDEV-25187: Assertion `inited == NONE || table->open_by_handler'
+--echo # failed or Direct leak in init_dynamic_array2 upon INSERT .. RETURNING
+--echo # and memory leak in init_dynamic_array2
+--echo #
+CREATE TABLE t (a INT, KEY (a));
+CREATE TABLE t1 (f INT);
+
+INSERT INTO t VALUES (1),(2);
+
+INSERT INTO t1 SELECT a FROM t WHERE 1 NOT IN (SELECT a FROM t) RETURNING f;
+
+# Cleanup
+DROP TABLE t, t1;
+
+--echo #
+--echo # MDEV-28740: crash in INSERT RETURNING subquery in prepared statements
+--echo #
+
+CREATE TABLE t1 (
+ id INTEGER NOT NULL,
+ data VARCHAR(30),
+ PRIMARY KEY (id)
+ )ENGINE=MyISAM;
+
+EXECUTE IMMEDIATE 'INSERT INTO t1 (id, data) VALUES ((SELECT CAST(1 AS SIGNED INTEGER) AS anon_1), ?) RETURNING t1.id' using 'hi';
+
+DROP TABLE t1;
+
+--echo #
+--echo # MDEV-27165: crash in base_list_iterator::next
+--echo #
+
+CREATE TABLE t1 ( id int, a int);
+CREATE TABLE t2 ( id int);
+
+--error ER_WARN_DATA_OUT_OF_RANGE
+INSERT INTO t1 VALUES (( SELECT 1 from t2),999999999999) RETURNING id;
+--error ER_WARN_DATA_OUT_OF_RANGE
+EXECUTE immediate "INSERT INTO t1 VALUES (( SELECT 1 from t2),999999999999) RETURNING id ";
+
+EXECUTE immediate "INSERT INTO t1 VALUES (( SELECT 1 from t2),9) RETURNING id ";
+
+DROP TABLE t1, t2;
+
+--echo #
+--echo # MDEV-29686: Assertion `slave == 0' failed in
+--echo # st_select_lex_node::attach_single
+--echo #
+
+CREATE TABLE t (a INT);
+INSERT t WITH cte AS (SELECT 1) SELECT * FROM cte RETURNING *;
+
+DROP TABLE t;
diff --git a/mysql-test/main/invisible_field_grant_completely.result b/mysql-test/main/invisible_field_grant_completely.result
index aa0a768c51c..b1b313072b2 100644
--- a/mysql-test/main/invisible_field_grant_completely.result
+++ b/mysql-test/main/invisible_field_grant_completely.result
@@ -51,9 +51,9 @@ connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1;
connection con1;
select * from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d`.`t1`
select invisible from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d`.`t1`
disconnect con1;
#Final Cleanup
diff --git a/mysql-test/main/invisible_field_grant_system.result b/mysql-test/main/invisible_field_grant_system.result
index b69478c58b3..d2e40c391c4 100644
--- a/mysql-test/main/invisible_field_grant_system.result
+++ b/mysql-test/main/invisible_field_grant_system.result
@@ -57,9 +57,9 @@ connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1;
connection con1;
select * from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d`.`t1`
select count(row_start) from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d`.`t1`
disconnect con1;
#Cleanup
diff --git a/mysql-test/main/kill.result b/mysql-test/main/kill.result
index 5d38bd90059..797052710e8 100644
--- a/mysql-test/main/kill.result
+++ b/mysql-test/main/kill.result
@@ -1,225 +1,7 @@
set local sql_mode="";
set global sql_mode="";
-SET DEBUG_SYNC = 'RESET';
-DROP TABLE IF EXISTS t1, t2, t3;
-DROP FUNCTION IF EXISTS MY_KILL;
-CREATE FUNCTION MY_KILL(tid INT) RETURNS INT
-BEGIN
-DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
-KILL tid;
-RETURN (SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = tid);
-END|
-connect con1, localhost, root,,;
-connect con2, localhost, root,,;
-connection con1;
-connection con2;
-connection con1;
-SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
-SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read';
-connection con2;
-SET DEBUG_SYNC='now WAIT_FOR con1_read';
-SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
-SET DEBUG_SYNC = 'RESET';
-connection con1;
-SELECT 1;
-Got one of the listed errors
-SELECT 1;
-1
-1
-SELECT @id != CONNECTION_ID();
-@id != CONNECTION_ID()
-1
-connection con2;
-SELECT 4;
-4
-4
-connection default;
-KILL (SELECT COUNT(*) FROM mysql.user);
-ERROR 42000: KILL does not support subqueries or stored functions
-connection con1;
-connection con2;
-connection con1;
-SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
-SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read WAIT_FOR kill';
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR con1_read';
-SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
-SET DEBUG_SYNC = 'RESET';
-connection con1;
-SELECT 1;
-Got one of the listed errors
-SELECT 1;
-1
-1
-SELECT @id != CONNECTION_ID();
-@id != CONNECTION_ID()
-1
-connection con2;
-SELECT 4;
-4
-4
-connection default;
-CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT);
-CREATE TABLE t2 (id INT UNSIGNED NOT NULL);
-INSERT INTO t1 VALUES
-(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
-(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
-(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
-(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0);
-INSERT t1 SELECT 0 FROM t1 AS a1, t1 AS a2 LIMIT 4032;
-INSERT INTO t2 SELECT id FROM t1;
-connection con1;
-connection con2;
-connection con1;
-SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
-SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync';
-SELECT id FROM t1 WHERE id IN
-(SELECT DISTINCT a.id FROM t2 a, t2 b, t2 c, t2 d
-GROUP BY ACOS(1/a.id), b.id, c.id, d.id
-HAVING a.id BETWEEN 10 AND 20);
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL @id;
-SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
-connection con1;
-Got one of the listed errors
-SELECT 1;
-1
-1
-connection default;
-SET DEBUG_SYNC = 'RESET';
-DROP TABLE t1, t2;
-connection con1;
-connection con2;
-connection con1;
-SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync WAIT_FOR kill';
-SELECT ACOS(0);
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
-ACOS(0)
-1.5707963267948966
-SELECT 1;
-1
-1
-SELECT @id = CONNECTION_ID();
-@id = CONNECTION_ID()
-1
-connection default;
-SET DEBUG_SYNC = 'RESET';
-CREATE TABLE t1 (f1 INT);
-CREATE FUNCTION bug27563() RETURNS INT(11)
-DETERMINISTIC
-BEGIN
-DECLARE CONTINUE HANDLER FOR SQLSTATE '70100' SET @a:= 'killed';
-DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
-SET DEBUG_SYNC= 'now SIGNAL in_sync WAIT_FOR kill';
-RETURN 1;
-END|
-connection con1;
-connection con2;
-connection con1;
-INSERT INTO t1 VALUES (bug27563());
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
-ERROR 70100: Query execution was interrupted
-SELECT * FROM t1;
-f1
-connection default;
-SET DEBUG_SYNC = 'RESET';
-INSERT INTO t1 VALUES(0);
-connection con1;
-UPDATE t1 SET f1= bug27563();
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
-ERROR 70100: Query execution was interrupted
-SELECT * FROM t1;
-f1
-0
-connection default;
-SET DEBUG_SYNC = 'RESET';
-INSERT INTO t1 VALUES(1);
-connection con1;
-DELETE FROM t1 WHERE bug27563() IS NULL;
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
-ERROR 70100: Query execution was interrupted
-SELECT * FROM t1;
-f1
-0
-1
-connection default;
-SET DEBUG_SYNC = 'RESET';
-connection con1;
-SELECT * FROM t1 WHERE f1= bug27563();
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
-ERROR 70100: Query execution was interrupted
-SELECT * FROM t1;
-f1
-0
-1
-connection default;
-SET DEBUG_SYNC = 'RESET';
-DROP FUNCTION bug27563;
-CREATE TABLE t2 (f2 INT);
-CREATE TRIGGER trg27563 BEFORE INSERT ON t1 FOR EACH ROW
-BEGIN
-DECLARE CONTINUE HANDLER FOR SQLSTATE '70100' SET @a:= 'killed';
-DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
-INSERT INTO t2 VALUES(0);
-SET DEBUG_SYNC= 'now SIGNAL in_sync WAIT_FOR kill';
-INSERT INTO t2 VALUES(1);
-END|
-connection con1;
-INSERT INTO t1 VALUES(2),(3);
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
-ERROR 70100: Query execution was interrupted
-SELECT * FROM t1;
-f1
-0
-1
-SELECT * FROM t2;
-f2
-0
-connection default;
-SET DEBUG_SYNC = 'RESET';
-DROP TABLE t1, t2;
-#
-# Bug#19723: kill of active connection yields different error code
-# depending on platform.
-#
-connection con1;
-SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
-KILL @id;
-ERROR 70100: Connection was killed
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
-connection con1;
-# ER_SERVER_SHUTDOWN, CR_SERVER_GONE_ERROR, CR_SERVER_LOST,
-# depending on the timing of close of the connection socket
-SELECT 1;
-Got one of the listed errors
-SELECT 1;
-1
-1
-SELECT @id != CONNECTION_ID();
-@id != CONNECTION_ID()
-1
-connection default;
-SET DEBUG_SYNC = 'RESET';
+connect con1, localhost, root;
+connect con2, localhost, root;
#
# Additional test for WL#3726 "DDL locking for all metadata objects"
# Check that DDL and DML statements waiting for metadata locks can
@@ -227,7 +9,6 @@ SET DEBUG_SYNC = 'RESET';
# can be tricky to write test case for some of them (e.g. REPAIR or
# ALTER and other statements under LOCK TABLES).
#
-drop tables if exists t1, t2, t3;
create table t1 (i int primary key);
connect blocker, localhost, root, , ;
connect dml, localhost, root, , ;
@@ -380,9 +161,9 @@ connection default;
ERROR 70100: Query execution was interrupted
disconnect con5;
DROP USER u1@localhost;
-SET DEBUG_SYNC = 'RESET';
-DROP FUNCTION MY_KILL;
set global sql_mode=default;
+disconnect con1;
+disconnect con2;
#
# MDEV-17998
# Deadlock and eventual Assertion `!table->pos_in_locked_tables' failed
diff --git a/mysql-test/main/kill.test b/mysql-test/main/kill.test
index 7dc57158825..c13be85f39d 100644
--- a/mysql-test/main/kill.test
+++ b/mysql-test/main/kill.test
@@ -8,294 +8,11 @@
#
-- source include/not_embedded.inc
--- source include/have_debug_sync.inc
set local sql_mode="";
set global sql_mode="";
---disable_warnings
-SET DEBUG_SYNC = 'RESET';
-DROP TABLE IF EXISTS t1, t2, t3;
-DROP FUNCTION IF EXISTS MY_KILL;
---enable_warnings
-
-delimiter |;
-# Helper function used to repeatedly kill a session.
-CREATE FUNCTION MY_KILL(tid INT) RETURNS INT
-BEGIN
- DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
- KILL tid;
- RETURN (SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = tid);
-END|
-delimiter ;|
-
-connect (con1, localhost, root,,);
-connect (con2, localhost, root,,);
-
-# Save id of con1
-connection con1;
---disable_reconnect
-let $ID= `SELECT @id := CONNECTION_ID()`;
-connection con2;
-let $ignore= `SELECT @id := $ID`;
-connection con1;
-# Signal when this connection is terminating.
-SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
-# See if we can kill read().
-# Run into read() immediately after hitting 'before_do_command_net_read'.
-SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read';
-
-# Kill con1
-connection con2;
-SET DEBUG_SYNC='now WAIT_FOR con1_read';
-# At this point we have no way to figure out, when con1 is blocked in
-# reading from the socket. Sending KILL to early would not terminate
-# con1. So we repeat KILL until con1 terminates.
-let $wait_condition= SELECT MY_KILL(@id);
---source include/wait_condition.inc
-# If KILL missed the read(), sync point wait will time out.
-SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
---error 1053,2006,2013,5014
-SELECT 1;
-
---enable_reconnect
-# this should work, and we should have a new connection_id()
-SELECT 1;
-let $ignore= `SELECT @id := $ID`;
-SELECT @id != CONNECTION_ID();
-
-#make sure the server is still alive
-connection con2;
-SELECT 4;
-connection default;
-
---error ER_SUBQUERIES_NOT_SUPPORTED
-KILL (SELECT COUNT(*) FROM mysql.user);
-
-connection con1;
-let $ID= `SELECT @id := CONNECTION_ID()`;
-connection con2;
-let $ignore= `SELECT @id := $ID`;
-connection con1;
-disable_reconnect;
-# Signal when this connection is terminating.
-SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
-# See if we can kill the sync point itself.
-# Wait in 'before_do_command_net_read' until killed.
-# It doesn't wait for a signal 'kill' but for to be killed.
-# The signal name doesn't matter here.
-SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read WAIT_FOR kill';
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR con1_read';
-# Repeat KILL until con1 terminates.
-let $wait_condition= SELECT MY_KILL(@id);
---source include/wait_condition.inc
-SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
-SET DEBUG_SYNC = 'RESET';
-
-connection con1;
---error 1053,2006,2013,5014
-SELECT 1;
-enable_reconnect;
-SELECT 1;
-let $ignore= `SELECT @id := $ID`;
-SELECT @id != CONNECTION_ID();
-connection con2;
-SELECT 4;
-connection default;
-
-#
-# BUG#14851: killing long running subquery processed via a temporary table.
-#
-
-CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT);
-CREATE TABLE t2 (id INT UNSIGNED NOT NULL);
-
-INSERT INTO t1 VALUES
-(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
-(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
-(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
-(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0);
-INSERT t1 SELECT 0 FROM t1 AS a1, t1 AS a2 LIMIT 4032;
-
-INSERT INTO t2 SELECT id FROM t1;
-
-connection con1;
-let $ID= `SELECT @id := CONNECTION_ID()`;
-connection con2;
-let $ignore= `SELECT @id := $ID`;
-
-connection con1;
-SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
-SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync';
-# This is a very long running query. If this test start failing,
-# it may be necessary to change to an even longer query.
-send SELECT id FROM t1 WHERE id IN
- (SELECT DISTINCT a.id FROM t2 a, t2 b, t2 c, t2 d
- GROUP BY ACOS(1/a.id), b.id, c.id, d.id
- HAVING a.id BETWEEN 10 AND 20);
-
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL @id;
-SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
-
-connection con1;
---error 1317,1053,2006,2013,5014
-reap;
-SELECT 1;
-
-connection default;
-SET DEBUG_SYNC = 'RESET';
-DROP TABLE t1, t2;
-
-#
-# Test of blocking of sending ERROR after OK or EOF
-#
-connection con1;
-let $ID= `SELECT @id := CONNECTION_ID()`;
-connection con2;
-let $ignore= `SELECT @id := $ID`;
-connection con1;
-SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync WAIT_FOR kill';
-send SELECT ACOS(0);
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
-reap;
-SELECT 1;
-SELECT @id = CONNECTION_ID();
-connection default;
-SET DEBUG_SYNC = 'RESET';
-
-#
-# Bug#27563: Stored functions and triggers wasn't throwing an error when killed.
-#
-CREATE TABLE t1 (f1 INT);
-delimiter |;
-CREATE FUNCTION bug27563() RETURNS INT(11)
-DETERMINISTIC
-BEGIN
- DECLARE CONTINUE HANDLER FOR SQLSTATE '70100' SET @a:= 'killed';
- DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
- SET DEBUG_SYNC= 'now SIGNAL in_sync WAIT_FOR kill';
- RETURN 1;
-END|
-delimiter ;|
-# Test stored functions
-# Test INSERT
-connection con1;
-let $ID= `SELECT @id := CONNECTION_ID()`;
-connection con2;
-let $ignore= `SELECT @id := $ID`;
-connection con1;
-send INSERT INTO t1 VALUES (bug27563());
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
---error 1317
-reap;
-SELECT * FROM t1;
-connection default;
-SET DEBUG_SYNC = 'RESET';
-
-# Test UPDATE
-INSERT INTO t1 VALUES(0);
-connection con1;
-send UPDATE t1 SET f1= bug27563();
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
---error 1317
-reap;
-SELECT * FROM t1;
-connection default;
-SET DEBUG_SYNC = 'RESET';
-
-# Test DELETE
-INSERT INTO t1 VALUES(1);
-connection con1;
-send DELETE FROM t1 WHERE bug27563() IS NULL;
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
---error 1317
-reap;
-SELECT * FROM t1;
-connection default;
-SET DEBUG_SYNC = 'RESET';
-
-# Test SELECT
-connection con1;
-send SELECT * FROM t1 WHERE f1= bug27563();
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
---error 1317
-reap;
-SELECT * FROM t1;
-connection default;
-SET DEBUG_SYNC = 'RESET';
-DROP FUNCTION bug27563;
-
-# Test TRIGGERS
-CREATE TABLE t2 (f2 INT);
-delimiter |;
-CREATE TRIGGER trg27563 BEFORE INSERT ON t1 FOR EACH ROW
-BEGIN
- DECLARE CONTINUE HANDLER FOR SQLSTATE '70100' SET @a:= 'killed';
- DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
- INSERT INTO t2 VALUES(0);
- SET DEBUG_SYNC= 'now SIGNAL in_sync WAIT_FOR kill';
- INSERT INTO t2 VALUES(1);
-END|
-delimiter ;|
-connection con1;
-send INSERT INTO t1 VALUES(2),(3);
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
-KILL QUERY @id;
-connection con1;
---error 1317
-reap;
-SELECT * FROM t1;
-SELECT * FROM t2;
-connection default;
-SET DEBUG_SYNC = 'RESET';
-DROP TABLE t1, t2;
-
---echo #
---echo # Bug#19723: kill of active connection yields different error code
---echo # depending on platform.
---echo #
-
---connection con1
-let $ID= `SELECT @id := CONNECTION_ID()`;
-SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
---disable_reconnect
---error ER_CONNECTION_KILLED
-KILL @id;
-
-connection con2;
-SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
-connection con1;
---echo # ER_SERVER_SHUTDOWN, CR_SERVER_GONE_ERROR, CR_SERVER_LOST,
---echo # depending on the timing of close of the connection socket
---error 1053,2006,2013,5014
-SELECT 1;
---enable_reconnect
-SELECT 1;
-let $ignore= `SELECT @id := $ID`;
-SELECT @id != CONNECTION_ID();
-connection default;
-SET DEBUG_SYNC = 'RESET';
+connect con1, localhost, root;
+connect con2, localhost, root;
--echo #
--echo # Additional test for WL#3726 "DDL locking for all metadata objects"
@@ -304,9 +21,6 @@ SET DEBUG_SYNC = 'RESET';
--echo # can be tricky to write test case for some of them (e.g. REPAIR or
--echo # ALTER and other statements under LOCK TABLES).
--echo #
---disable_warnings
-drop tables if exists t1, t2, t3;
---enable_warnings
create table t1 (i int primary key);
connect (blocker, localhost, root, , );
@@ -503,6 +217,7 @@ drop table t2;
--echo #
--echo # Test kill USER
--echo #
+--source include/count_sessions.inc
grant ALL on test.* to test@localhost;
grant ALL on test.* to test2@localhost;
connect (con3, localhost, test,,);
@@ -527,6 +242,7 @@ connection con4;
--error 2013,2006,5014
select 1;
connection default;
+--source include/wait_until_count_sessions.inc
--echo #
--echo # MDEV-4911 - add KILL query id, and add query id information to
@@ -570,11 +286,9 @@ reap;
disconnect con5;
DROP USER u1@localhost;
-
-SET DEBUG_SYNC = 'RESET';
-DROP FUNCTION MY_KILL;
-
set global sql_mode=default;
+disconnect con1;
+disconnect con2;
--echo #
--echo # MDEV-17998
diff --git a/mysql-test/main/kill_debug.result b/mysql-test/main/kill_debug.result
new file mode 100644
index 00000000000..061e7602383
--- /dev/null
+++ b/mysql-test/main/kill_debug.result
@@ -0,0 +1,239 @@
+set local sql_mode="";
+set global sql_mode="";
+CREATE FUNCTION MY_KILL(tid INT) RETURNS INT
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
+KILL tid;
+RETURN (SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = tid);
+END|
+connect con1, localhost, root;
+connect con2, localhost, root;
+connection con1;
+connection con2;
+connection con1;
+SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
+SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read';
+connection con2;
+SET DEBUG_SYNC='now WAIT_FOR con1_read';
+SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
+SET DEBUG_SYNC = 'RESET';
+connection con1;
+SELECT 1;
+Got one of the listed errors
+SELECT 1;
+1
+1
+SELECT @id != CONNECTION_ID();
+@id != CONNECTION_ID()
+1
+connection con2;
+SELECT 4;
+4
+4
+connection default;
+KILL (SELECT COUNT(*) FROM mysql.user);
+ERROR 42000: KILL does not support subqueries or stored functions
+connection con1;
+connection con2;
+connection con1;
+SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
+SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read WAIT_FOR kill';
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR con1_read';
+SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
+SET DEBUG_SYNC = 'RESET';
+connection con1;
+SELECT 1;
+Got one of the listed errors
+SELECT 1;
+1
+1
+SELECT @id != CONNECTION_ID();
+@id != CONNECTION_ID()
+1
+connection con2;
+SELECT 4;
+4
+4
+connection default;
+CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT);
+CREATE TABLE t2 (id INT UNSIGNED NOT NULL);
+INSERT INTO t1 VALUES
+(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
+(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
+(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
+(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0);
+INSERT t1 SELECT 0 FROM t1 AS a1, t1 AS a2 LIMIT 4032;
+INSERT INTO t2 SELECT id FROM t1;
+connection con1;
+connection con2;
+connection con1;
+SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
+SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync';
+SELECT id FROM t1 WHERE id IN
+(SELECT DISTINCT a.id FROM t2 a, t2 b, t2 c, t2 d
+GROUP BY ACOS(1/a.id), b.id, c.id, d.id
+HAVING a.id BETWEEN 10 AND 20);
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL @id;
+SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
+connection con1;
+Got one of the listed errors
+SELECT 1;
+1
+1
+connection default;
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1, t2;
+connection con1;
+connection con2;
+connection con1;
+SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync WAIT_FOR kill';
+SELECT ACOS(0);
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+ACOS(0)
+1.5707963267948966
+SELECT 1;
+1
+1
+SELECT @id = CONNECTION_ID();
+@id = CONNECTION_ID()
+1
+connection default;
+SET DEBUG_SYNC = 'RESET';
+CREATE TABLE t1 (f1 INT);
+CREATE FUNCTION bug27563() RETURNS INT(11)
+DETERMINISTIC
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLSTATE '70100' SET @a:= 'killed';
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+SET DEBUG_SYNC= 'now SIGNAL in_sync WAIT_FOR kill';
+RETURN 1;
+END|
+connection con1;
+connection con2;
+connection con1;
+INSERT INTO t1 VALUES (bug27563());
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+ERROR 70100: Query execution was interrupted
+SELECT * FROM t1;
+f1
+connection default;
+SET DEBUG_SYNC = 'RESET';
+INSERT INTO t1 VALUES(0);
+connection con1;
+UPDATE t1 SET f1= bug27563();
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+ERROR 70100: Query execution was interrupted
+SELECT * FROM t1;
+f1
+0
+connection default;
+SET DEBUG_SYNC = 'RESET';
+INSERT INTO t1 VALUES(1);
+connection con1;
+DELETE FROM t1 WHERE bug27563() IS NULL;
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+ERROR 70100: Query execution was interrupted
+SELECT * FROM t1;
+f1
+0
+1
+connection default;
+SET DEBUG_SYNC = 'RESET';
+connection con1;
+SELECT * FROM t1 WHERE f1= bug27563();
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+ERROR 70100: Query execution was interrupted
+SELECT * FROM t1;
+f1
+0
+1
+connection default;
+SET DEBUG_SYNC = 'RESET';
+DROP FUNCTION bug27563;
+CREATE TABLE t2 (f2 INT);
+CREATE TRIGGER trg27563 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+DECLARE CONTINUE HANDLER FOR SQLSTATE '70100' SET @a:= 'killed';
+DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+INSERT INTO t2 VALUES(0);
+SET DEBUG_SYNC= 'now SIGNAL in_sync WAIT_FOR kill';
+INSERT INTO t2 VALUES(1);
+END|
+connection con1;
+INSERT INTO t1 VALUES(2),(3);
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+ERROR 70100: Query execution was interrupted
+SELECT * FROM t1;
+f1
+0
+1
+SELECT * FROM t2;
+f2
+0
+connection default;
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1, t2;
+#
+# Bug#19723: kill of active connection yields different error code
+# depending on platform.
+#
+connection con1;
+SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
+KILL @id;
+ERROR 70100: Connection was killed
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
+connection con1;
+# ER_SERVER_SHUTDOWN, CR_SERVER_GONE_ERROR, CR_SERVER_LOST,
+# depending on the timing of close of the connection socket
+SELECT 1;
+Got one of the listed errors
+SELECT 1;
+1
+1
+SELECT @id != CONNECTION_ID();
+@id != CONNECTION_ID()
+1
+connection default;
+SET DEBUG_SYNC = 'RESET';
+DROP FUNCTION MY_KILL;
+set global sql_mode=default;
+disconnect con1;
+disconnect con2;
+#
+# MDEV-29368 Assertion `trx->mysql_thd == thd' failed in innobase_kill_query from process_timers/timer_handler and use-after-poison in innobase_kill_query
+#
+connect foo,localhost,root;
+create table t1 (a int) engine=innodb;
+insert t1 values (1);
+set debug_sync='THD_cleanup_after_set_killed SIGNAL go0 WAIT_FOR go1';
+set debug_sync='innobase_connection_closed SIGNAL go2 WAIT_FOR go3';
+disconnect foo;
+connection default;
+set debug_sync='now WAIT_FOR go0';
+set debug_sync='found_killee SIGNAL go1 WAIT_FOR go2';
+kill $id;
+set debug_sync='now SIGNAL go3';
+drop table t1;
+set debug_sync='reset';
diff --git a/mysql-test/main/kill_debug.test b/mysql-test/main/kill_debug.test
new file mode 100644
index 00000000000..32a764004e3
--- /dev/null
+++ b/mysql-test/main/kill_debug.test
@@ -0,0 +1,318 @@
+#
+# Test KILL and KILL QUERY statements.
+#
+# Killing a connection in an embedded server does not work like in a normal
+# server, if it is waiting for a new statement. In an embedded server, the
+# connection does not read() from a socket, but returns control to the
+# application. 'mysqltest' does not handle the kill request.
+#
+
+-- source include/not_embedded.inc
+-- source include/have_debug_sync.inc
+-- source include/have_innodb.inc
+set local sql_mode="";
+set global sql_mode="";
+
+delimiter |;
+# Helper function used to repeatedly kill a session.
+CREATE FUNCTION MY_KILL(tid INT) RETURNS INT
+BEGIN
+ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
+ KILL tid;
+ RETURN (SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = tid);
+END|
+delimiter ;|
+
+connect con1, localhost, root;
+connect con2, localhost, root;
+
+# Save id of con1
+connection con1;
+--disable_reconnect
+let $ID= `SELECT @id := CONNECTION_ID()`;
+connection con2;
+let $ignore= `SELECT @id := $ID`;
+connection con1;
+# Signal when this connection is terminating.
+SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
+# See if we can kill read().
+# Run into read() immediately after hitting 'before_do_command_net_read'.
+SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read';
+
+# Kill con1
+connection con2;
+SET DEBUG_SYNC='now WAIT_FOR con1_read';
+# At this point we have no way to figure out, when con1 is blocked in
+# reading from the socket. Sending KILL to early would not terminate
+# con1. So we repeat KILL until con1 terminates.
+let $wait_condition= SELECT MY_KILL(@id);
+--source include/wait_condition.inc
+# If KILL missed the read(), sync point wait will time out.
+SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
+SET DEBUG_SYNC = 'RESET';
+
+connection con1;
+--error 1053,2006,2013,5014
+SELECT 1;
+
+--enable_reconnect
+# this should work, and we should have a new connection_id()
+SELECT 1;
+let $ignore= `SELECT @id := $ID`;
+SELECT @id != CONNECTION_ID();
+
+#make sure the server is still alive
+connection con2;
+SELECT 4;
+connection default;
+
+--error ER_SUBQUERIES_NOT_SUPPORTED
+KILL (SELECT COUNT(*) FROM mysql.user);
+
+connection con1;
+let $ID= `SELECT @id := CONNECTION_ID()`;
+connection con2;
+let $ignore= `SELECT @id := $ID`;
+connection con1;
+disable_reconnect;
+# Signal when this connection is terminating.
+SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
+# See if we can kill the sync point itself.
+# Wait in 'before_do_command_net_read' until killed.
+# It doesn't wait for a signal 'kill' but for to be killed.
+# The signal name doesn't matter here.
+SET DEBUG_SYNC= 'before_do_command_net_read SIGNAL con1_read WAIT_FOR kill';
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR con1_read';
+# Repeat KILL until con1 terminates.
+let $wait_condition= SELECT MY_KILL(@id);
+--source include/wait_condition.inc
+SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
+SET DEBUG_SYNC = 'RESET';
+
+connection con1;
+--error 1053,2006,2013,5014
+SELECT 1;
+enable_reconnect;
+SELECT 1;
+let $ignore= `SELECT @id := $ID`;
+SELECT @id != CONNECTION_ID();
+connection con2;
+SELECT 4;
+connection default;
+
+#
+# BUG#14851: killing long running subquery processed via a temporary table.
+#
+
+CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT);
+CREATE TABLE t2 (id INT UNSIGNED NOT NULL);
+
+INSERT INTO t1 VALUES
+(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
+(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
+(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0),
+(0),(0),(0),(0),(0),(0),(0),(0), (0),(0),(0),(0),(0),(0),(0),(0);
+INSERT t1 SELECT 0 FROM t1 AS a1, t1 AS a2 LIMIT 4032;
+
+INSERT INTO t2 SELECT id FROM t1;
+
+connection con1;
+let $ID= `SELECT @id := CONNECTION_ID()`;
+connection con2;
+let $ignore= `SELECT @id := $ID`;
+
+connection con1;
+SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
+SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync';
+# This is a very long running query. If this test start failing,
+# it may be necessary to change to an even longer query.
+send SELECT id FROM t1 WHERE id IN
+ (SELECT DISTINCT a.id FROM t2 a, t2 b, t2 c, t2 d
+ GROUP BY ACOS(1/a.id), b.id, c.id, d.id
+ HAVING a.id BETWEEN 10 AND 20);
+
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL @id;
+SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
+
+connection con1;
+--error 1317,1053,2006,2013,5014
+reap;
+SELECT 1;
+
+connection default;
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1, t2;
+
+#
+# Test of blocking of sending ERROR after OK or EOF
+#
+connection con1;
+let $ID= `SELECT @id := CONNECTION_ID()`;
+connection con2;
+let $ignore= `SELECT @id := $ID`;
+connection con1;
+SET DEBUG_SYNC= 'before_acos_function SIGNAL in_sync WAIT_FOR kill';
+send SELECT ACOS(0);
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+reap;
+SELECT 1;
+SELECT @id = CONNECTION_ID();
+connection default;
+SET DEBUG_SYNC = 'RESET';
+
+#
+# Bug#27563: Stored functions and triggers wasn't throwing an error when killed.
+#
+CREATE TABLE t1 (f1 INT);
+delimiter |;
+CREATE FUNCTION bug27563() RETURNS INT(11)
+DETERMINISTIC
+BEGIN
+ DECLARE CONTINUE HANDLER FOR SQLSTATE '70100' SET @a:= 'killed';
+ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+ SET DEBUG_SYNC= 'now SIGNAL in_sync WAIT_FOR kill';
+ RETURN 1;
+END|
+delimiter ;|
+# Test stored functions
+# Test INSERT
+connection con1;
+let $ID= `SELECT @id := CONNECTION_ID()`;
+connection con2;
+let $ignore= `SELECT @id := $ID`;
+connection con1;
+send INSERT INTO t1 VALUES (bug27563());
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+--error 1317
+reap;
+SELECT * FROM t1;
+connection default;
+SET DEBUG_SYNC = 'RESET';
+
+# Test UPDATE
+INSERT INTO t1 VALUES(0);
+connection con1;
+send UPDATE t1 SET f1= bug27563();
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+--error 1317
+reap;
+SELECT * FROM t1;
+connection default;
+SET DEBUG_SYNC = 'RESET';
+
+# Test DELETE
+INSERT INTO t1 VALUES(1);
+connection con1;
+send DELETE FROM t1 WHERE bug27563() IS NULL;
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+--error 1317
+reap;
+SELECT * FROM t1;
+connection default;
+SET DEBUG_SYNC = 'RESET';
+
+# Test SELECT
+connection con1;
+send SELECT * FROM t1 WHERE f1= bug27563();
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+--error 1317
+reap;
+SELECT * FROM t1;
+connection default;
+SET DEBUG_SYNC = 'RESET';
+DROP FUNCTION bug27563;
+
+# Test TRIGGERS
+CREATE TABLE t2 (f2 INT);
+delimiter |;
+CREATE TRIGGER trg27563 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+ DECLARE CONTINUE HANDLER FOR SQLSTATE '70100' SET @a:= 'killed';
+ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception';
+ INSERT INTO t2 VALUES(0);
+ SET DEBUG_SYNC= 'now SIGNAL in_sync WAIT_FOR kill';
+ INSERT INTO t2 VALUES(1);
+END|
+delimiter ;|
+connection con1;
+send INSERT INTO t1 VALUES(2),(3);
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
+KILL QUERY @id;
+connection con1;
+--error 1317
+reap;
+SELECT * FROM t1;
+SELECT * FROM t2;
+connection default;
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t1, t2;
+
+--echo #
+--echo # Bug#19723: kill of active connection yields different error code
+--echo # depending on platform.
+--echo #
+
+--connection con1
+let $ID= `SELECT @id := CONNECTION_ID()`;
+SET DEBUG_SYNC= 'thread_end SIGNAL con1_end';
+--disable_reconnect
+--error ER_CONNECTION_KILLED
+KILL @id;
+
+connection con2;
+SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
+connection con1;
+--echo # ER_SERVER_SHUTDOWN, CR_SERVER_GONE_ERROR, CR_SERVER_LOST,
+--echo # depending on the timing of close of the connection socket
+--error 1053,2006,2013,5014
+SELECT 1;
+--enable_reconnect
+SELECT 1;
+let $ignore= `SELECT @id := $ID`;
+SELECT @id != CONNECTION_ID();
+connection default;
+
+SET DEBUG_SYNC = 'RESET';
+DROP FUNCTION MY_KILL;
+
+set global sql_mode=default;
+disconnect con1;
+disconnect con2;
+
+--echo #
+--echo # MDEV-29368 Assertion `trx->mysql_thd == thd' failed in innobase_kill_query from process_timers/timer_handler and use-after-poison in innobase_kill_query
+--echo #
+connect foo,localhost,root;
+let $id=`select connection_id()`;
+create table t1 (a int) engine=innodb;
+insert t1 values (1);
+set debug_sync='THD_cleanup_after_set_killed SIGNAL go0 WAIT_FOR go1';
+set debug_sync='innobase_connection_closed SIGNAL go2 WAIT_FOR go3';
+disconnect foo;
+
+connection default;
+set debug_sync='now WAIT_FOR go0';
+set debug_sync='found_killee SIGNAL go1 WAIT_FOR go2';
+evalp kill $id;
+set debug_sync='now SIGNAL go3';
+drop table t1;
+set debug_sync='reset';
diff --git a/mysql-test/main/long_host.result b/mysql-test/main/long_host.result
index 4c479e36fa9..57b637de587 100644
--- a/mysql-test/main/long_host.result
+++ b/mysql-test/main/long_host.result
@@ -27,9 +27,9 @@ current_user()
user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678@host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345
# check global privileges
select * from mariadbtestdb.t1;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't1'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t1`
select * from mariadbtestdb2.t2;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't2'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb2`.`t2`
connection default;
grant SELECT ON *.* TO user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678@host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345;
disconnect con1;
@@ -46,9 +46,9 @@ disconnect con1;
connect con1,"127.0.0.1","user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678",,test,$MASTER_MYPORT,;
connection con1;
select * from mariadbtestdb.t1;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't1'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t1`
select * from mariadbtestdb2.t2;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't2'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb2`.`t2`
# check data base privileges
connection default;
grant SELECT ON mariadbtestdb.* TO user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678@host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345;
@@ -58,7 +58,7 @@ connection con1;
select * from mariadbtestdb.t1;
a b
select * from mariadbtestdb2.t2;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't2'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb2`.`t2`
select * from mariadbtestdb.t3;
a
# check table privileges
@@ -71,9 +71,9 @@ connection con1;
select * from mariadbtestdb.t1;
a b
select * from mariadbtestdb2.t2;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't2'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb2`.`t2`
select * from mariadbtestdb.t3;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't3'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t3`
# check column privileges
connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678@host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345;
@@ -82,11 +82,11 @@ disconnect con1;
connect con1,"127.0.0.1","user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678",,test,$MASTER_MYPORT,;
connection con1;
select * from mariadbtestdb.t1;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't1'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t1`
select * from mariadbtestdb2.t2;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't2'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb2`.`t2`
select * from mariadbtestdb.t3;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't3'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t3`
select a from mariadbtestdb.t1;
a
# check role
@@ -101,13 +101,13 @@ disconnect con1;
connect con1,"127.0.0.1","user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678",,test,$MASTER_MYPORT,;
connection con1;
select * from mariadbtestdb.t1;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't1'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t1`
select * from mariadbtestdb2.t2;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't2'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb2`.`t2`
select * from mariadbtestdb.t3;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't3'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t3`
select a from mariadbtestdb.t1;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't1'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t1`
SELECT CURRENT_ROLE;
CURRENT_ROLE
NULL
@@ -116,11 +116,11 @@ SELECT CURRENT_ROLE;
CURRENT_ROLE
role5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678
select * from mariadbtestdb.t1;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't1'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t1`
select * from mariadbtestdb2.t2;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't2'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb2`.`t2`
select * from mariadbtestdb.t3;
-ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table 't3'
+ERROR 42000: SELECT command denied to user 'user5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678'@'host5678901_345678902_345678903_345678904_345678905_345678906_345678907_345678908_345678909_345678910_345678911_345678912_345678913_345678914_345678915_345678916_345678917_345678918_345678919_345678920_345678921_345678922_345678923_345678924_345678925_345' for table `mariadbtestdb`.`t3`
select a from mariadbtestdb.t1;
a
# check procedure
diff --git a/mysql-test/main/lowercase_fs_off.result b/mysql-test/main/lowercase_fs_off.result
index 0d79db02fc7..98b7a8c7c38 100644
--- a/mysql-test/main/lowercase_fs_off.result
+++ b/mysql-test/main/lowercase_fs_off.result
@@ -27,7 +27,7 @@ CREATE TABLE t1(f1 INT);
GRANT SELECT ON T1 to user_1@localhost;
connect con1,localhost,user_1,,d1;
select * from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d1`.`t1`
select * from T1;
f1
connection default;
diff --git a/mysql-test/main/myisam_debug_keys.result b/mysql-test/main/myisam_debug_keys.result
new file mode 100644
index 00000000000..e4cff16797b
--- /dev/null
+++ b/mysql-test/main/myisam_debug_keys.result
@@ -0,0 +1,4924 @@
+#
+# MDEV-29672 Add MTR tests covering key and key segment flags and types
+#
+SET debug_dbug='+d,key';
+CREATE TABLE types (
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+type TEXT NOT NULL,
+prefix_length INT NOT NULL
+);
+Warnings:
+Note 1105 DBUG: prep_create_table: name=`PRIMARY` flags=00000001 (HA_NOSAME)
+Note 1105 DBUG: ha_myisam::create: name=`PRIMARY` flags=00000011 (HA_AUTO_KEY|HA_NOSAME)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+INSERT INTO types (type, prefix_length) VALUES
+('INT', 0),
+('BIGINT', 0),
+('DOUBLE', 0),
+('DECIMAL(20,10)', 0),
+('CHAR(4)', 0),
+('CHAR(10)', 0),
+('VARCHAR(4)', 0),
+('VARCHAR(6)', 0),
+('VARCHAR(8)', 0),
+('VARCHAR(12)', 0),
+('VARCHAR(16)', 0),
+('VARCHAR(100)', 0),
+('TEXT', 4),
+('TEXT', 6),
+('TEXT', 8),
+('TEXT', 12),
+('TEXT', 16),
+('TEXT', 100);
+BEGIN NOT ATOMIC
+DECLARE create2_template TEXT
+DEFAULT 'CREATE TABLE t1 (a TYPE1 NOT NULL, b TYPE2 NOT NULL, KEY(SEG1,SEG2))';
+DECLARE cur2 CURSOR FOR
+SELECT t1.type AS type1,
+t2.type AS type2,
+t1.prefix_length AS prefix_length1,
+t2.prefix_length AS prefix_length2
+FROM types AS t1, types AS t2
+ORDER BY t1.id, t2.id;
+FOR rec IN cur2 DO
+BEGIN
+DECLARE tabledef TEXT DEFAULT REPLACE(create2_template,'TYPE1', rec.type1);
+SET tabledef=REPLACE(tabledef, 'TYPE2', rec.type2);
+SET tabledef=REPLACE(tabledef, 'SEG1',
+IF(rec.prefix_length1,
+CONCAT('a(',rec.prefix_length1,')'), 'a'));
+SET tabledef=REPLACE(tabledef, 'SEG2',
+IF(rec.prefix_length2,
+CONCAT('b(',rec.prefix_length2,')'), 'b'));
+SELECT tabledef AS ``;
+EXECUTE IMMEDIATE tabledef;
+SHOW WARNINGS;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+END;
+END FOR;
+END;
+$$
+
+CREATE TABLE t1 (a INT NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a INT NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=4 LONG_INT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` int(11) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a BIGINT NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=10 LONGLONG
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` bigint(20) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DOUBLE NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=6 DOUBLE
+Note 1105 DBUG: seg[0].flag=00000800 (HA_CAN_MEMCMP)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` double NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a DECIMAL(20,10) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=2 BINARY
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` decimal(20,10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000000
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a CHAR(10) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: seg[0].type=1 TEXT
+Note 1105 DBUG: seg[0].flag=00000001 (HA_SPACE_PACK)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` char(10) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(4) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(4) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000000
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000002 (HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(6) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(6) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(8) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(8) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(12) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(12) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(16) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(16) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b INT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b BIGINT NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b DOUBLE NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b CHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b CHAR(10) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b VARCHAR(4) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b VARCHAR(6) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00000028 (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b VARCHAR(8) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b VARCHAR(12) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b VARCHAR(16) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b VARCHAR(100) NOT NULL, KEY(a,b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0000002A (HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`,`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b TEXT NOT NULL, KEY(a,b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b TEXT NOT NULL, KEY(a,b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b TEXT NOT NULL, KEY(a,b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b TEXT NOT NULL, KEY(a,b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b TEXT NOT NULL, KEY(a,b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a VARCHAR(100) NOT NULL, b TEXT NOT NULL, KEY(a,b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=15 VARTEXT1
+Note 1105 DBUG: seg[0].flag=00000008 (HA_VAR_LENGTH_PART)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` varchar(100) NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`,`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b INT NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b BIGINT NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DOUBLE NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(4) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(10) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(4) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(6) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(8) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(12) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(16) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(100) NOT NULL, KEY(a(4),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`(4),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(4),b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(4),`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(4),b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(4),`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(4),b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(4),`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(4),b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(4),`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(4),b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(4),`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(4),b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(4),`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b INT NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b BIGINT NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DOUBLE NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(4) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(10) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(4) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(6) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(8) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(12) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(16) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(100) NOT NULL, KEY(a(6),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`(6),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(6),b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(6),`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(6),b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010000 (HA_KEY_HAS_PART_KEY_SEG)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000000
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(6),`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(6),b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(6),`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(6),b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(6),`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(6),b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(6),`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(6),b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010002 (HA_KEY_HAS_PART_KEY_SEG|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(6),`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b INT NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b BIGINT NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DOUBLE NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(4) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(10) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(4) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(6) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(8) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(12) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(16) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(100) NOT NULL, KEY(a(8),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`(8),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(8),b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(8),`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(8),b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(8),`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(8),b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(8),`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(8),b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(8),`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(8),b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(8),`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(8),b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(8),`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b INT NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b BIGINT NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DOUBLE NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(4) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(10) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(4) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(6) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(8) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(12) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(16) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(100) NOT NULL, KEY(a(12),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`(12),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(12),b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(12),`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(12),b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(12),`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(12),b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(12),`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(12),b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(12),`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(12),b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(12),`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(12),b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(12),`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b INT NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b BIGINT NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DOUBLE NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(4) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(10) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(4) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(6) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(8) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(12) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(16) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(100) NOT NULL, KEY(a(16),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`(16),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(16),b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(16),`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(16),b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(16),`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(16),b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(16),`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(16),b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(16),`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(16),b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(16),`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(16),b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(16),`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b INT NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=4 LONG_INT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` int(11) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b BIGINT NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=10 LONGLONG
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` bigint(20) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DOUBLE NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=6 DOUBLE
+Note 1105 DBUG: seg[1].flag=00000800 (HA_CAN_MEMCMP)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` double NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b DECIMAL(20,10) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=2 BINARY
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` decimal(20,10) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(4) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000000
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(4) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b CHAR(10) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=1 TEXT
+Note 1105 DBUG: seg[1].flag=00000001 (HA_SPACE_PACK)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` char(10) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(4) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(4) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(6) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(6) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(8) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(8) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(12) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(12) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(16) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(16) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b VARCHAR(100) NOT NULL, KEY(a(100),b))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=15 VARTEXT1
+Note 1105 DBUG: seg[1].flag=00000008 (HA_VAR_LENGTH_PART)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` varchar(100) NOT NULL,
+ KEY `a` (`a`(100),`b`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(100),b(4)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(100),`b`(4))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(100),b(6)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=00010028 (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(100),`b`(6))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(100),b(8)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(100),`b`(8))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(100),b(12)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(100),`b`(12))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(100),b(16)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(100),`b`(16))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+
+CREATE TABLE t1 (a TEXT NOT NULL, b TEXT NOT NULL, KEY(a(100),b(100)))
+Level Code Message
+Note 1105 DBUG: prep_create_table: name=`a` flags=0001002A (HA_KEY_HAS_PART_KEY_SEG|HA_BINARY_PACK_KEY|HA_VAR_LENGTH_KEY|HA_PACK_KEY)
+Note 1105 DBUG: ha_myisam::create: name=`a` flags=00000020 (HA_BINARY_PACK_KEY)
+Note 1105 DBUG: seg[0].type=17 VARTEXT2
+Note 1105 DBUG: seg[0].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Note 1105 DBUG: seg[1].type=17 VARTEXT2
+Note 1105 DBUG: seg[1].flag=00000024 (HA_BLOB_PART|HA_PART_KEY_SEG)
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `a` text NOT NULL,
+ `b` text NOT NULL,
+ KEY `a` (`a`(100),`b`(100))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE types;
+SET debug_dbug='';
diff --git a/mysql-test/main/myisam_debug_keys.test b/mysql-test/main/myisam_debug_keys.test
new file mode 100644
index 00000000000..c6555d260b9
--- /dev/null
+++ b/mysql-test/main/myisam_debug_keys.test
@@ -0,0 +1,64 @@
+--source include/have_debug.inc
+
+--echo #
+--echo # MDEV-29672 Add MTR tests covering key and key segment flags and types
+--echo #
+
+SET debug_dbug='+d,key';
+CREATE TABLE types (
+ id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ type TEXT NOT NULL,
+ prefix_length INT NOT NULL
+);
+INSERT INTO types (type, prefix_length) VALUES
+('INT', 0),
+('BIGINT', 0),
+('DOUBLE', 0),
+('DECIMAL(20,10)', 0),
+('CHAR(4)', 0),
+('CHAR(10)', 0),
+('VARCHAR(4)', 0),
+('VARCHAR(6)', 0),
+('VARCHAR(8)', 0),
+('VARCHAR(12)', 0),
+('VARCHAR(16)', 0),
+('VARCHAR(100)', 0),
+('TEXT', 4),
+('TEXT', 6),
+('TEXT', 8),
+('TEXT', 12),
+('TEXT', 16),
+('TEXT', 100);
+DELIMITER $$;
+BEGIN NOT ATOMIC
+ DECLARE create2_template TEXT
+ DEFAULT 'CREATE TABLE t1 (a TYPE1 NOT NULL, b TYPE2 NOT NULL, KEY(SEG1,SEG2))';
+ DECLARE cur2 CURSOR FOR
+ SELECT t1.type AS type1,
+ t2.type AS type2,
+ t1.prefix_length AS prefix_length1,
+ t2.prefix_length AS prefix_length2
+ FROM types AS t1, types AS t2
+ ORDER BY t1.id, t2.id;
+ FOR rec IN cur2 DO
+ BEGIN
+ DECLARE tabledef TEXT DEFAULT REPLACE(create2_template,'TYPE1', rec.type1);
+ SET tabledef=REPLACE(tabledef, 'TYPE2', rec.type2);
+ SET tabledef=REPLACE(tabledef, 'SEG1',
+ IF(rec.prefix_length1,
+ CONCAT('a(',rec.prefix_length1,')'), 'a'));
+ SET tabledef=REPLACE(tabledef, 'SEG2',
+ IF(rec.prefix_length2,
+ CONCAT('b(',rec.prefix_length2,')'), 'b'));
+ SELECT tabledef AS ``;
+ EXECUTE IMMEDIATE tabledef;
+ SHOW WARNINGS;
+ SHOW CREATE TABLE t1;
+ DROP TABLE t1;
+ END;
+ END FOR;
+END;
+$$
+DELIMITER ;$$
+DROP TABLE types;
+SET debug_dbug='';
diff --git a/mysql-test/main/mysql_tzinfo_to_sql_symlink.result b/mysql-test/main/mysql_tzinfo_to_sql_symlink.result
index d5c6518a130..b6b35e44988 100644
--- a/mysql-test/main/mysql_tzinfo_to_sql_symlink.result
+++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.result
@@ -8,7 +8,7 @@ CREATE TABLE time_zone_leap_second LIKE mysql.time_zone_leap_second;
#
# Verbose run
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_cannot_replicate_tz, "select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME='time_zone'", 'do 0');
execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
@@ -57,7 +57,7 @@ execute immediate if(@wsrep_cannot_replicate_tz, concat('ALTER TABLE time_zone_t
#
# Run on zoneinfo directory
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_cannot_replicate_tz, "select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME='time_zone'", 'do 0');
execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
@@ -117,7 +117,7 @@ COUNT(*)
# Run on zoneinfo directory --skip-write-binlog
#
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -189,7 +189,7 @@ TRUNCATE TABLE time_zone_leap_second;
# Testing with explicit timezonefile
#
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_cannot_replicate_tz, "select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME='time_zone'", 'do 0');
execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
@@ -253,7 +253,7 @@ TRUNCATE TABLE time_zone_leap_second;
# Testing with explicit timezonefile --skip-write-binlog
#
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -311,7 +311,7 @@ TRUNCATE TABLE time_zone_leap_second;
# Testing --leap
#
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_cannot_replicate_tz, "select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME='time_zone'", 'do 0');
execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
@@ -374,7 +374,7 @@ TRUNCATE TABLE time_zone_leap_second;
# Testing --skip-write-binlog --leap
#
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -426,7 +426,7 @@ COM_TRUNCATE 1
# Testing --skip-write-binlog
#
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -448,7 +448,7 @@ COMMIT;
SET SESSION SQL_LOG_BIN=@save_sql_log_bin;
execute immediate if(@wsrep_is_on, 'SET SESSION WSREP_ON=@save_wsrep_on', 'do 0');
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -469,10 +469,33 @@ execute immediate if(@wsrep_is_on, 'SET SESSION WSREP_ON=@save_wsrep_on', 'do 0'
# End of 10.2 tests
#
#
+# MDEV-29347 MariaDB 10.6.8 fails to start when ONLY_FULL_GROUP_BY gets provided
+#
+set sql_mode=only_full_group_by;
+SELECT COUNT(*) FROM time_zone;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_name;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_transition;
+COUNT(*)
+0
+SELECT COUNT(*) FROM time_zone_transition_type;
+COUNT(*)
+2
+SELECT COUNT(*) FROM time_zone_leap_second;
+COUNT(*)
+0
+select @@sql_mode;
+@@sql_mode
+ONLY_FULL_GROUP_BY
+set sql_mode=default;
+#
# MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL
#
set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt FROM (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME IN ('time_zone', 'time_zone_name', 'time_zone_transition', 'time_zone_transition_type', 'time_zone_leap_second') AND ENGINE in ('MyISAM', 'Aria')) AS o ORDER BY OPTION DESC;
set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
execute immediate if(@wsrep_cannot_replicate_tz, "select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME='time_zone'", 'do 0');
execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
diff --git a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test
index 34df1281c38..5ccf74c2565 100644
--- a/mysql-test/main/mysql_tzinfo_to_sql_symlink.test
+++ b/mysql-test/main/mysql_tzinfo_to_sql_symlink.test
@@ -215,6 +215,23 @@ SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff
--echo #
--echo #
+--echo # MDEV-29347 MariaDB 10.6.8 fails to start when ONLY_FULL_GROUP_BY gets provided
+--echo #
+
+--exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo > $MYSQL_TMP_DIR/tz.sql
+set sql_mode=only_full_group_by;
+--disable_query_log
+--source $MYSQL_TMP_DIR/tz.sql
+--enable_query_log
+SELECT COUNT(*) FROM time_zone;
+SELECT COUNT(*) FROM time_zone_name;
+SELECT COUNT(*) FROM time_zone_transition;
+SELECT COUNT(*) FROM time_zone_transition_type;
+SELECT COUNT(*) FROM time_zone_leap_second;
+select @@sql_mode;
+set sql_mode=default;
+
+--echo #
--echo # MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL
--echo #
--exec rm -rf $MYSQLTEST_VARDIR/zoneinfo
diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result
index 8077f11ee93..7de9e7563d3 100644
--- a/mysql-test/main/mysql_upgrade.result
+++ b/mysql-test/main/mysql_upgrade.result
@@ -1900,18 +1900,18 @@ FLUSH PRIVILEGES;
#
This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mysql_upgrade again for MariaDB .
-Looking for 'mysql' as: mysql
+Looking for 'mariadb' as: mariadb
This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mysql_upgrade again for MariaDB .
#
# MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it
#
-Looking for 'mysql' as: mysql
+Looking for 'mariadb' as: mariadb
Empty or non existent ...mysql_upgrade_info. Assuming mysql_upgrade has to be run!
#
# MDEV-27279: mariadb_upgrade check-if-upgrade with minor version change
#
-Looking for 'mysql' as: mysql
+Looking for 'mariadb' as: mariadb
This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mysql_upgrade again for MariaDB .
This installation of MariaDB is already upgraded to MariaDB .
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
index 5d86dacfa02..3254b8d2d91 100644
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@@ -55,7 +55,7 @@ DROP USER mysqltest1@'%';
--echo Run mysql_upgrade with a non existing server socket
--replace_result $MYSQLTEST_VARDIR var
---replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9|-]*\)/(errno)/
+--replace_regex /.*mariadb-check.*: Got/mariadb-check: Got/ /\([0-9|-]*\)/(errno)/
--error 1
# NC: Added --skip-version-check, as the version check would fail when
# mysql_upgrade tries to get the server version.
@@ -139,7 +139,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--echo Run mysql_upgrade with unauthorized access
--error 1
--exec $MYSQL_UPGRADE --skip-verbose --user=root --password=wrong_password 2>&1
---replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9|-]*\)/(errno)/
+--replace_regex /.*mariadb-check.*: Got/mariadb-check: Got/ /\([0-9|-]*\)/(errno)/
--error 1
--exec $MYSQL_UPGRADE --skip-verbose --skip-version-check --user=root --password=wrong_password 2>&1
@@ -290,7 +290,7 @@ FLUSH PRIVILEGES;
--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
--error 1
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed
---replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mysql.* as:[^\n]*/'mysql' as: mysql/
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mariadb.* as:[^\n]*/'mariadb' as: mariadb/
--error 1
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
@@ -302,7 +302,7 @@ FLUSH PRIVILEGES;
--replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed
---replace_regex /'mysql.* as:[^\n]*/'mysql' as: mysql/ /open .* Assuming/open XXX. Assuming/ /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/
+--replace_regex /'mariadb.* as:[^\n]*/'mariadb' as: mariadb/ /open .* Assuming/open XXX. Assuming/ /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
--echo #
@@ -324,7 +324,7 @@ EOF
--error 1
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --silent
---replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mysql.* as:[^\n]*/'mysql' as: mysql/
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mariadb.* as:[^\n]*/'mariadb' as: mariadb/
--error 1
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
@@ -351,7 +351,7 @@ EOF
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --silent
--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed
---replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mysql.* as:[^\n]*/'mysql' as: mysql/
+--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mariadb.* as:[^\n]*/'mysql' as: mysql/
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
drop table mysql.global_priv;
diff --git a/mysql-test/main/mysqlbinlog.result b/mysql-test/main/mysqlbinlog.result
index 727558a8ce9..ba5007f0f8d 100644
--- a/mysql-test/main/mysqlbinlog.result
+++ b/mysql-test/main/mysqlbinlog.result
@@ -666,7 +666,7 @@ connect unsecure,localhost,untrusted,,mysqltest1;
mysql mysqltest1 -uuntrusted < var/tmp/bug31611.sql
connection unsecure;
INSERT INTO t1 VALUES (1,USER());
-ERROR 42000: INSERT command denied to user 'untrusted'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'untrusted'@'localhost' for table `mysqltest1`.`t1`
SELECT * FROM t1;
a b
1 root@localhost
diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result
index edd93014a07..53ff0e6c8ff 100644
--- a/mysql-test/main/mysqldump.result
+++ b/mysql-test/main/mysqldump.result
@@ -1929,6 +1929,7 @@ drop table `t1`;
create table t1(a int);
create table t2(a int);
create table t3(a int);
+mysqldump: Couldn't find table: "non_existing"
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3549,6 +3550,8 @@ create table t1 ( id serial );
create view v1 as select * from t1;
drop table t1;
mysqldump {
+mysqldump: Got error: 1356: "View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them" when using LOCK TABLES
+mysqldump: Couldn't execute 'SHOW FIELDS FROM `v1`': View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them (1356)
-- failed on view `v1`: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`t1`.`id` AS `id` from `t1`
@@ -3846,6 +3849,9 @@ DROP TABLE t1;
CREATE TABLE t1(a int);
INSERT INTO t1 VALUES (1), (2);
mysqldump: Input filename too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
+mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
+mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
DROP TABLE t1;
CREATE TABLE t2 (a INT) ENGINE=MyISAM;
CREATE TABLE t3 (a INT) ENGINE=MyISAM;
@@ -3939,6 +3945,7 @@ grant all privileges on mysqldump_test_db.* to user2;
connect user27293,localhost,user1,,mysqldump_test_db,$MASTER_MYPORT,$MASTER_MYSOCK;
connection user27293;
create procedure mysqldump_test_db.sp1() select 'hello';
+mysqldump: user2 has insufficient privileges to SHOW CREATE PROCEDURE `sp1`!
-- insufficient privileges to SHOW CREATE PROCEDURE `sp1`
-- does user2 have permissions on mysql.proc?
@@ -4171,6 +4178,7 @@ UNLOCK TABLES;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+mysqldump: Got error: 1146: "Table 'test.???????????????????????' doesn't exist" when using LOCK TABLES
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -4398,6 +4406,7 @@ Abernathy
aberrant
aberration
drop table words;
+mysqlimport: Error: 1146, Table 'test.words' doesn't exist, when using table: words
drop table t1;
drop table t2;
drop table words2;
@@ -4722,6 +4731,8 @@ CREATE TABLE t1 (a INT, b CHAR(10) CHARSET koi8r, c CHAR(10) CHARSET latin1);
CREATE TABLE t2 LIKE t1;
INSERT INTO t1 VALUES (1, 'ABC-АБВ', 'DEF-ÂÃÄ'), (2, NULL, NULL);
# error on multi-character ENCLOSED/ESCAPED BY
+mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
+mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
# default '--default-charset' (binary):
##################################################
1 ABC- DEF-
@@ -5208,6 +5219,7 @@ connection conn_1;
<field name="c1">3</field>
</row>
</table_data>
+mysqldump: user1 has insufficient privileges to SHOW CREATE FUNCTION `hello1`!
<triggers name="t2">
<trigger Trigger="trig1" sql_mode="" character_set_client="latin1" collation_connection="latin1_swedish_ci" Database_Collation="latin1_swedish_ci" Created="--TIME--">
<![CDATA[
@@ -5511,6 +5523,8 @@ ROUTINE_NAME
proc
one
DROP DATABASE bug25717383;
+mysqldump: Got error: 2005: "Unknown server host 'unknownhost'" when trying to connect
+mysqldump: Couldn't execute 'SHOW SLAVE STATUS': Server has gone away (2006)
Usage: mysqldump [OPTIONS] database [tables]
OR mysqldump [OPTIONS] --databases DB1 [DB2 DB3...]
OR mysqldump [OPTIONS] --all-databases
@@ -5758,6 +5772,7 @@ t1_id int,
CONSTRAINT fk
FOREIGN KEY (t1_id) REFERENCES t1 (id)
) ENGINE = InnoDB;
+mysqlimport: Error: 1452, Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `fk` FOREIGN KEY (`t1_id`) REFERENCES `t1` (`id`)), when using table: t2
select count(*) from t2;
count(*)
1
@@ -6448,6 +6463,7 @@ j integer
INSERT INTO t VALUES (1,1),(2,2),(3,3),(4,4);
# Dump database 1
# Restore from database 1 to database 2
+ERROR 1100 (HY000) at line 45: Table 'seq_t_i' was not locked with LOCK TABLES
SETVAL(`seq_t_i`, 1, 0)
1
DROP DATABASE IF EXISTS test1;
diff --git a/mysql-test/main/mysqldump.test b/mysql-test/main/mysqldump.test
index a4252f087c0..b7031e535a9 100644
--- a/mysql-test/main/mysqldump.test
+++ b/mysql-test/main/mysqldump.test
@@ -739,7 +739,7 @@ create table t2(a int);
create table t3(a int);
--replace_result mysqldump.exe mysqldump
--error 6
---exec $MYSQL_DUMP --default-character-set=utf8mb4 --skip-comments --force --no-data test t3 t1 non_existing t2
+--exec $MYSQL_DUMP --default-character-set=utf8mb4 --skip-comments --force --no-data test t3 t1 non_existing t2 2>&1
drop table t1, t2, t3;
@@ -1290,7 +1290,7 @@ drop table t1;
--echo mysqldump {
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP --default-character-set=utf8mb4 --force -N --compact --skip-comments test
+--exec $MYSQL_DUMP --default-character-set=utf8mb4 --force -N --compact --skip-comments test 2>&1
--echo } mysqldump
drop view v1;
@@ -1528,13 +1528,13 @@ INSERT INTO t1 VALUES (1), (2);
--exec $MYSQL_DUMP --default-character-set=utf8mb4 --tab=$MYSQLTEST_VARDIR/tmp/ --fields-terminated-by=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa test
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP --default-character-set=utf8mb4 --tab=$MYSQLTEST_VARDIR/tmp/ --fields-enclosed-by=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa test
+--exec $MYSQL_DUMP --default-character-set=utf8mb4 --tab=$MYSQLTEST_VARDIR/tmp/ --fields-enclosed-by=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa test 2>&1
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP --default-character-set=utf8mb4 --tab=$MYSQLTEST_VARDIR/tmp/ --fields-optionally-enclosed-by=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa test
+--exec $MYSQL_DUMP --default-character-set=utf8mb4 --tab=$MYSQLTEST_VARDIR/tmp/ --fields-optionally-enclosed-by=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa test 2>&1
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP --default-character-set=utf8mb4 --tab=$MYSQLTEST_VARDIR/tmp/ --fields-escaped-by=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa test
+--exec $MYSQL_DUMP --default-character-set=utf8mb4 --tab=$MYSQLTEST_VARDIR/tmp/ --fields-escaped-by=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa test 2>&1
--exec $MYSQL_DUMP --default-character-set=utf8mb4 --tab=$MYSQLTEST_VARDIR/tmp/ --lines-terminated-by=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa test
--remove_file $MYSQLTEST_VARDIR/tmp/t1.sql
@@ -1608,7 +1608,7 @@ create procedure mysqldump_test_db.sp1() select 'hello';
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP -f --compact --user=user2 --password= -h 127.0.0.1 -P $MASTER_MYPORT --routines mysqldump_test_db
+--exec $MYSQL_DUMP -f --compact --user=user2 --password= -h 127.0.0.1 -P $MASTER_MYPORT --routines mysqldump_test_db 2>&1
--exec $MYSQL_DUMP -f --compact --user=user1 --password= -h 127.0.0.1 -P $MASTER_MYPORT --routines mysqldump_test_db
@@ -1714,7 +1714,7 @@ CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
--exec $MYSQL_DUMP --character-sets-dir=$MYSQL_SHAREDIR/charsets --skip-comments --default-character-set=utf8 --compatible=mysql323 test
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP --character-sets-dir=$MYSQL_SHAREDIR/charsets --skip-comments --default-character-set=latin1 --compatible=mysql323 test
+--exec $MYSQL_DUMP --character-sets-dir=$MYSQL_SHAREDIR/charsets --skip-comments --default-character-set=latin1 --compatible=mysql323 test 2>&1
DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
SET NAMES latin1;
@@ -1768,9 +1768,8 @@ select * from words2;
# Drop table "words" and run with threads, should fail
drop table words;
--replace_regex /.*mysqlimport(\.exe)*/mysqlimport/
---replace_result mysqldump.exe mysqldump
--error 1
---exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data/words.dat $MYSQLTEST_VARDIR/std_data/words2.dat
+--exec $MYSQL_IMPORT --silent --use-threads=2 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt $MYSQLTEST_VARDIR/std_data/words.dat $MYSQLTEST_VARDIR/std_data/words2.dat 2>&1
drop table t1;
drop table t2;
@@ -2121,12 +2120,12 @@ INSERT INTO t1 VALUES (1, 'ABC-АБВ', 'DEF-ÂÃÄ'), (2, NULL, NULL);
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP --disable-default-character-set --tab=$MYSQLTEST_VARDIR/tmp/ --fields-enclosed-by='12345' test t1
+--exec $MYSQL_DUMP --disable-default-character-set --tab=$MYSQLTEST_VARDIR/tmp/ --fields-enclosed-by='12345' test t1 2>&1
--remove_file $file
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP --disable-default-character-set --tab=$MYSQLTEST_VARDIR/tmp/ --fields-escaped-by='12345' test t1
+--exec $MYSQL_DUMP --disable-default-character-set --tab=$MYSQLTEST_VARDIR/tmp/ --fields-escaped-by='12345' test t1 2>&1
--remove_file $file
--echo # default '--default-charset' (binary):
@@ -2340,7 +2339,7 @@ connection conn_1;
--replace_result mysqldump.exe mysqldump
--error 2
---exec $MYSQL_DUMP --user=user1 -R -E --triggers -X BUG52792
+--exec $MYSQL_DUMP --user=user1 -R -E --triggers -X BUG52792 2>&1
connection default;
disconnect conn_1;
@@ -2548,16 +2547,17 @@ DROP DATABASE bug25717383;
#
# MDEV-6091 mysqldump goes in a loop and segfaults if --dump-slave is specified and it cannot connect to the server
#
+--replace_regex /mysqldump\.exe/mysqldump/ /'unknownhost' \(.*\)/'unknownhost'/
--error 2
---exec $MYSQL_DUMP --default-character-set=utf8mb4 -hunknownhost --dump-slave nulldb
+--exec $MYSQL_DUMP --default-character-set=utf8mb4 -hunknownhost --dump-slave nulldb 2>&1
#
# MDEV-6056 [PATCH] mysqldump writes usage to stdout even when not explicitly requested
#
--replace_result mysqldump.exe mysqldump
--error 1
---exec $MYSQL_DUMP --default-character-set=utf8mb4 --user=foo 2>&1 > $MYSQLTEST_VARDIR/tmp/bug6056.out
---exec $MYSQL_DUMP --help > $MYSQLTEST_VARDIR/tmp/bug6056.out
+--exec $MYSQL_DUMP --default-character-set=utf8mb4 --user=foo 2>&1
+--exec $MYSQL_DUMP --help 2>&1 > $MYSQLTEST_VARDIR/tmp/bug6056.out
--echo #
--echo # MDEV-9001 - [PATCH] Fix DB name quoting in mysqldump --routine
@@ -2677,8 +2677,9 @@ create table t2 (
0
EOF
+--replace_regex /.*mysqlimport(\.exe)*/mysqlimport/
--error 1
---exec $MYSQL_IMPORT --silent test $MYSQLTEST_VARDIR/tmp/t2.txt
+--exec $MYSQL_IMPORT --silent test $MYSQLTEST_VARDIR/tmp/t2.txt 2>&1
--exec $MYSQL_IMPORT --silent -k test $MYSQLTEST_VARDIR/tmp/t2.txt
select count(*) from t2;
@@ -2881,7 +2882,7 @@ INSERT INTO t VALUES (1,1),(2,2),(3,3),(4,4);
--echo # Restore from database 1 to database 2
--error 1
---exec $MYSQL test2 < $MYSQLTEST_VARDIR/tmp/dumptest1.sql
+--exec $MYSQL test2 < $MYSQLTEST_VARDIR/tmp/dumptest1.sql 2>&1
--remove_file $MYSQLTEST_VARDIR/tmp/dumptest1.sql
DROP DATABASE IF EXISTS test1;
diff --git a/mysql-test/main/openssl_1.result b/mysql-test/main/openssl_1.result
index 8554da4f6be..c8377ee82b6 100644
--- a/mysql-test/main/openssl_1.result
+++ b/mysql-test/main/openssl_1.result
@@ -22,7 +22,7 @@ select * from t1;
f1
5
delete from t1;
-ERROR 42000: DELETE command denied to user 'ssl_user1'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'ssl_user1'@'localhost' for table `test`.`t1`
connection con3;
SELECT VARIABLE_VALUE <> '' AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
have_ssl
@@ -31,7 +31,7 @@ select * from t1;
f1
5
delete from t1;
-ERROR 42000: DELETE command denied to user 'ssl_user3'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'ssl_user3'@'localhost' for table `test`.`t1`
connection con4;
SELECT VARIABLE_VALUE <> '' AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
have_ssl
@@ -40,7 +40,7 @@ select * from t1;
f1
5
delete from t1;
-ERROR 42000: DELETE command denied to user 'ssl_user4'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'ssl_user4'@'localhost' for table `test`.`t1`
connection default;
disconnect con1;
disconnect con3;
diff --git a/mysql-test/main/opt_trace_security.result b/mysql-test/main/opt_trace_security.result
index 83d98c4c183..7debcb06b46 100644
--- a/mysql-test/main/opt_trace_security.result
+++ b/mysql-test/main/opt_trace_security.result
@@ -13,7 +13,7 @@ return a+1;
END|
set optimizer_trace="enabled=on";
select * from db1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`t1`
select * from information_schema.OPTIMIZER_TRACE;
QUERY TRACE MISSING_BYTES_BEYOND_MAX_MEM_SIZE INSUFFICIENT_PRIVILEGES
0 1
diff --git a/mysql-test/main/partition_explicit_prune.result b/mysql-test/main/partition_explicit_prune.result
index 05af8c82ff1..07af2d58a42 100644
--- a/mysql-test/main/partition_explicit_prune.result
+++ b/mysql-test/main/partition_explicit_prune.result
@@ -1897,7 +1897,7 @@ ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
SELECT * FROM t1 PARTITION (p0);
i
UNLOCK TABLES;
-DROP TABLE t1;
+DROP TABLE t1, t2;
#
# MDEV-18371 Server crashes in ha_innobase::cmp_ref upon UPDATE with PARTITION clause.
#
@@ -1915,7 +1915,88 @@ a b
4 3
8 2
2 6
-DROP TABLE t1, t2;
+DROP TABLE t1;
+#
+# MDEV-21134 Crash with partitioned table, PARTITION syntax, and index_merge.
+#
+create table t1 (
+pk int primary key,
+a int,
+b int,
+filler char(32),
+key (a),
+key (b)
+) engine=myisam partition by range(pk) (
+partition p0 values less than (10),
+partition p1 values less than MAXVALUE
+) ;
+insert into t1 select
+seq,
+MOD(seq, 100),
+MOD(seq, 100),
+'filler-data-filler-data'
+ from
+seq_1_to_5000;
+explain select * from t1 partition (p1) where a=10 and b=10;
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t1 index_merge a,b a,b 5,5 NULL 1 Using intersect(a,b); Using where
+flush tables;
+select * from t1 partition (p1)where a=10 and b=10;
+pk a b filler
+10 10 10 filler-data-filler-data
+110 10 10 filler-data-filler-data
+210 10 10 filler-data-filler-data
+310 10 10 filler-data-filler-data
+410 10 10 filler-data-filler-data
+510 10 10 filler-data-filler-data
+610 10 10 filler-data-filler-data
+710 10 10 filler-data-filler-data
+810 10 10 filler-data-filler-data
+910 10 10 filler-data-filler-data
+1010 10 10 filler-data-filler-data
+1110 10 10 filler-data-filler-data
+1210 10 10 filler-data-filler-data
+1310 10 10 filler-data-filler-data
+1410 10 10 filler-data-filler-data
+1510 10 10 filler-data-filler-data
+1610 10 10 filler-data-filler-data
+1710 10 10 filler-data-filler-data
+1810 10 10 filler-data-filler-data
+1910 10 10 filler-data-filler-data
+2010 10 10 filler-data-filler-data
+2110 10 10 filler-data-filler-data
+2210 10 10 filler-data-filler-data
+2310 10 10 filler-data-filler-data
+2410 10 10 filler-data-filler-data
+2510 10 10 filler-data-filler-data
+2610 10 10 filler-data-filler-data
+2710 10 10 filler-data-filler-data
+2810 10 10 filler-data-filler-data
+2910 10 10 filler-data-filler-data
+3010 10 10 filler-data-filler-data
+3110 10 10 filler-data-filler-data
+3210 10 10 filler-data-filler-data
+3310 10 10 filler-data-filler-data
+3410 10 10 filler-data-filler-data
+3510 10 10 filler-data-filler-data
+3610 10 10 filler-data-filler-data
+3710 10 10 filler-data-filler-data
+3810 10 10 filler-data-filler-data
+3910 10 10 filler-data-filler-data
+4010 10 10 filler-data-filler-data
+4110 10 10 filler-data-filler-data
+4210 10 10 filler-data-filler-data
+4310 10 10 filler-data-filler-data
+4410 10 10 filler-data-filler-data
+4510 10 10 filler-data-filler-data
+4610 10 10 filler-data-filler-data
+4710 10 10 filler-data-filler-data
+4810 10 10 filler-data-filler-data
+4910 10 10 filler-data-filler-data
+DROP TABLE t1;
+#
+# End of 10.3 tests
+#
#
# MDEV-18982: INSERT using explicit patition pruning with column list
#
@@ -1925,3 +2006,6 @@ select * from t1;
a
1
drop table t1;
+#
+# End of 10.4 tests
+#
diff --git a/mysql-test/main/partition_explicit_prune.test b/mysql-test/main/partition_explicit_prune.test
index 4dc3275394f..79719d9c4c7 100644
--- a/mysql-test/main/partition_explicit_prune.test
+++ b/mysql-test/main/partition_explicit_prune.test
@@ -1,5 +1,6 @@
--source include/have_innodb.inc
--source include/have_partition.inc
+--source include/have_sequence.inc
# Helper statement
let $get_handler_status_counts= SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
@@ -876,7 +877,7 @@ SELECT * FROM t1 PARTITION (p0);
ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2;
SELECT * FROM t1 PARTITION (p0);
UNLOCK TABLES;
-DROP TABLE t1;
+DROP TABLE t1, t2;
--echo #
--echo # MDEV-18371 Server crashes in ha_innobase::cmp_ref upon UPDATE with PARTITION clause.
@@ -887,10 +888,41 @@ INSERT INTO t1 VALUES (3,0),(8,2),(7,8),(3,4),(2,4),(0,7),(4,3),(3,6);
FLUSH TABLES;
UPDATE t1 PARTITION (p3,p1) SET a = 2 WHERE a = 3;
SELECT * FROM t1;
+DROP TABLE t1;
+
+--echo #
+--echo # MDEV-21134 Crash with partitioned table, PARTITION syntax, and index_merge.
+--echo #
+create table t1 (
+ pk int primary key,
+ a int,
+ b int,
+ filler char(32),
+ key (a),
+ key (b)
+ ) engine=myisam partition by range(pk) (
+ partition p0 values less than (10),
+ partition p1 values less than MAXVALUE
+ ) ;
+
+insert into t1 select
+seq,
+ MOD(seq, 100),
+ MOD(seq, 100),
+ 'filler-data-filler-data'
+ from
+ seq_1_to_5000;
+
+explain select * from t1 partition (p1) where a=10 and b=10;
+flush tables;
+select * from t1 partition (p1)where a=10 and b=10;
-# Cleanup
-DROP TABLE t1, t2;
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.3 tests
+--echo #
--echo #
--echo # MDEV-18982: INSERT using explicit patition pruning with column list
@@ -900,3 +932,8 @@ create table t1 (a int) partition by hash(a);
insert into t1 partition (p0) (a) values (1);
select * from t1;
drop table t1;
+
+--echo #
+--echo # End of 10.4 tests
+--echo #
+
diff --git a/mysql-test/main/partition_grant.result b/mysql-test/main/partition_grant.result
index 41934896aeb..c269896975d 100644
--- a/mysql-test/main/partition_grant.result
+++ b/mysql-test/main/partition_grant.result
@@ -14,7 +14,7 @@ GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT, ALTER ON `mysqltest_1`.* TO `mysqltest_1`@`localhost`
alter table t1 add b int;
alter table t1 drop partition p2;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `mysqltest_1`.`t1`
disconnect conn1;
connection default;
grant drop on mysqltest_1.* to mysqltest_1@localhost;
@@ -25,7 +25,7 @@ connection default;
revoke alter on mysqltest_1.* from mysqltest_1@localhost;
connect conn3,localhost,mysqltest_1,,mysqltest_1;
alter table t1 drop partition p3;
-ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest_1`.`t1`
disconnect conn3;
connection default;
revoke select,alter,drop on mysqltest_1.* from mysqltest_1@localhost;
diff --git a/mysql-test/main/plugin_not_embedded.result b/mysql-test/main/plugin_not_embedded.result
index a9ac5735137..3f9ce576448 100644
--- a/mysql-test/main/plugin_not_embedded.result
+++ b/mysql-test/main/plugin_not_embedded.result
@@ -6,7 +6,7 @@ GRANT INSERT ON mysql.plugin TO bug51770@localhost;
connect con1,localhost,bug51770,,;
INSTALL PLUGIN example SONAME 'ha_example.so';
UNINSTALL PLUGIN example;
-ERROR 42000: DELETE command denied to user 'bug51770'@'localhost' for table 'plugin'
+ERROR 42000: DELETE command denied to user 'bug51770'@'localhost' for table `mysql`.`plugin`
connection default;
GRANT DELETE ON mysql.plugin TO bug51770@localhost;
connection con1;
diff --git a/mysql-test/main/ps_ddl.result b/mysql-test/main/ps_ddl.result
index d99aeb0fa54..dcbb6982702 100644
--- a/mysql-test/main/ps_ddl.result
+++ b/mysql-test/main/ps_ddl.result
@@ -216,7 +216,7 @@ new trigger: 10
drop trigger t1_bd;
set @val=11;
execute stmt using @val;
-call p_verify_reprepare_count(1);
+call p_verify_reprepare_count(0);
SUCCESS
select @message;
@@ -226,7 +226,7 @@ Test 6-e: removing a relevant trigger
drop trigger t1_bi;
set @val=12;
execute stmt using @val;
-call p_verify_reprepare_count(1);
+call p_verify_reprepare_count(0);
SUCCESS
select @message;
@@ -386,7 +386,7 @@ a
flush table t1;
set @var=9;
execute stmt using @var;
-call p_verify_reprepare_count(1);
+call p_verify_reprepare_count(0);
SUCCESS
select * from t2;
@@ -834,7 +834,7 @@ a b c
10 20 50
20 40 100
30 60 150
-call p_verify_reprepare_count(1);
+call p_verify_reprepare_count(0);
SUCCESS
# Check that we properly handle ALTER VIEW statements.
@@ -1214,7 +1214,7 @@ drop trigger v2_bi;
set @message=null;
set @var=9;
execute stmt using @var;
-call p_verify_reprepare_count(1);
+call p_verify_reprepare_count(0);
SUCCESS
select @message;
@@ -2588,7 +2588,7 @@ SELECT * FROM t1;
a
2048
1025
-1024
+2048
DROP TABLE t1;
#
# End of 10.1 tests
diff --git a/mysql-test/main/ps_ddl.test b/mysql-test/main/ps_ddl.test
index 8d811ec00c0..17cffb7dd9a 100644
--- a/mysql-test/main/ps_ddl.test
+++ b/mysql-test/main/ps_ddl.test
@@ -252,7 +252,8 @@ drop trigger t1_bd;
set @val=11;
execute stmt using @val;
-call p_verify_reprepare_count(1);
+# No trigger in opened table => nothing to check => no reprepare
+call p_verify_reprepare_count(0);
select @message;
--echo Test 6-e: removing a relevant trigger
@@ -261,7 +262,8 @@ drop trigger t1_bi;
set @val=12;
execute stmt using @val;
-call p_verify_reprepare_count(1);
+# No trigger in opened table => nothing to check => no reprepare
+call p_verify_reprepare_count(0);
select @message;
set @val=13;
execute stmt using @val;
@@ -376,7 +378,8 @@ select * from t3;
flush table t1;
set @var=9;
execute stmt using @var;
-call p_verify_reprepare_count(1);
+# flush tables now do not mean reprepare
+call p_verify_reprepare_count(0);
select * from t2;
select * from t3;
drop view v1;
@@ -745,7 +748,7 @@ call p_verify_reprepare_count(1);
flush table t2;
execute stmt;
-call p_verify_reprepare_count(1);
+call p_verify_reprepare_count(0);
--echo # Check that we properly handle ALTER VIEW statements.
execute stmt;
@@ -973,7 +976,8 @@ drop trigger v2_bi;
set @message=null;
set @var=9;
execute stmt using @var;
-call p_verify_reprepare_count(1);
+# No trigger in opened table => nothing to check => no reprepare
+call p_verify_reprepare_count(0);
select @message;
create trigger v2_bi after insert on v2 for each row set @message="v2_ai";
set @var= 10;
diff --git a/mysql-test/main/ps_grant.result b/mysql-test/main/ps_grant.result
index c9ef089b215..a0a05a231cd 100644
--- a/mysql-test/main/ps_grant.result
+++ b/mysql-test/main/ps_grant.result
@@ -28,7 +28,7 @@ execute s_t9 ;
my_col
1
select a as my_col from t1;
-ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table `mysqltest`.`t1`
connection default;
grant select on mysqltest.t1 to second_user@localhost
identified by 'looser' ;
@@ -71,7 +71,7 @@ Grants for second_user@localhost
GRANT SELECT ON `mysqltest`.`t9` TO `second_user`@`localhost`
GRANT USAGE ON *.* TO `second_user`@`localhost` IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
execute s_t1 ;
-ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table `mysqltest`.`t1`
connection default;
disconnect con3;
revoke all privileges, grant option from second_user@localhost ;
diff --git a/mysql-test/main/show_check.result b/mysql-test/main/show_check.result
index 270a4f410c6..26c96a5114b 100644
--- a/mysql-test/main/show_check.result
+++ b/mysql-test/main/show_check.result
@@ -541,25 +541,25 @@ show create database mysqltest;
Database Create Database
mysqltest CREATE DATABASE `mysqltest` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */
drop table t1;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t1`
drop database mysqltest;
ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest'
disconnect con1;
connect con2,localhost,mysqltest_2,,test;
connection con2;
select * from mysqltest.t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest`.`t1`
show create database mysqltest;
ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest'
drop table mysqltest.t1;
-ERROR 42000: DROP command denied to user 'mysqltest_2'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_2'@'localhost' for table `mysqltest`.`t1`
drop database mysqltest;
ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest'
disconnect con2;
connect con3,localhost,mysqltest_3,,test;
connection con3;
select * from mysqltest.t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t1`
show create database mysqltest;
Database Create Database
mysqltest CREATE DATABASE `mysqltest` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */
diff --git a/mysql-test/main/sp-security-anchor-type.result b/mysql-test/main/sp-security-anchor-type.result
index 4ee846f9f2e..12e3c0fa24e 100644
--- a/mysql-test/main/sp-security-anchor-type.result
+++ b/mysql-test/main/sp-security-anchor-type.result
@@ -21,9 +21,9 @@ user1@localhost
# Making sure that user1 does not have privileges to db1.t1
#
SHOW CREATE TABLE db1.t1;
-ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table `db1`.`t1`
SHOW FIELDS IN db1.t1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
#
# Trigger: using TYPE OF with a table we don't have access to
#
@@ -39,7 +39,7 @@ SET NEW.b = 10;
END
$$
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
SELECT * FROM t1;
a b
10 20
@@ -56,7 +56,7 @@ SELECT a;
END;
$$
CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP PROCEDURE p1;
#
# Stored procedure: Using TYPE OF for with a table that we don't have access to
@@ -72,7 +72,7 @@ END;
$$
connection conn1;
CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP PROCEDURE p1;
connection default;
CREATE PROCEDURE p1()
@@ -84,7 +84,7 @@ END;
$$
connection conn1;
CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP PROCEDURE p1;
#
# Stored procedure: Using TYPE OF for with a table that we don't have access to
@@ -129,7 +129,7 @@ RETURN OCTET_LENGTH(a);
END;
$$
SELECT f1();
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP FUNCTION f1;
DROP TABLE t1;
#
@@ -147,7 +147,7 @@ END;
$$
connection conn1;
SELECT f1();
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP FUNCTION f1;
DROP TABLE t1;
#
@@ -176,7 +176,7 @@ connection conn1;
# Making sure that user1 has access to db1.t1.a, but not to db1.t1.b
#
SHOW CREATE TABLE db1.t1;
-ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table `db1`.`t1`
SHOW FIELDS IN db1.t1;
Field Type Null Key Default Extra
a int(11) YES NULL
diff --git a/mysql-test/main/sp-security.result b/mysql-test/main/sp-security.result
index 2571f9d8696..8a1f46c7c35 100644
--- a/mysql-test/main/sp-security.result
+++ b/mysql-test/main/sp-security.result
@@ -50,7 +50,7 @@ select db1_secret.db();
db1_secret.db()
test
select * from db1_secret.t1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1_secret`.`t1`
create procedure db1_secret.dummy() begin end;
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
drop procedure db1_secret.dummy;
@@ -65,7 +65,7 @@ select db1_secret.db();
db1_secret.db()
test
select * from db1_secret.t1;
-ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user ''@'localhost' for table `db1_secret`.`t1`
create procedure db1_secret.dummy() begin end;
ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
drop procedure db1_secret.dummy;
@@ -102,14 +102,14 @@ db()
test
connection con2user1;
call db1_secret.stamp(5);
-ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table `db1_secret`.`t1`
select db1_secret.db();
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1_secret`.`t1`
connection con3anon;
call db1_secret.stamp(6);
-ERROR 42000: INSERT command denied to user ''@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user ''@'localhost' for table `db1_secret`.`t1`
select db1_secret.db();
-ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user ''@'localhost' for table `db1_secret`.`t1`
connection con1root;
drop database if exists db2;
create database db2;
@@ -127,7 +127,7 @@ connection con2user1;
use db2;
create procedure p () insert into t2 values (1);
call p();
-ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table `db2`.`t2`
connect con4user2,localhost,user2,,;
connection con4user2;
use db2;
@@ -405,9 +405,9 @@ id int(11) YES NULL
call db_bug14533.bug14533_2();
id
desc db_bug14533.t1;
-ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table `db_bug14533`.`t1`
select * from db_bug14533.t1;
-ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table `db_bug14533`.`t1`
connection default;
disconnect user_bug14533;
drop user user_bug14533@localhost;
@@ -567,24 +567,24 @@ END|
CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT f_evil();
connect conn1, localhost, mysqltest_u1,,;
SELECT COUNT(*) FROM t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`t1`
SELECT f_evil();
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`t1`
SELECT @a, @b;
@a @b
mysqltest_u1@localhost NULL
SELECT f_suid(f_evil());
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`t1`
SELECT @a, @b;
@a @b
mysqltest_u1@localhost NULL
CALL p_suid(f_evil());
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`t1`
SELECT @a, @b;
@a @b
mysqltest_u1@localhost NULL
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`v1`
SELECT @a, @b;
@a @b
mysqltest_u1@localhost NULL
diff --git a/mysql-test/main/status.result b/mysql-test/main/status.result
index d25cde89ee1..d17bd9c6a61 100644
--- a/mysql-test/main/status.result
+++ b/mysql-test/main/status.result
@@ -243,13 +243,13 @@ return (select * from db37908.t1 limit 1)|
connect user1,localhost,mysqltest_1,,test;
connection user1;
select * from db37908.t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `db37908`.`t1`
show status where variable_name ='uptime' and 2 in (select * from db37908.t1);
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `db37908`.`t1`
show procedure status where name ='proc37908' and 1 in (select f1 from db37908.t1);
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `db37908`.`t1`
show function status where name ='func37908' and 1 in (select func37908());
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `db37908`.`t1`
connection default;
disconnect user1;
disconnect root;
diff --git a/mysql-test/main/timezone_grant.result b/mysql-test/main/timezone_grant.result
index bacc8348e89..6d9872448a7 100644
--- a/mysql-test/main/timezone_grant.result
+++ b/mysql-test/main/timezone_grant.result
@@ -25,9 +25,9 @@ convert_tz(b, 'Europe/Moscow', 'UTC')
update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
where t1.a = t2.c and t2.d = (select max(d) from t2);
select * from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone_name`
select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone_name`
connection default;
disconnect tzuser;
connection default;
@@ -54,9 +54,9 @@ convert_tz(b, 'Europe/Moscow', 'UTC')
update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')
where t1.a = t2.c and t2.d = (select max(d) from t2);
select * from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone_name`
select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone_name`
drop table t1, t2;
create table t1 (a int, b datetime);
create table t2 (a int, b varchar(40));
@@ -82,10 +82,10 @@ a lb
1 2001-01-01 03:00:00
2 2002-01-01 03:00:00
select * from v1, mysql.time_zone;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone`
drop view v1;
create view v1 as select a, convert_tz(b, 'UTC', 'Europe/Moscow') as lb from t1, mysql.time_zone;
-ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table 'time_zone'
+ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone`
connection default;
disconnect tzuser3;
drop table t1;
diff --git a/mysql-test/main/trigger_notembedded.result b/mysql-test/main/trigger_notembedded.result
index e276ddd1e48..41547ac1e99 100644
--- a/mysql-test/main/trigger_notembedded.result
+++ b/mysql-test/main/trigger_notembedded.result
@@ -23,7 +23,7 @@ connection wl2818_definer_con;
CREATE TRIGGER trg1 AFTER INSERT ON t1
FOR EACH ROW
INSERT INTO t2 VALUES(CURRENT_USER());
-ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table `mysqltest_db1`.`t1`
disconnect wl2818_definer_con;
connection default;
GRANT TRIGGER ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;
@@ -38,12 +38,12 @@ REVOKE TRIGGER ON mysqltest_db1.t1 FROM mysqltest_dfn@localhost;
connect wl2818_definer_con,localhost,mysqltest_dfn,,mysqltest_db1;
connection wl2818_definer_con;
DROP TRIGGER trg1;
-ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table `mysqltest_db1`.`t1`
disconnect wl2818_definer_con;
connect wl2818_definer_con,localhost,mysqltest_dfn,,mysqltest_db1;
connection wl2818_definer_con;
INSERT INTO t1 VALUES(0);
-ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table `mysqltest_db1`.`t1`
disconnect wl2818_definer_con;
connection default;
GRANT TRIGGER ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;
@@ -95,7 +95,7 @@ REVOKE INSERT ON mysqltest_db1.t2 FROM mysqltest_dfn@localhost;
connection wl2818_invoker_con;
use mysqltest_db1;
INSERT INTO t1 VALUES(3);
-ERROR 42000: INSERT command denied to user 'mysqltest_dfn'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'mysqltest_dfn'@'localhost' for table `mysqltest_db1`.`t2`
SELECT * FROM t1;
num_value
1
@@ -563,7 +563,7 @@ INSERT INTO t2 VALUES (2);
connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_u1@localhost;
UPDATE IGNORE t1, t2 SET t1.a1 = 2, t2.a1 = 3 WHERE t1.a1 = 1 AND t2.a1 = 2;
-ERROR 42000: TRIGGER command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t1`
DROP DATABASE mysqltest_db1;
DROP USER mysqltest_u1@localhost;
disconnect con1;
diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result
index 65760393add..dcd2f4389c2 100644
--- a/mysql-test/main/union.result
+++ b/mysql-test/main/union.result
@@ -2679,5 +2679,90 @@ ALTER TABLE t4 ADD INDEX (`NULL`);
DROP TABLE t1, t2, t3, t4;
set @@default_storage_engine=@save_default_storage_engine;
#
+# MDEV-29022: add_slave destroy child list and has dead code
+# (test added to be sure that ordering by several subqueries works)
+#
+create table t1 (aa int);
+insert into t1 values (-1),(0),(1),(2),(3),(4),(5),(6),(98),(99),(100),(102);
+create table t2 (a int, b int);
+insert into t2 values (2,2),(2,3),(3,4),(3,5);
+select a as a, b as b,
+(select max(aa) from t1 where aa < t2.a) as c,
+(select max(aa) from t1 where aa < t2.b) as d
+from t2
+union select 0 as a, 100 as b,
+(select max(aa) from t1 where aa < 0) as c,
+(select max(aa) from t1 where aa < 100) as d
+union select 0 as a, 99 as b,
+(select max(aa) from t1 where aa < 0) as c,
+(select max(aa) from t1 where aa < 99) as d
+order by (select max(aa) from t1 where aa < a),
+(select max(aa) from t1 where aa < b);
+a b c d
+0 99 -1 98
+0 100 -1 99
+2 2 1 1
+2 3 1 2
+3 4 2 3
+3 5 2 4
+select a as a, b as b,
+(select max(aa) from t1 where aa < t2.a) as c,
+(select 200 - max(aa) from t1 where aa < t2.b) as d
+from t2
+union select 0 as a, 100 as b,
+(select max(aa) from t1 where aa < 0) as c,
+(select 200 - max(aa) from t1 where aa < 100) as d
+union select 0 as a, 99 as b,
+(select max(aa) from t1 where aa < 0) as c,
+(select 200 - max(aa) from t1 where aa < 99) as d
+order by (select max(aa) from t1 where aa < a),
+(select 200 - max(aa) from t1 where aa < b);
+a b c d
+0 100 -1 101
+0 99 -1 102
+2 3 1 198
+2 2 1 199
+3 5 2 196
+3 4 2 197
+(select a as a, b as b,
+(select max(aa) from t1 where aa < t2.a) as c,
+(select max(aa) from t1 where aa < t2.b) as d
+from t2)
+union (select 0 as a, 100 as b,
+(select max(aa) from t1 where aa < 0) as c,
+(select max(aa) from t1 where aa < 100) as d)
+union (select 0 as a, 99 as b,
+(select max(aa) from t1 where aa < 0) as c,
+(select max(aa) from t1 where aa < 99) as d)
+order by (select max(aa) from t1 where aa < a),
+(select max(aa) from t1 where aa < b);
+a b c d
+0 99 -1 98
+0 100 -1 99
+2 2 1 1
+2 3 1 2
+3 4 2 3
+3 5 2 4
+(select a as a, b as b,
+(select max(aa) from t1 where aa < t2.a) as c,
+(select 200 - max(aa) from t1 where aa < t2.b) as d
+from t2)
+union (select 0 as a, 100 as b,
+(select max(aa) from t1 where aa < 0) as c,
+(select 200 - max(aa) from t1 where aa < 100) as d)
+union (select 0 as a, 99 as b,
+(select max(aa) from t1 where aa < 0) as c,
+(select 200 - max(aa) from t1 where aa < 99) as d)
+order by (select max(aa) from t1 where aa < a),
+(select 200 - max(aa) from t1 where aa < b);
+a b c d
+0 100 -1 101
+0 99 -1 102
+2 3 1 198
+2 2 1 199
+3 5 2 196
+3 4 2 197
+drop table t1,t2;
+#
# End of 10.3 tests
#
diff --git a/mysql-test/main/union.test b/mysql-test/main/union.test
index 6c0203f2a5f..a6b054a848f 100644
--- a/mysql-test/main/union.test
+++ b/mysql-test/main/union.test
@@ -1914,5 +1914,75 @@ DROP TABLE t1, t2, t3, t4;
set @@default_storage_engine=@save_default_storage_engine;
--echo #
+--echo # MDEV-29022: add_slave destroy child list and has dead code
+--echo # (test added to be sure that ordering by several subqueries works)
+--echo #
+
+create table t1 (aa int);
+
+insert into t1 values (-1),(0),(1),(2),(3),(4),(5),(6),(98),(99),(100),(102);
+
+
+create table t2 (a int, b int);
+
+insert into t2 values (2,2),(2,3),(3,4),(3,5);
+
+
+select a as a, b as b,
+ (select max(aa) from t1 where aa < t2.a) as c,
+ (select max(aa) from t1 where aa < t2.b) as d
+ from t2
+union select 0 as a, 100 as b,
+ (select max(aa) from t1 where aa < 0) as c,
+ (select max(aa) from t1 where aa < 100) as d
+union select 0 as a, 99 as b,
+ (select max(aa) from t1 where aa < 0) as c,
+ (select max(aa) from t1 where aa < 99) as d
+ order by (select max(aa) from t1 where aa < a),
+ (select max(aa) from t1 where aa < b);
+
+select a as a, b as b,
+ (select max(aa) from t1 where aa < t2.a) as c,
+ (select 200 - max(aa) from t1 where aa < t2.b) as d
+ from t2
+union select 0 as a, 100 as b,
+ (select max(aa) from t1 where aa < 0) as c,
+ (select 200 - max(aa) from t1 where aa < 100) as d
+union select 0 as a, 99 as b,
+ (select max(aa) from t1 where aa < 0) as c,
+ (select 200 - max(aa) from t1 where aa < 99) as d
+ order by (select max(aa) from t1 where aa < a),
+ (select 200 - max(aa) from t1 where aa < b);
+
+
+(select a as a, b as b,
+ (select max(aa) from t1 where aa < t2.a) as c,
+ (select max(aa) from t1 where aa < t2.b) as d
+ from t2)
+union (select 0 as a, 100 as b,
+ (select max(aa) from t1 where aa < 0) as c,
+ (select max(aa) from t1 where aa < 100) as d)
+union (select 0 as a, 99 as b,
+ (select max(aa) from t1 where aa < 0) as c,
+ (select max(aa) from t1 where aa < 99) as d)
+ order by (select max(aa) from t1 where aa < a),
+ (select max(aa) from t1 where aa < b);
+
+(select a as a, b as b,
+ (select max(aa) from t1 where aa < t2.a) as c,
+ (select 200 - max(aa) from t1 where aa < t2.b) as d
+ from t2)
+union (select 0 as a, 100 as b,
+ (select max(aa) from t1 where aa < 0) as c,
+ (select 200 - max(aa) from t1 where aa < 100) as d)
+union (select 0 as a, 99 as b,
+ (select max(aa) from t1 where aa < 0) as c,
+ (select 200 - max(aa) from t1 where aa < 99) as d)
+ order by (select max(aa) from t1 where aa < a),
+ (select 200 - max(aa) from t1 where aa < b);
+
+drop table t1,t2;
+
+--echo #
--echo # End of 10.3 tests
--echo #
diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result
index addbaf533cc..27ae01a5b40 100644
--- a/mysql-test/main/view.result
+++ b/mysql-test/main/view.result
@@ -6823,6 +6823,34 @@ r
drop view v1;
drop table t1;
#
+# MDEV-17124: mariadb 10.1.34, views and prepared statements:
+# ERROR 1615 (HY000): Prepared statement needs to be re-prepared
+#
+set @tdc= @@table_definition_cache, @tc= @@table_open_cache;
+set global table_definition_cache= 400, table_open_cache= 400;
+create table tt (a int, primary key(a)) engine=MyISAM;
+create view v as select * from tt;
+insert into tt values(1),(2),(3),(4);
+prepare stmt from 'select * from tt';
+#fill table definition cache
+execute stmt;
+a
+1
+2
+3
+4
+prepare stmt from 'select * from v';
+execute stmt;
+a
+1
+2
+3
+4
+drop database db;
+drop view v;
+drop table tt;
+set global table_definition_cache= @tdc, table_open_cache= @tc;
+#
# End of 10.2 tests
#
#
diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test
index 71c8eff0539..334b17611ce 100644
--- a/mysql-test/main/view.test
+++ b/mysql-test/main/view.test
@@ -6540,6 +6540,46 @@ drop view v1;
drop table t1;
--echo #
+--echo # MDEV-17124: mariadb 10.1.34, views and prepared statements:
+--echo # ERROR 1615 (HY000): Prepared statement needs to be re-prepared
+--echo #
+
+set @tdc= @@table_definition_cache, @tc= @@table_open_cache;
+set global table_definition_cache= 400, table_open_cache= 400;
+
+create table tt (a int, primary key(a)) engine=MyISAM;
+create view v as select * from tt;
+insert into tt values(1),(2),(3),(4);
+
+prepare stmt from 'select * from tt';
+--echo #fill table definition cache
+--disable_query_log
+--disable_result_log
+create database db;
+use db;
+--let $tables=401
+while ($tables)
+{
+ --eval create table t$tables (i int) engine=MyISAM
+ --eval select * from t$tables
+ --dec $tables
+}
+
+use test;
+
+--enable_query_log
+--enable_result_log
+execute stmt;
+prepare stmt from 'select * from v';
+execute stmt;
+
+# Cleanup
+drop database db;
+drop view v;
+drop table tt;
+set global table_definition_cache= @tdc, table_open_cache= @tc;
+
+--echo #
--echo # End of 10.2 tests
--echo #
diff --git a/mysql-test/main/view_grant.result b/mysql-test/main/view_grant.result
index c31ba882e76..370035147a1 100644
--- a/mysql-test/main/view_grant.result
+++ b/mysql-test/main/view_grant.result
@@ -25,13 +25,13 @@ create definer=root@localhost view v1 as select * from mysqltest.t1;
ERROR 42000: Access denied; you need (at least one of) the SUPER, SET USER privilege(s) for this operation
create view v1 as select * from mysqltest.t1;
alter view v1 as select * from mysqltest.t1;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `test`.`v1`
create or replace view v1 as select * from mysqltest.t1;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `test`.`v1`
create view mysqltest.v2 as select * from mysqltest.t1;
-ERROR 42000: CREATE VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: CREATE VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
create view v2 as select * from mysqltest.t2;
-ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t2`
connection root;
show create view v1;
View Create View character_set_client collation_connection
@@ -98,7 +98,7 @@ c
select c from mysqltest.v4;
c
select c from mysqltest.v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v5`
show columns from mysqltest.v1;
Field Type Null Key Default Extra
c bigint(12) YES NULL
@@ -110,23 +110,23 @@ d bigint(12) YES NULL
explain select c from mysqltest.v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1`
explain select c from mysqltest.v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v2;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
explain select c from mysqltest.v3;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v3;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
explain select c from mysqltest.v4;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v4;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v4'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v4`
explain select c from mysqltest.v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v5`
show create view mysqltest.v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v5`
connection root;
grant select on mysqltest.v5 to mysqltest_1@localhost;
connection user1;
@@ -136,7 +136,7 @@ v5 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
explain select c from mysqltest.v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1`
connection root;
grant show view on mysqltest.v1 to mysqltest_1@localhost;
grant select on mysqltest.t1 to mysqltest_1@localhost;
@@ -151,17 +151,17 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
explain select c from mysqltest.v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v2;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
explain select c from mysqltest.v3;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v3;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
explain select c from mysqltest.v4;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v4;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v4'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v4`
explain select c from mysqltest.v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v5`
connection root;
grant show view on mysqltest.* to mysqltest_1@localhost;
connection user1;
@@ -248,9 +248,9 @@ ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for column
update v2 set c=a+c;
ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for column 'c' in table 'v2'
update t2,v3 set v3.a=v3.a+v3.c where t2.x=v3.c;
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
update v3 set a=a+c;
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
use test;
connection root;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
@@ -281,9 +281,9 @@ select * from t1;
a b
5 10
delete v2 from t2,v2 where t2.x=v2.c;
-ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
delete from v2 where c < 4;
-ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
use test;
connection root;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
@@ -316,9 +316,9 @@ a b
5 6
3 4
insert into v2 values (5,6);
-ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
insert into v2 select x,y from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
use test;
connection root;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
@@ -336,7 +336,7 @@ connection user1;
create view v1 as select * from mysqltest.t1;
create view v2 as select b from mysqltest.t2;
create view mysqltest.v1 as select * from mysqltest.t1;
-ERROR 42000: CREATE VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: CREATE VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1`
create view v3 as select a from mysqltest.t2;
ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for column 'a' in table 't2'
connection root;
@@ -605,7 +605,7 @@ connection user1;
use mysqltest;
LOCK TABLES v1 READ;
SHOW CREATE TABLE v1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1`
UNLOCK TABLES;
use test;
connection root;
@@ -664,29 +664,29 @@ ERROR HY000: View 'mysqltest1.v_t1' references invalid table(s) or column(s) or
SELECT 1 FROM mysqltest1.v_t1;
ERROR HY000: View 'mysqltest1.v_t1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
SELECT * FROM mysqltest1.t1;
-ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table `mysqltest1`.`t1`
SELECT * FROM mysqltest1.v_ts;
x
1
2
SELECT * FROM mysqltest1.v_ts, mysqltest1.t1 WHERE mysqltest1.t1.x = mysqltest1.v_ts.x;
-ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table `mysqltest1`.`t1`
SELECT * FROM mysqltest1.v_ti;
-ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table 'v_ti'
+ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ti`
INSERT INTO mysqltest1.v_ts VALUES (100);
-ERROR 42000: INSERT command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: INSERT command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
INSERT INTO mysqltest1.v_ti VALUES (100);
UPDATE mysqltest1.v_ts SET x= 200 WHERE x = 100;
-ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
UPDATE mysqltest1.v_ts SET x= 200;
-ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
UPDATE mysqltest1.v_tu SET x= 200 WHERE x = 100;
UPDATE mysqltest1.v_tus SET x= 200 WHERE x = 100;
UPDATE mysqltest1.v_tu SET x= 200;
DELETE FROM mysqltest1.v_ts WHERE x= 200;
-ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
DELETE FROM mysqltest1.v_ts;
-ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
DELETE FROM mysqltest1.v_td WHERE x= 200;
ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for column 'x' in table 'v_td'
DELETE FROM mysqltest1.v_tds WHERE x= 200;
@@ -899,11 +899,11 @@ REVOKE SELECT ON t2 FROM mysqltest_u2@localhost;
UPDATE t2 SET s = 'private' WHERE s = 'public';
connection conn2;
SELECT * FROM mysqltest_db1.v1, mysqltest_db1.t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table `mysqltest_db1`.`t2`
EXECUTE stmt1;
-ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table `mysqltest_db1`.`t2`
EXECUTE stmt2;
-ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table `mysqltest_db1`.`t2`
disconnect conn2;
disconnect conn1;
connection default;
@@ -928,9 +928,9 @@ GRANT SELECT ON db26813.t1 TO u26813@localhost;
connect u1,localhost,u26813,,db26813;
connection u1;
ALTER VIEW v1 AS SELECT f2 FROM t1;
-ERROR 42000: CREATE VIEW command denied to user 'u26813'@'localhost' for table 'v1'
+ERROR 42000: CREATE VIEW command denied to user 'u26813'@'localhost' for table `db26813`.`v1`
ALTER VIEW v2 AS SELECT f2 FROM t1;
-ERROR 42000: DROP command denied to user 'u26813'@'localhost' for table 'v2'
+ERROR 42000: DROP command denied to user 'u26813'@'localhost' for table `db26813`.`v2`
ALTER VIEW v3 AS SELECT f2 FROM t1;
ERROR 42000: Access denied; you need (at least one of) the SUPER, SET USER privilege(s) for this operation
connection root;
@@ -1093,13 +1093,13 @@ f1
SELECT f2 FROM t1;
ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'f2' in table 't1'
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`t1`
SELECT f1 FROM v1;
f1
SELECT f2 FROM v1;
ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'f2' in table 'v1'
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`v1`
connection default;
disconnect root;
disconnect addconfoo;
@@ -1196,9 +1196,9 @@ disconnect test11765687;
connect test11765687,localhost,cecil,,mysqltest1;
connection test11765687;
select * from v1;
-ERROR 42000: SELECT command denied to user 'cecil'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'cecil'@'localhost' for table `mysqltest1`.`v1`
explain select * from v1;
-ERROR 42000: SELECT command denied to user 'cecil'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'cecil'@'localhost' for table `mysqltest1`.`v1`
disconnect test11765687;
... as dan
connect test11765687,localhost,dan,,mysqltest1;
@@ -1226,11 +1226,11 @@ show create view v2;
View Create View character_set_client collation_connection
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`alice`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `v1`.`i` AS `i`,`t2`.`j` AS `j` from (`v1` join `t2`) latin1 latin1_swedish_ci
explain select * from t1;
-ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table `mysqltest1`.`t1`
explain select * from v1;
-ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table `mysqltest1`.`v1`
explain select * from t2;
-ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table `mysqltest1`.`t2`
explain select * from v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
disconnect test11765687;
@@ -1240,7 +1240,7 @@ connection test11765687;
select * from v2;
i j
explain select * from v1;
-ERROR 42000: SELECT command denied to user 'greg'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'greg'@'localhost' for table `mysqltest1`.`v1`
explain select * from v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
disconnect test11765687;
@@ -1248,9 +1248,9 @@ disconnect test11765687;
connect test11765687,localhost,han,,mysqltest1;
connection test11765687;
select * from t3;
-ERROR 42000: SELECT command denied to user 'han'@'localhost' for table 't3'
+ERROR 42000: SELECT command denied to user 'han'@'localhost' for table `mysqltest1`.`t3`
explain select * from t3;
-ERROR 42000: SELECT command denied to user 'han'@'localhost' for table 't3'
+ERROR 42000: SELECT command denied to user 'han'@'localhost' for table `mysqltest1`.`t3`
select k from t3;
k
explain select k from t3;
@@ -1290,9 +1290,9 @@ disconnect test11765687;
connect test11765687,localhost,lena,,mysqltest1;
connection test11765687;
select * from v2;
-ERROR 42000: SELECT command denied to user 'lena'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'lena'@'localhost' for table `mysqltest1`.`v2`
explain select * from v2;
-ERROR 42000: SELECT command denied to user 'lena'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'lena'@'localhost' for table `mysqltest1`.`v2`
disconnect test11765687;
... as mhairi
connect test11765687,localhost,mhairi,,mysqltest1;
@@ -1412,9 +1412,9 @@ connect connection1, localhost, mysqluser1, , mysqltest1;
This would lead to failed assertion.
CREATE VIEW v1 AS SELECT a, b FROM t1, t2;
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v1`
SELECT b FROM v1;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v1`
disconnect connection1;
connection default;
DROP TABLE t1, t2;
@@ -1433,9 +1433,9 @@ GRANT SELECT( a ) ON v1 TO mysqluser1@localhost;
GRANT UPDATE( b ) ON t2 TO mysqluser1@localhost;
connect connection1, localhost, mysqluser1, , test;
SELECT * FROM mysqltest1.v1;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v1`
CREATE VIEW v1 AS SELECT * FROM mysqltest1.t2;
-ERROR 42000: ANY command denied to user 'mysqluser1'@'localhost' for table 't2'
+ERROR 42000: ANY command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t2`
disconnect connection1;
connection default;
DROP TABLE t1, t2;
@@ -1458,9 +1458,9 @@ connection default;
REVOKE SELECT ON mysqltest1.* FROM mysqluser1@localhost;
connection connection1;
EXECUTE stmt_v1;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v1`
EXECUTE stmt_v2;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v2`
disconnect connection1;
connect connection2, localhost, mysqluser1,,;
PREPARE stmt FROM "SELECT a FROM v3";
@@ -1620,11 +1620,11 @@ REVOKE SHOW VIEW ON v_f1 FROM mysqluser1@localhost;
REVOKE SHOW VIEW ON v_v1 FROM mysqluser1@localhost;
connection connection1;
SHOW CREATE VIEW mysqltest1.v_t1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table 'v_t1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v_t1`
SHOW CREATE VIEW mysqltest1.v_f1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table 'v_f1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v_f1`
SHOW CREATE VIEW mysqltest1.v_v1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table 'v_v1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v_v1`
SHOW CREATE VIEW v_mysqluser1_t1;
View Create View character_set_client collation_connection
v_mysqluser1_t1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqluser1`@`localhost` SQL SECURITY DEFINER VIEW `v_mysqluser1_t1` AS select `mysqltest1`.`t1`.`a` AS `a` from `mysqltest1`.`t1` latin1 latin1_swedish_ci
@@ -1875,7 +1875,7 @@ update mysqltest2.t2 as t2, mysqltest1.v1_temp as v1 set t2.val= 'test4'
# Temptable views can't be updated.
update mysqltest2.t2 as t2, mysqltest1.v1_merge as v1 set v1.val= 'test5'
where t2.id= v1.id;
-ERROR 42000: UPDATE command denied to user 'user_11766767'@'localhost' for table 'v1_merge'
+ERROR 42000: UPDATE command denied to user 'user_11766767'@'localhost' for table `mysqltest1`.`v1_merge`
update mysqltest1.t1 as t1, mysqltest2.v2_merge as v2 set v2.val= 'test6'
where t1.id= v2.id;
#
@@ -1899,7 +1899,7 @@ update mysqltest2.t2 as t2, mysqltest1.v11_temp as v11 set t2.val= 'test10'
# on a view.
update mysqltest2.t2 as t2, mysqltest1.v11_merge as v11 set v11.val= 'test11'
where t2.id= v11.id;
-ERROR 42000: UPDATE command denied to user 'user_11766767'@'localhost' for table 'v11_merge'
+ERROR 42000: UPDATE command denied to user 'user_11766767'@'localhost' for table `mysqltest1`.`v11_merge`
update mysqltest1.t1 as t1, mysqltest2.v21_merge as v21 set v21.val= 'test12'
where t1.id= v21.id;
# As before, temptable views are not updateable.
@@ -1961,7 +1961,7 @@ CREATE VIEW foo.v AS SELECT * FROM JSON_TABLE('[1,2,3]', '$[*]' COLUMNS (num INT
CREATE USER foo@localhost;
connect con1,localhost,foo,,;
SELECT * FROM foo.v;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'v'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `foo`.`v`
#
# Clean-up.
#
diff --git a/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result b/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
index 13de367a9b8..8425e0ad17a 100644
--- a/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
+++ b/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
@@ -145,7 +145,7 @@ INSERT INTO t2 VALUES (1, REPEAT("x", 1));
BEGIN;
INSERT INTO t2 VALUES (2, REPEAT("x", 4100));
INSERT INTO t1 VALUES (2, REPEAT("x", 4100));
-SET DEBUG_SYNC= "commit_after_run_commit_ordered SIGNAL con1_ready WAIT_FOR signal_no_signal";
+SET DEBUG_SYNC= "commit_after_run_commit_ordered SIGNAL con1_ready";
COMMIT;
connection default;
SET DEBUG_SYNC= "now WAIT_FOR con1_ready";
diff --git a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
index 896bc11686b..12b0a743916 100644
--- a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
+++ b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
@@ -47,7 +47,7 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=rocksdb;
--let $case = "C"
--let $description= "both engines have committed its transaction branch"
---let $debug_sync_action = "commit_after_run_commit_ordered SIGNAL con1_ready WAIT_FOR signal_no_signal"
+--let $debug_sync_action = "commit_after_run_commit_ordered SIGNAL con1_ready"
# Hold off after both engines have committed. The server is shut down.
--let $shutdown_timeout=
--let $restart_parameters = --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
diff --git a/mysql-test/suite/compat/oracle/r/sp-security.result b/mysql-test/suite/compat/oracle/r/sp-security.result
index b98ecaca972..db29a17a210 100644
--- a/mysql-test/suite/compat/oracle/r/sp-security.result
+++ b/mysql-test/suite/compat/oracle/r/sp-security.result
@@ -23,9 +23,9 @@ user1@localhost
# Making sure that user1 does not have privileges to db1.t1
#
SHOW CREATE TABLE db1.t1;
-ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table `db1`.`t1`
SHOW FIELDS IN db1.t1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
#
# Trigger: using %TYPE with a table we don't have access to
#
@@ -43,7 +43,7 @@ END;
END
$$
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
SELECT * FROM t1;
a b
10 20
@@ -61,7 +61,7 @@ SELECT a;
END;
$$
CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP PROCEDURE p1;
CREATE PROCEDURE p1()
AS
@@ -71,7 +71,7 @@ SELECT a.a;
END;
$$
CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP PROCEDURE p1;
#
# Stored procedure: Using %TYPE for with a table that we don't have access to
@@ -88,7 +88,7 @@ END;
$$
connection conn1;
CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP PROCEDURE p1;
connection default;
CREATE PROCEDURE p1()
@@ -101,7 +101,7 @@ END;
$$
connection conn1;
CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP PROCEDURE p1;
#
# Stored procedure: Using %TYPE for with a table that we don't have access to
@@ -149,7 +149,7 @@ RETURN OCTET_LENGTH(a);
END;
$$
SELECT f1();
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP FUNCTION f1;
DROP TABLE t1;
#
@@ -168,7 +168,7 @@ END;
$$
connection conn1;
SELECT f1();
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
DROP FUNCTION f1;
DROP TABLE t1;
#
@@ -198,7 +198,7 @@ connection conn1;
# Making sure that user1 has access to db1.t1.a, but not to db1.t1.b
#
SHOW CREATE TABLE db1.t1;
-ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table `db1`.`t1`
SHOW FIELDS IN db1.t1;
Field Type Null Key Default Extra
a int(11) YES NULL
diff --git a/mysql-test/suite/encryption/r/debug_key_management.result b/mysql-test/suite/encryption/r/debug_key_management.result
index 911a369f0c6..7fe681d52ae 100644
--- a/mysql-test/suite/encryption/r/debug_key_management.result
+++ b/mysql-test/suite/encryption/r/debug_key_management.result
@@ -15,7 +15,6 @@ set global debug_key_management_version=10;
select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
count(*)
0
-SET GLOBAL debug_dbug = '+d,ib_log';
SET GLOBAL innodb_log_checkpoint_now = 1;
SET GLOBAL innodb_flush_log_at_trx_commit = 1;
INSERT INTO t1 VALUES(NULL);
diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test
index c370ecf5bd8..15a560d4c42 100644
--- a/mysql-test/suite/encryption/t/debug_key_management.test
+++ b/mysql-test/suite/encryption/t/debug_key_management.test
@@ -25,7 +25,6 @@ let $wait_condition= select count(*) = $tables_count from information_schema.inn
select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
# Test redo log key rotation and crash recovery.
-SET GLOBAL debug_dbug = '+d,ib_log';
SET GLOBAL innodb_log_checkpoint_now = 1;
SET GLOBAL innodb_flush_log_at_trx_commit = 1;
INSERT INTO t1 VALUES(NULL);
diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result
index 00b15c36baa..d158fe8bfd6 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_sp.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_sp.result
@@ -301,7 +301,7 @@ select * from t2;
a
connection con1;
create trigger trg before insert on t1 for each row set new.a= 10;
-ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table `mysqltest1`.`t1`
connection master;
delete from t1;
create trigger trg before insert on t1 for each row set new.a= 10;
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
index 6db6e374ca7..88269f25a01 100644
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
@@ -221,31 +221,31 @@ connect user5_2, localhost, user_2, , db_storedproc_1;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
connection default;
root@localhost db_storedproc_1
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
grant insert on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
connection user5_2;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
connection default;
root@localhost db_storedproc_1
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
grant SELECT on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
connection user5_2;
@@ -276,9 +276,9 @@ inserted outside of SP NULL
inserted from sp5_ins 2000-10-00
inserted from sp5_s_i 2000-10-00
inserted from sp5_ins 2000-10-00
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
c1 c2 c3
inserted outside of SP NULL
@@ -294,11 +294,11 @@ connection user5_2;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
disconnect user5_2;
connection default;
@@ -348,9 +348,9 @@ user_2@localhost db_storedproc_1
CALL sp3166_s_i();
c1
inserted outside SP
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_ins();
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_sel();
c1
inserted outside SP
@@ -390,10 +390,10 @@ connect user6_4, localhost, user_2, , db_storedproc_1;
user_2@localhost db_storedproc_1
CALL sp3166_s_i();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_ins();
CALL sp3166_sel();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
disconnect user6_4;
connection default;
CALL sp3166_s_i();
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
index 92cbff3fafb..051e0d1e125 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
@@ -99,7 +99,7 @@ test_noprivs@localhost
use priv_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.2-no');
@@ -135,7 +135,7 @@ Testcase 3.5.3.6:
connection no_privs;
use priv_db;
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.6-yes');
@@ -688,7 +688,7 @@ insert into t2 values (new.f1);
connection default;
use priv_db;
insert into t1 (f1) values (4);
-ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
grant INSERT on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (4);
@@ -706,7 +706,7 @@ update t2 set f2=new.f1-1;
connection default;
use priv_db;
insert into t1 (f1) values (2);
-ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (2);
@@ -725,7 +725,7 @@ select f2 into @aaa from t2 where f2=new.f1;
connection default;
use priv_db;
insert into t1 (f1) values (1);
-ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
grant SELECT on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (1);
@@ -748,7 +748,7 @@ delete from t2;
connection default;
use priv_db;
insert into t1 (f1) values (1);
-ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
grant DELETE on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (1);
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
index 875aa18e81f..6ec5240792c 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
@@ -31,7 +31,7 @@ no trigger privilege on db level for create:
use priv_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connect no_privs,localhost,test_noprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK;
use priv_db;
insert into t1 (f1) values ('insert-yes');
@@ -107,7 +107,7 @@ current_user
test_yesprivs@localhost
use priv_db;
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -117,7 +117,7 @@ use priv_db;
no trigger privilege at activation time:
----------------------------------------
insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert-yes
@@ -155,7 +155,7 @@ Grants for test_yesprivs@localhost
GRANT USAGE ON *.* TO `test_yesprivs`@`localhost` IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
takes effect after use priv_db:
-------------------------------
@@ -195,14 +195,14 @@ test_yesprivs@localhost
use no_priv_db;
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use priv_db;
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-yes';
use no_priv_db;
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use priv_db;
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes';
@@ -302,7 +302,7 @@ Tables_in_priv_db
t1
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -376,7 +376,7 @@ select current_user;
current_user
test_yesprivs@localhost
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
no trigger privilege at activation time:
----------------------------------------
@@ -385,7 +385,7 @@ select current_user;
current_user
test_noprivs@localhost
insert into t1 (f1) values ('insert5-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert1-yes
@@ -476,12 +476,12 @@ current_user
test_yesprivs@localhost
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-yes';
create trigger trg2_2 before UPDATE on t2 for each row
set new.f1 = 'trig 2_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes';
show triggers;
@@ -615,7 +615,7 @@ Trigger Event Table Statement Timing Created sql_mode Definer character_set_clie
select * from information_schema.triggers;
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
drop trigger trg1_1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -635,7 +635,7 @@ current_user
test_yesprivs@localhost
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -671,11 +671,11 @@ set new.f1 = 'trig 1_2-yes';
create trigger no_priv_db.trg1_9 before insert on no_priv_db.t1
for each row
set new.f1 = 'trig 1_9-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use no_priv_db;
create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
create trigger priv_db.trg1_9 before UPDATE on priv_db.t1
for each row
set new.f1 = 'trig 1_9-yes';
@@ -699,7 +699,7 @@ select f1 from t1 order by f1;
f1
insert-yes
drop trigger priv_db.trg1_9;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -708,7 +708,7 @@ drop trigger priv_db.trg1_9;
revoke TRIGGER on priv_db.* from test_yesprivs@localhost;
use priv_db;
insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert-yes
@@ -728,7 +728,7 @@ test_yesprivs@localhost
use no_priv_db;
create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -843,7 +843,7 @@ set new.f1 = 'trig 2_1-yes';
use priv2_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig1_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv2_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -918,7 +918,7 @@ test_yesprivs@localhost
use priv1_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t1`
connection default;
select current_user;
current_user
@@ -945,7 +945,7 @@ create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes';
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
connection no_privs;
select current_user;
current_user
@@ -986,7 +986,7 @@ current_user
test_yesprivs@localhost
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
use priv1_db;
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-yes';
@@ -1110,7 +1110,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1122,7 +1122,7 @@ current_user
test_useprivs@localhost
prepare ins1 from 'insert into t1 (f1) values (''insert5-no'')';
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1173,7 +1173,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1185,7 +1185,7 @@ select current_user;
current_user
test_useprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1240,7 +1240,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1255,7 +1255,7 @@ select current_user;
current_user
test_useprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1323,11 +1323,11 @@ current_user
test_yesprivs@localhost
use priv_db;
insert into t1 (f1) values ('insert-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
drop trigger trg1_0;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -1638,12 +1638,12 @@ update t1 set f1 = 'update6_no'
where f1 like '%insert%';
update t2 set f1 = 'update6_no'
where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
update t1 set f1 = 'update7_no'
where f1 like '%insert%';
update t2 set f1 = 'update7_no'
where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1669,7 +1669,7 @@ test_noprivs@localhost
update t1 set f1 = 'update8-no',
f2 = 'update8-no'
where f2 like '%yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select * from t1 order by f1,f2,f3;
f1 f2 f3
trig 1_1-yes NULL NULL
@@ -1743,7 +1743,7 @@ current_user
test_noprivs@localhost
use priv_db;
update t1 set f3= f3+1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f3 from t1 order by f3;
f3
NULL
diff --git a/mysql-test/suite/funcs_1/r/is_columns.result b/mysql-test/suite/funcs_1/r/is_columns.result
index e8ca653d11d..7cd949c36aa 100644
--- a/mysql-test/suite/funcs_1/r/is_columns.result
+++ b/mysql-test/suite/funcs_1/r/is_columns.result
@@ -170,7 +170,7 @@ Field Type Null Key Default Extra
f1 char(10) YES MUL NULL
f2 text YES NULL
SHOW COLUMNS FROM db_datadict.t2;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `db_datadict`.`t2`
SHOW COLUMNS FROM db_datadict.v1;
Field Type Null Key Default Extra
f2 int(1) NO 0
@@ -182,13 +182,13 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAUL
def db_datadict t2 f1 1 NULL NO char 10 10 NULL NULL NULL latin1 latin1_swedish_ci char(10) PRI insert NEVER NULL
def db_datadict t2 f2 2 NULL YES text 65535 65535 NULL NULL NULL latin1 latin1_swedish_ci text insert NEVER NULL
SHOW COLUMNS FROM db_datadict.t1;
-ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table `db_datadict`.`t1`
SHOW COLUMNS FROM db_datadict.t2;
Field Type Null Key Default Extra
f1 char(10) NO PRI NULL
f2 text YES NULL
SHOW COLUMNS FROM db_datadict.v1;
-ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table `db_datadict`.`v1`
connection default;
disconnect testuser1;
disconnect testuser2;
diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result
index ff1d7bbdd94..a41576629b6 100644
--- a/mysql-test/suite/funcs_1/r/is_table_constraints.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result
@@ -151,7 +151,7 @@ t1 0 my_idx1 1 f6 ### ### ### ### ### ### ### NO
t1 0 my_idx1 2 f1 ### ### ### ### ### ### ### NO
t1 0 my_idx2 1 f3 ### ### ### ### ### ### ### NO
SHOW INDEXES FROM db_datadict.t2;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `db_datadict`.`t2`
connection default;
disconnect testuser1;
DROP USER 'testuser1'@'localhost';
diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result
index 0411fc83eb9..6a1aed781da 100644
--- a/mysql-test/suite/funcs_1/r/is_triggers.result
+++ b/mysql-test/suite/funcs_1/r/is_triggers.result
@@ -172,9 +172,9 @@ Grants for testuser4@localhost
GRANT TRIGGER ON *.* TO `testuser4`@`localhost`
# TRIGGER Privilege + no SELECT Privilege on t1 --> result for query
SELECT * FROM db_datadict.t1;
-ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table `db_datadict`.`t1`
DESC db_datadict.t1;
-ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table `db_datadict`.`t1`
SELECT * FROM information_schema.triggers
WHERE trigger_name = 'trg1';
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
diff --git a/mysql-test/suite/funcs_1/r/is_user_privileges.result b/mysql-test/suite/funcs_1/r/is_user_privileges.result
index a42c579ec1e..4228c744e46 100644
--- a/mysql-test/suite/funcs_1/r/is_user_privileges.result
+++ b/mysql-test/suite/funcs_1/r/is_user_privileges.result
@@ -367,7 +367,7 @@ PRIVILEGE_TYPE UPDATE
IS_GRANTABLE NO
SELECT host,user,json_detailed(priv) FROM mysql.global_priv
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table `mysql`.`global_priv`
SHOW GRANTS;
Grants for testuser2@localhost
GRANT INSERT, UPDATE ON *.* TO `testuser2`@`localhost`
@@ -381,7 +381,7 @@ PRIVILEGE_TYPE USAGE
IS_GRANTABLE NO
SELECT host,user,json_detailed(priv) FROM mysql.global_priv
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser3'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser3'@'localhost' for table `mysql`.`global_priv`
SHOW GRANTS;
Grants for testuser3@localhost
GRANT USAGE ON *.* TO `testuser3`@`localhost`
@@ -447,12 +447,12 @@ PRIVILEGE_TYPE USAGE
IS_GRANTABLE NO
SELECT host,user,json_detailed(priv) FROM mysql.global_priv
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`global_priv`
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO `testuser1`@`localhost`
CREATE TABLE db_datadict.tb_55 ( c1 TEXT );
-ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table 'tb_55'
+ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table `db_datadict`.`tb_55`
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
ORDER BY grantee, table_catalog, privilege_type;
@@ -462,12 +462,12 @@ PRIVILEGE_TYPE USAGE
IS_GRANTABLE NO
SELECT host,user,json_detailed(priv) FROM mysql.global_priv
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`global_priv`
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO `testuser1`@`localhost`
CREATE TABLE db_datadict.tb_66 ( c1 TEXT );
-ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table 'tb_66'
+ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table `db_datadict`.`tb_66`
# Add ALL on db_datadict.* (and select on mysql.global_priv) to testuser1;
connection default;
@@ -564,7 +564,7 @@ GRANT USAGE ON *.* TO `testuser1`@`localhost`
GRANT ALL PRIVILEGES ON `db_datadict`.* TO `testuser1`@`localhost` WITH GRANT OPTION
GRANT SELECT ON `mysql`.`global_priv` TO `testuser1`@`localhost`
CREATE TABLE db_datadict.tb_56 ( c1 TEXT );
-ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table 'tb_56'
+ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table `db_datadict`.`tb_56`
USE db_datadict;
SELECT * FROM information_schema.user_privileges
WHERE grantee LIKE '''testuser%'''
@@ -671,7 +671,7 @@ PRIVILEGE_TYPE USAGE
IS_GRANTABLE NO
SELECT host,user,json_detailed(priv) FROM mysql.global_priv
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`global_priv`
SHOW GRANTS;
Grants for testuser1@localhost
GRANT USAGE ON *.* TO `testuser1`@`localhost`
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_06.result b/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
index ce1ee82e89a..694cfc0158f 100644
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
@@ -221,31 +221,31 @@ connect user5_2, localhost, user_2, , db_storedproc_1;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
connection default;
root@localhost db_storedproc_1
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
grant insert on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
connection user5_2;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
connection default;
root@localhost db_storedproc_1
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
grant SELECT on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
connection user5_2;
@@ -276,9 +276,9 @@ inserted outside of SP NULL
inserted from sp5_ins 2000-10-00
inserted from sp5_s_i 2000-10-00
inserted from sp5_ins 2000-10-00
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
c1 c2 c3
inserted outside of SP NULL
@@ -294,11 +294,11 @@ connection user5_2;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
disconnect user5_2;
connection default;
@@ -348,9 +348,9 @@ user_2@localhost db_storedproc_1
CALL sp3166_s_i();
c1
inserted outside SP
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_ins();
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_sel();
c1
inserted outside SP
@@ -390,10 +390,10 @@ connect user6_4, localhost, user_2, , db_storedproc_1;
user_2@localhost db_storedproc_1
CALL sp3166_s_i();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_ins();
CALL sp3166_sel();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
disconnect user6_4;
connection default;
CALL sp3166_s_i();
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03.result b/mysql-test/suite/funcs_1/r/memory_trig_03.result
index 68969afc97f..b76e7d01f59 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03.result
@@ -99,7 +99,7 @@ test_noprivs@localhost
use priv_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.2-no');
@@ -135,7 +135,7 @@ Testcase 3.5.3.6:
connection no_privs;
use priv_db;
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.6-yes');
@@ -688,7 +688,7 @@ insert into t2 values (new.f1);
connection default;
use priv_db;
insert into t1 (f1) values (4);
-ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
grant INSERT on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (4);
@@ -706,7 +706,7 @@ update t2 set f2=new.f1-1;
connection default;
use priv_db;
insert into t1 (f1) values (2);
-ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (2);
@@ -725,7 +725,7 @@ select f2 into @aaa from t2 where f2=new.f1;
connection default;
use priv_db;
insert into t1 (f1) values (1);
-ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
grant SELECT on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (1);
@@ -748,7 +748,7 @@ delete from t2;
connection default;
use priv_db;
insert into t1 (f1) values (1);
-ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
grant DELETE on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (1);
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03e.result b/mysql-test/suite/funcs_1/r/memory_trig_03e.result
index d100bdfc824..c40cbd0ab72 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_03e.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03e.result
@@ -32,7 +32,7 @@ no trigger privilege on db level for create:
use priv_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connect no_privs,localhost,test_noprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK;
use priv_db;
insert into t1 (f1) values ('insert-yes');
@@ -108,7 +108,7 @@ current_user
test_yesprivs@localhost
use priv_db;
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -118,7 +118,7 @@ use priv_db;
no trigger privilege at activation time:
----------------------------------------
insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert-yes
@@ -156,7 +156,7 @@ Grants for test_yesprivs@localhost
GRANT USAGE ON *.* TO `test_yesprivs`@`localhost` IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
takes effect after use priv_db:
-------------------------------
@@ -196,14 +196,14 @@ test_yesprivs@localhost
use no_priv_db;
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use priv_db;
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-yes';
use no_priv_db;
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use priv_db;
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes';
@@ -303,7 +303,7 @@ Tables_in_priv_db
t1
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -377,7 +377,7 @@ select current_user;
current_user
test_yesprivs@localhost
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
no trigger privilege at activation time:
----------------------------------------
@@ -386,7 +386,7 @@ select current_user;
current_user
test_noprivs@localhost
insert into t1 (f1) values ('insert5-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert1-yes
@@ -477,12 +477,12 @@ current_user
test_yesprivs@localhost
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-yes';
create trigger trg2_2 before UPDATE on t2 for each row
set new.f1 = 'trig 2_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes';
show triggers;
@@ -616,7 +616,7 @@ Trigger Event Table Statement Timing Created sql_mode Definer character_set_clie
select * from information_schema.triggers;
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
drop trigger trg1_1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -636,7 +636,7 @@ current_user
test_yesprivs@localhost
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -672,11 +672,11 @@ set new.f1 = 'trig 1_2-yes';
create trigger no_priv_db.trg1_9 before insert on no_priv_db.t1
for each row
set new.f1 = 'trig 1_9-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use no_priv_db;
create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
create trigger priv_db.trg1_9 before UPDATE on priv_db.t1
for each row
set new.f1 = 'trig 1_9-yes';
@@ -700,7 +700,7 @@ select f1 from t1 order by f1;
f1
insert-yes
drop trigger priv_db.trg1_9;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -709,7 +709,7 @@ drop trigger priv_db.trg1_9;
revoke TRIGGER on priv_db.* from test_yesprivs@localhost;
use priv_db;
insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert-yes
@@ -729,7 +729,7 @@ test_yesprivs@localhost
use no_priv_db;
create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -844,7 +844,7 @@ set new.f1 = 'trig 2_1-yes';
use priv2_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig1_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv2_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -919,7 +919,7 @@ test_yesprivs@localhost
use priv1_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t1`
connection default;
select current_user;
current_user
@@ -946,7 +946,7 @@ create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes';
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
connection no_privs;
select current_user;
current_user
@@ -987,7 +987,7 @@ current_user
test_yesprivs@localhost
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
use priv1_db;
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-yes';
@@ -1111,7 +1111,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1123,7 +1123,7 @@ current_user
test_useprivs@localhost
prepare ins1 from 'insert into t1 (f1) values (''insert5-no'')';
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1174,7 +1174,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1186,7 +1186,7 @@ select current_user;
current_user
test_useprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1241,7 +1241,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1256,7 +1256,7 @@ select current_user;
current_user
test_useprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1324,11 +1324,11 @@ current_user
test_yesprivs@localhost
use priv_db;
insert into t1 (f1) values ('insert-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
drop trigger trg1_0;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -1577,12 +1577,12 @@ update t1 set f1 = 'update6_no'
where f1 like '%insert%';
update t2 set f1 = 'update6_no'
where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
update t1 set f1 = 'update7_no'
where f1 like '%insert%';
update t2 set f1 = 'update7_no'
where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1608,7 +1608,7 @@ test_noprivs@localhost
update t1 set f1 = 'update8-no',
f2 = 'update8-no'
where f2 like '%yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select * from t1 order by f1,f2,f3;
f1 f2 f3
trig 1_1-yes NULL NULL
@@ -1682,7 +1682,7 @@ current_user
test_noprivs@localhost
use priv_db;
update t1 set f3= f3+1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f3 from t1 order by f3;
f3
NULL
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
index ce1ee82e89a..694cfc0158f 100644
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
@@ -221,31 +221,31 @@ connect user5_2, localhost, user_2, , db_storedproc_1;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
connection default;
root@localhost db_storedproc_1
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
grant insert on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
connection user5_2;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
connection default;
root@localhost db_storedproc_1
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
grant SELECT on db_storedproc_1.* to 'user_1'@'localhost';
flush privileges;
connection user5_2;
@@ -276,9 +276,9 @@ inserted outside of SP NULL
inserted from sp5_ins 2000-10-00
inserted from sp5_s_i 2000-10-00
inserted from sp5_ins 2000-10-00
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
c1 c2 c3
inserted outside of SP NULL
@@ -294,11 +294,11 @@ connection user5_2;
user_2@localhost db_storedproc_1
CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
disconnect user5_2;
connection default;
@@ -348,9 +348,9 @@ user_2@localhost db_storedproc_1
CALL sp3166_s_i();
c1
inserted outside SP
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_ins();
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_sel();
c1
inserted outside SP
@@ -390,10 +390,10 @@ connect user6_4, localhost, user_2, , db_storedproc_1;
user_2@localhost db_storedproc_1
CALL sp3166_s_i();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
CALL sp3166_ins();
CALL sp3166_sel();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
disconnect user6_4;
connection default;
CALL sp3166_s_i();
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03.result b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
index 68969afc97f..b76e7d01f59 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
@@ -99,7 +99,7 @@ test_noprivs@localhost
use priv_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.2-no');
@@ -135,7 +135,7 @@ Testcase 3.5.3.6:
connection no_privs;
use priv_db;
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
use priv_db;
insert into t1 (f1) values ('insert 3.5.3.6-yes');
@@ -688,7 +688,7 @@ insert into t2 values (new.f1);
connection default;
use priv_db;
insert into t1 (f1) values (4);
-ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
grant INSERT on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (4);
@@ -706,7 +706,7 @@ update t2 set f2=new.f1-1;
connection default;
use priv_db;
insert into t1 (f1) values (2);
-ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (2);
@@ -725,7 +725,7 @@ select f2 into @aaa from t2 where f2=new.f1;
connection default;
use priv_db;
insert into t1 (f1) values (1);
-ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
grant SELECT on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (1);
@@ -748,7 +748,7 @@ delete from t2;
connection default;
use priv_db;
insert into t1 (f1) values (1);
-ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
grant DELETE on priv_db.t2 to test_yesprivs@localhost;
insert into t1 (f1) values (1);
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
index 22db7ad337e..71cf064d201 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
@@ -32,7 +32,7 @@ no trigger privilege on db level for create:
use priv_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connect no_privs,localhost,test_noprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK;
use priv_db;
insert into t1 (f1) values ('insert-yes');
@@ -108,7 +108,7 @@ current_user
test_yesprivs@localhost
use priv_db;
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -118,7 +118,7 @@ use priv_db;
no trigger privilege at activation time:
----------------------------------------
insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert-yes
@@ -156,7 +156,7 @@ Grants for test_yesprivs@localhost
GRANT USAGE ON *.* TO `test_yesprivs`@`localhost` IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
takes effect after use priv_db:
-------------------------------
@@ -196,14 +196,14 @@ test_yesprivs@localhost
use no_priv_db;
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use priv_db;
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-yes';
use no_priv_db;
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use priv_db;
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes';
@@ -303,7 +303,7 @@ Tables_in_priv_db
t1
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -377,7 +377,7 @@ select current_user;
current_user
test_yesprivs@localhost
drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
no trigger privilege at activation time:
----------------------------------------
@@ -386,7 +386,7 @@ select current_user;
current_user
test_noprivs@localhost
insert into t1 (f1) values ('insert5-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert1-yes
@@ -477,12 +477,12 @@ current_user
test_yesprivs@localhost
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
create trigger trg1_3 before INSERT on t1 for each row
set new.f1 = 'trig 1_3-yes';
create trigger trg2_2 before UPDATE on t2 for each row
set new.f1 = 'trig 2_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes';
show triggers;
@@ -616,7 +616,7 @@ Trigger Event Table Statement Timing Created sql_mode Definer character_set_clie
select * from information_schema.triggers;
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
drop trigger trg1_1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -636,7 +636,7 @@ current_user
test_yesprivs@localhost
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -672,11 +672,11 @@ set new.f1 = 'trig 1_2-yes';
create trigger no_priv_db.trg1_9 before insert on no_priv_db.t1
for each row
set new.f1 = 'trig 1_9-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
use no_priv_db;
create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
create trigger priv_db.trg1_9 before UPDATE on priv_db.t1
for each row
set new.f1 = 'trig 1_9-yes';
@@ -700,7 +700,7 @@ select f1 from t1 order by f1;
f1
insert-yes
drop trigger priv_db.trg1_9;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -709,7 +709,7 @@ drop trigger priv_db.trg1_9;
revoke TRIGGER on priv_db.* from test_yesprivs@localhost;
use priv_db;
insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
insert-yes
@@ -729,7 +729,7 @@ test_yesprivs@localhost
use no_priv_db;
create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -844,7 +844,7 @@ set new.f1 = 'trig 2_1-yes';
use priv2_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig1_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv2_db`.`t1`
connection no_privs;
select current_user;
current_user
@@ -919,7 +919,7 @@ test_yesprivs@localhost
use priv1_db;
create trigger trg1_1 before INSERT on t1 for each row
set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t1`
connection default;
select current_user;
current_user
@@ -946,7 +946,7 @@ create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes';
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
connection no_privs;
select current_user;
current_user
@@ -987,7 +987,7 @@ current_user
test_yesprivs@localhost
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
use priv1_db;
create trigger trg2_1 before INSERT on t2 for each row
set new.f1 = 'trig 2_1-yes';
@@ -1111,7 +1111,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1123,7 +1123,7 @@ current_user
test_useprivs@localhost
prepare ins1 from 'insert into t1 (f1) values (''insert5-no'')';
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1174,7 +1174,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1186,7 +1186,7 @@ select current_user;
current_user
test_useprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1241,7 +1241,7 @@ select current_user;
current_user
test_yesprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1256,7 +1256,7 @@ select current_user;
current_user
test_useprivs@localhost
execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1324,11 +1324,11 @@ current_user
test_yesprivs@localhost
use priv_db;
insert into t1 (f1) values ('insert-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f1 from t1 order by f1;
f1
drop trigger trg1_0;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
connection default;
select current_user;
current_user
@@ -1577,12 +1577,12 @@ update t1 set f1 = 'update6_no'
where f1 like '%insert%';
update t2 set f1 = 'update6_no'
where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
update t1 set f1 = 'update7_no'
where f1 like '%insert%';
update t2 set f1 = 'update7_no'
where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
select f1 from t1 order by f1;
f1
trig 1_1-yes
@@ -1608,7 +1608,7 @@ test_noprivs@localhost
update t1 set f1 = 'update8-no',
f2 = 'update8-no'
where f2 like '%yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select * from t1 order by f1,f2,f3;
f1 f2 f3
trig 1_1-yes NULL NULL
@@ -1682,7 +1682,7 @@ current_user
test_noprivs@localhost
use priv_db;
update t1 set f3= f3+1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
select f3 from t1 order by f3;
f3
NULL
diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index 082ff5c99c6..efeb63ae616 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -1849,7 +1849,7 @@ connection u_1;
user_1@localhost db_storedproc
USE db_storedproc;
CALL sp11();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `mysql`.`t1`
commit work;
disconnect u_1;
connection default;
diff --git a/mysql-test/suite/galera/r/galera_roles.result b/mysql-test/suite/galera/r/galera_roles.result
index 35487185db2..19bc9be62b0 100644
--- a/mysql-test/suite/galera/r/galera_roles.result
+++ b/mysql-test/suite/galera/r/galera_roles.result
@@ -33,7 +33,7 @@ GRANT USAGE ON *.* TO `foo`@`localhost`
FLUSH TABLES;
ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
SELECT * FROM mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
SHOW TABLES FROM test1;
ERROR 42000: Access denied for user 'foo'@'localhost' to database 'test1'
SET ROLE role1;
@@ -51,7 +51,7 @@ a b
1 2
3 4
SELECT * FROM test1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t2`
SELECT a FROM test1.t2;
a
5
@@ -69,7 +69,7 @@ GRANT USAGE ON *.* TO `foo`@`localhost`
FLUSH TABLES;
ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
SELECT * FROM mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
SHOW TABLES FROM test1;
ERROR 42000: Access denied for user 'foo'@'localhost' to database 'test1'
SET ROLE role1;
@@ -87,7 +87,7 @@ a b
1 2
3 4
SELECT * FROM test1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t2`
SELECT a FROM test1.t2;
a
5
@@ -124,11 +124,11 @@ DROP ROLE role1;
connection foo_node_1;
FLUSH TABLES;
SELECT * FROM mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
SELECT * FROM test1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t1`
SELECT a FROM test1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t2`
SHOW GRANTS;
Grants for foo@localhost
GRANT USAGE ON *.* TO `foo`@`localhost`
@@ -146,11 +146,11 @@ role1
connection foo_node_2;
FLUSH TABLES;
SELECT * FROM mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
SELECT * FROM test1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t1`
SELECT a FROM test1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t2`
SHOW GRANTS;
Grants for foo@localhost
GRANT USAGE ON *.* TO `foo`@`localhost`
diff --git a/mysql-test/suite/galera/r/rename.result b/mysql-test/suite/galera/r/rename.result
index 3ad715fa38c..c4a70a61159 100644
--- a/mysql-test/suite/galera/r/rename.result
+++ b/mysql-test/suite/galera/r/rename.result
@@ -23,7 +23,7 @@ i
1
# Following RENAME should not replicate to other node.
RENAME TABLE t1 TO t2;
-ERROR 42000: DROP, ALTER command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: DROP, ALTER command denied to user 'foo'@'localhost' for table `test`.`t1`
# On node 2
connection node_2;
USE test;
diff --git a/mysql-test/suite/gcol/t/virtual_index_drop.test b/mysql-test/suite/gcol/t/virtual_index_drop.test
index e1ec43f75e5..0fe4986f2c1 100644
--- a/mysql-test/suite/gcol/t/virtual_index_drop.test
+++ b/mysql-test/suite/gcol/t/virtual_index_drop.test
@@ -1,5 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
+--source include/have_debug_sync.inc
--echo #
--echo # MDEV-24971 InnoDB access freed virtual column
diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result
index 46e8488b9e4..b4e347b2600 100644
--- a/mysql-test/suite/innodb/r/innodb-table-online.result
+++ b/mysql-test/suite/innodb/r/innodb-table-online.result
@@ -433,13 +433,29 @@ INSERT INTO t1 VALUES(1, repeat('a', 10000));
ROLLBACK;
SET DEBUG_SYNC = 'now SIGNAL ins';
connection con1;
-disconnect con1;
connection default;
SELECT * FROM t1;
a b
0 NULL
DROP TABLE t1;
SET DEBUG_SYNC = 'RESET';
+#
+# MDEV-29600 Memory leak in row_log_table_apply_update()
+#
+CREATE TABLE t1 (pk INT PRIMARY KEY, f TEXT) ENGINE=InnoDB;
+INSERT INTO t1 SET pk=1;
+connection con1;
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL created WAIT_FOR updated';
+ALTER TABLE t1 FORCE;
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR created';
+UPDATE t1 SET f = REPEAT('a', 20000);
+SET DEBUG_SYNC = 'now SIGNAL updated';
+connection con1;
+disconnect con1;
+connection default;
+DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
SET GLOBAL innodb_file_per_table = @global_innodb_file_per_table_orig;
SET GLOBAL innodb_monitor_enable = default;
SET GLOBAL innodb_monitor_disable = default;
diff --git a/mysql-test/suite/innodb/r/log_file_name_debug.result b/mysql-test/suite/innodb/r/log_file_name_debug.result
index cb2ee68fc98..e5c1def8f8e 100644
--- a/mysql-test/suite/innodb/r/log_file_name_debug.result
+++ b/mysql-test/suite/innodb/r/log_file_name_debug.result
@@ -9,10 +9,9 @@ CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
SELECT * FROM t1;
ERROR 42000: Unknown storage engine 'InnoDB'
FOUND 1 /InnoDB: Tablespace 4294967280 was not found at .*, but there were no modifications either/ in mysqld.1.err
-# restart: --debug=d,innodb_log_abort_3,ib_log --innodb-log-file-size=4194304
+# restart: --debug=d,innodb_log_abort_3 --innodb-log-file-size=4194304
SELECT * FROM t1;
ERROR 42000: Unknown storage engine 'InnoDB'
-FOUND 1 /ib_log: FILE_CHECKPOINT.* written/ in mysqld.1.err
# restart
# restart
DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/alter_dml_apply.test b/mysql-test/suite/innodb/t/alter_dml_apply.test
index 4d6fd418691..01bfe458f1a 100644
--- a/mysql-test/suite/innodb/t/alter_dml_apply.test
+++ b/mysql-test/suite/innodb/t/alter_dml_apply.test
@@ -1,5 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
+--source include/have_debug_sync.inc
--source include/have_sequence.inc
CREATE TABLE t1(f1 INT NOT NULL, f2 INT NOT NULL,
diff --git a/mysql-test/suite/innodb/t/alter_mdl_timeout.test b/mysql-test/suite/innodb/t/alter_mdl_timeout.test
index ff77921b2d2..6d916a3f23b 100644
--- a/mysql-test/suite/innodb/t/alter_mdl_timeout.test
+++ b/mysql-test/suite/innodb/t/alter_mdl_timeout.test
@@ -1,5 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
+--source include/have_debug_sync.inc
create table t1(f1 char(10), f2 char(10) not null, f3 int not null,
f4 int not null, primary key(f3))engine=innodb;
diff --git a/mysql-test/suite/innodb/t/autoinc_debug.test b/mysql-test/suite/innodb/t/autoinc_debug.test
index 485439f9250..7722b848c74 100644
--- a/mysql-test/suite/innodb/t/autoinc_debug.test
+++ b/mysql-test/suite/innodb/t/autoinc_debug.test
@@ -1,5 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
+--source include/have_debug_sync.inc
--source include/not_embedded.inc
# Two parallel connection with autoinc column after restart.
diff --git a/mysql-test/suite/innodb/t/blob-crash.test b/mysql-test/suite/innodb/t/blob-crash.test
index 5d529059742..77787a34745 100644
--- a/mysql-test/suite/innodb/t/blob-crash.test
+++ b/mysql-test/suite/innodb/t/blob-crash.test
@@ -1,7 +1,8 @@
---source include/maybe_debug.inc
--source include/innodb_page_size_small.inc
--source include/no_valgrind_without_big.inc
+let $have_debug_sync=`select count(*) = 1 from information_schema.session_variables where variable_name = 'debug_sync' and variable_value like 'on %'`;
+
--echo #
--echo # Bug #16963396 INNODB: USE OF LARGE EXTERNALLY-STORED FIELDS MAKES
--echo # CRASH RECOVERY LOSE DATA
@@ -95,7 +96,7 @@ select f1, right(f2, 20), right(f3, 20) from t2;
update t2 set f3 = '&';
select f1, right(f2, 20), right(f3, 20) from t2;
-if ($have_debug) {
+if ($have_debug_sync) {
--disable_query_log
set DEBUG_SYNC='blob_rollback_middle SIGNAL stuck WAIT_FOR ever';
send ROLLBACK;
@@ -103,7 +104,7 @@ send ROLLBACK;
}
connection default;
-if ($have_debug) {
+if ($have_debug_sync) {
--disable_query_log
SET DEBUG_SYNC = 'now WAIT_FOR stuck';
--enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test
index 03f4b58ab73..170ba5072f5 100644
--- a/mysql-test/suite/innodb/t/innodb-table-online.test
+++ b/mysql-test/suite/innodb/t/innodb-table-online.test
@@ -396,13 +396,36 @@ SET DEBUG_SYNC = 'now SIGNAL ins';
connection con1;
reap;
-disconnect con1;
connection default;
SELECT * FROM t1;
DROP TABLE t1;
SET DEBUG_SYNC = 'RESET';
+--echo #
+--echo # MDEV-29600 Memory leak in row_log_table_apply_update()
+--echo #
+
+CREATE TABLE t1 (pk INT PRIMARY KEY, f TEXT) ENGINE=InnoDB;
+INSERT INTO t1 SET pk=1;
+
+connection con1;
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL created WAIT_FOR updated';
+send ALTER TABLE t1 FORCE;
+
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR created';
+UPDATE t1 SET f = REPEAT('a', 20000);
+SET DEBUG_SYNC = 'now SIGNAL updated';
+
+connection con1;
+reap;
+disconnect con1;
+
+connection default;
+DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
+
# Check that all connections opened by test cases in this file are really
# gone so execution of other tests won't be affected by their presence.
--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/log_file_name_debug.test b/mysql-test/suite/innodb/t/log_file_name_debug.test
index 239606b121b..9e3a7f8a83b 100644
--- a/mysql-test/suite/innodb/t/log_file_name_debug.test
+++ b/mysql-test/suite/innodb/t/log_file_name_debug.test
@@ -36,12 +36,10 @@ SELECT * FROM t1;
--let SEARCH_PATTERN = InnoDB: Tablespace 4294967280 was not found at .*, but there were no modifications either
--source include/search_pattern_in_file.inc
---let $restart_parameters= --debug=d,innodb_log_abort_3,ib_log $resize
+--let $restart_parameters= --debug=d,innodb_log_abort_3 $resize
--source include/restart_mysqld.inc
--error ER_UNKNOWN_STORAGE_ENGINE
SELECT * FROM t1;
---let SEARCH_PATTERN= ib_log: FILE_CHECKPOINT.* written
---source include/search_pattern_in_file.inc
--let $restart_parameters=
--source include/restart_mysqld.inc
diff --git a/mysql-test/suite/innodb/t/online_table_rebuild.test b/mysql-test/suite/innodb/t/online_table_rebuild.test
index 94bac2f949c..1d34738703c 100644
--- a/mysql-test/suite/innodb/t/online_table_rebuild.test
+++ b/mysql-test/suite/innodb/t/online_table_rebuild.test
@@ -1,5 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
+--source include/have_debug_sync.inc
--source include/have_sequence.inc
CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(200), f3 CHAR(200))ENGINE=InnoDB;
diff --git a/mysql-test/suite/mariabackup/alter_copy_excluded.test b/mysql-test/suite/mariabackup/alter_copy_excluded.test
index 195aa09b5df..599fb46bdd5 100644
--- a/mysql-test/suite/mariabackup/alter_copy_excluded.test
+++ b/mysql-test/suite/mariabackup/alter_copy_excluded.test
@@ -1,5 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
+--source include/have_debug_sync.inc
# The test demonstrates that intermediate tables (ALTER TABLE...ALGORITHM=COPY)
# will not be included in a backup.
diff --git a/mysql-test/suite/mariabackup/alter_copy_race.test b/mysql-test/suite/mariabackup/alter_copy_race.test
index 1ee69168115..553643bf667 100644
--- a/mysql-test/suite/mariabackup/alter_copy_race.test
+++ b/mysql-test/suite/mariabackup/alter_copy_race.test
@@ -1,5 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
+--source include/have_debug_sync.inc
# The test demonstrates that intermediate tables (ALTER TABLE...ALGORITHM=COPY)
# are not always properly locked, e.g., can be dropped after
diff --git a/mysql-test/suite/mariabackup/big_innodb_log.test b/mysql-test/suite/mariabackup/big_innodb_log.test
index 247e7179c42..23ac59c13eb 100644
--- a/mysql-test/suite/mariabackup/big_innodb_log.test
+++ b/mysql-test/suite/mariabackup/big_innodb_log.test
@@ -7,7 +7,7 @@
--source include/have_debug.inc
--let MYSQLD_DATADIR= `select @@datadir`
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --debug-dbug=+d,innodb_small_log_block_no_limit;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --tmpdir=$MYSQL_TMP_DIR --debug-dbug=+d,innodb_small_log_block_no_limit;
--source include/kill_mysqld.inc
--rmdir $MYSQLD_DATADIR
diff --git a/mysql-test/suite/parts/r/alter_table.result b/mysql-test/suite/parts/r/alter_table.result
index 53eb482d85d..b887cea36f0 100644
--- a/mysql-test/suite/parts/r/alter_table.result
+++ b/mysql-test/suite/parts/r/alter_table.result
@@ -296,7 +296,7 @@ Grants for alan@%
GRANT USAGE ON *.* TO `alan`@`%`
GRANT INSERT, CREATE, DROP ON `test`.* TO `alan`@`%`
alter table t1 convert partition p1 to table tp1;
-ERROR 42000: ALTER command denied to user 'alan'@'localhost' for table 't1'
+ERROR 42000: ALTER command denied to user 'alan'@'localhost' for table `test`.`t1`
connection default;
revoke all on test.* from alan;
grant create, insert, alter on test.* to alan;
@@ -307,7 +307,7 @@ Grants for alan@%
GRANT USAGE ON *.* TO `alan`@`%`
GRANT INSERT, CREATE, ALTER ON `test`.* TO `alan`@`%`
alter table t1 convert partition p1 to table tp1;
-ERROR 42000: DROP command denied to user 'alan'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'alan'@'localhost' for table `test`.`t1`
connection default;
revoke all on test.* from alan;
grant create, drop, alter on test.* to alan;
@@ -318,7 +318,7 @@ Grants for alan@%
GRANT USAGE ON *.* TO `alan`@`%`
GRANT CREATE, DROP, ALTER ON `test`.* TO `alan`@`%`
alter table t1 convert partition p1 to table tp1;
-ERROR 42000: INSERT command denied to user 'alan'@'localhost' for table 'tp1'
+ERROR 42000: INSERT command denied to user 'alan'@'localhost' for table `test`.`tp1`
connection default;
revoke all on test.* from alan;
grant insert, drop, alter on test.* to alan;
@@ -329,7 +329,7 @@ Grants for alan@%
GRANT USAGE ON *.* TO `alan`@`%`
GRANT INSERT, DROP, ALTER ON `test`.* TO `alan`@`%`
alter table t1 convert partition p1 to table tp1;
-ERROR 42000: CREATE command denied to user 'alan'@'localhost' for table 'tp1'
+ERROR 42000: CREATE command denied to user 'alan'@'localhost' for table `test`.`tp1`
connection default;
grant create, insert, drop, alter on test.* to alan;
connection alan;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result
index 2e31fc57dd4..aa35364b811 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result
@@ -13,7 +13,7 @@ Grants for test1@localhost
GRANT USAGE ON *.* TO `test1`@`localhost`
GRANT SELECT, INSERT, CREATE, DROP ON `test`.* TO `test1`@`localhost`
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table `test`.`tp`
disconnect test1;
connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
USE test;
@@ -83,7 +83,7 @@ Grants for test2@localhost
GRANT USAGE ON *.* TO `test2`@`localhost`
GRANT SELECT, INSERT, UPDATE, CREATE, DROP ON `test`.* TO `test2`@`localhost`
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp`
SELECT * FROM tp WHERE a BETWEEN 0 AND 10;
a b
2 Two
@@ -91,11 +91,11 @@ a b
6 Six
8 Eight
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp`
ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp`
ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp`
connection default;
disconnect test2;
DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
index 2e31fc57dd4..aa35364b811 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
@@ -13,7 +13,7 @@ Grants for test1@localhost
GRANT USAGE ON *.* TO `test1`@`localhost`
GRANT SELECT, INSERT, CREATE, DROP ON `test`.* TO `test1`@`localhost`
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table `test`.`tp`
disconnect test1;
connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
USE test;
@@ -83,7 +83,7 @@ Grants for test2@localhost
GRANT USAGE ON *.* TO `test2`@`localhost`
GRANT SELECT, INSERT, UPDATE, CREATE, DROP ON `test`.* TO `test2`@`localhost`
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp`
SELECT * FROM tp WHERE a BETWEEN 0 AND 10;
a b
2 Two
@@ -91,11 +91,11 @@ a b
6 Six
8 Eight
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp`
ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp`
ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp`
connection default;
disconnect test2;
DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_6.result b/mysql-test/suite/parts/r/partition_exch_qa_6.result
index 880886b4fac..7917765c9dd 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_6.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_6.result
@@ -117,7 +117,7 @@ Grants for test2@localhost
GRANT USAGE ON *.* TO `test2`@`localhost`
GRANT SELECT, UPDATE, CREATE, DROP, ALTER ON `test`.* TO `test2`@`localhost`
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `test`.`tp`
disconnect test2;
connection default;
GRANT INSERT ON test.* TO test2@localhost;
@@ -129,7 +129,7 @@ Grants for test2@localhost
GRANT USAGE ON *.* TO `test2`@`localhost`
GRANT SELECT, INSERT, UPDATE, DROP, ALTER ON `test`.* TO `test2`@`localhost`
ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: CREATE command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: CREATE command denied to user 'test2'@'localhost' for table `test`.`tsp`
disconnect test2;
connection default;
GRANT CREATE ON test.* TO test2@localhost;
@@ -140,7 +140,7 @@ Grants for test2@localhost
GRANT USAGE ON *.* TO `test2`@`localhost`
GRANT SELECT, INSERT, UPDATE, CREATE, ALTER ON `test`.* TO `test2`@`localhost`
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: DROP command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: DROP command denied to user 'test2'@'localhost' for table `test`.`tp`
disconnect test2;
connection default;
DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
index 2fd45be9261..842c93ac403 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
@@ -62,9 +62,9 @@ connection default;
REVOKE INSERT ON testdb.* FROM test2@localhost;
connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 't_10'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`t_10`
ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`tp`
disconnect test2;
connection default;
DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result
index 2fd45be9261..842c93ac403 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result
@@ -62,9 +62,9 @@ connection default;
REVOKE INSERT ON testdb.* FROM test2@localhost;
connect test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 't_10'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`t_10`
ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`tp`
disconnect test2;
connection default;
DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/perfschema/r/connect_attrs.result b/mysql-test/suite/perfschema/r/connect_attrs.result
index eb83cb5e886..aa61eb306a2 100644
--- a/mysql-test/suite/perfschema/r/connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/connect_attrs.result
@@ -45,7 +45,7 @@ COUNT(DISTINCT PROCESSLIST_ID)
1
SELECT COUNT(DISTINCT PROCESSLIST_ID)
FROM performance_schema.session_connect_attrs;
-ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table `performance_schema`.`session_connect_attrs`
connection default;
disconnect non_privileged_user;
grant select on performance_schema.* to wl5924@localhost;
diff --git a/mysql-test/suite/perfschema/r/dml_accounts.result b/mysql-test/suite/perfschema/r/dml_accounts.result
index 7e04bb3ea08..dcbce511faf 100644
--- a/mysql-test/suite/perfschema/r/dml_accounts.result
+++ b/mysql-test/suite/perfschema/r/dml_accounts.result
@@ -5,23 +5,23 @@ where user='FOO' or host='BAR';
insert into performance_schema.accounts
set user='FOO', host='BAR',
current_connections=1, total_connections=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
update performance_schema.accounts
set current_connections=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
update performance_schema.accounts
set current_connections=12 where host like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
delete from performance_schema.accounts
where total_connections=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
delete from performance_schema.accounts;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
LOCK TABLES performance_schema.accounts READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
UNLOCK TABLES;
LOCK TABLES performance_schema.accounts WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_cond_instances.result b/mysql-test/suite/perfschema/r/dml_cond_instances.result
index d9baa2a2c0f..2f35b1b391e 100644
--- a/mysql-test/suite/perfschema/r/dml_cond_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_cond_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.cond_instances
where name='FOO';
insert into performance_schema.cond_instances
set name='FOO', object_instance_begin=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
update performance_schema.cond_instances
set name='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
delete from performance_schema.cond_instances
where name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
delete from performance_schema.cond_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
LOCK TABLES performance_schema.cond_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
UNLOCK TABLES;
LOCK TABLES performance_schema.cond_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
index 9081ee9dfdc..17c390fd203 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_stages_summary_by_account_by_event_name
set event_name='FOO', user='BAR', host='BAZ',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
update performance_schema.events_stages_summary_by_account_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
update performance_schema.events_stages_summary_by_account_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
delete from performance_schema.events_stages_summary_by_account_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
delete from performance_schema.events_stages_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
LOCK TABLES performance_schema.events_stages_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
index a8c3584fa6e..2f3b59f138f 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_stages_summary_by_host_by_event_name
set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
update performance_schema.events_stages_summary_by_host_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
update performance_schema.events_stages_summary_by_host_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
delete from performance_schema.events_stages_summary_by_host_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
delete from performance_schema.events_stages_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
LOCK TABLES performance_schema.events_stages_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result
index 4e0fe6c8f24..77dd7b2e2b8 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_stages_summary_by_thread_by_event_name
set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
update performance_schema.events_stages_summary_by_thread_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
update performance_schema.events_stages_summary_by_thread_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
delete from performance_schema.events_stages_summary_by_thread_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
delete from performance_schema.events_stages_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
LOCK TABLES performance_schema.events_stages_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result
index bf492015fe4..77855e6b662 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_stages_summary_by_user_by_event_name
set event_name='FOO', user='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
update performance_schema.events_stages_summary_by_user_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
update performance_schema.events_stages_summary_by_user_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
delete from performance_schema.events_stages_summary_by_user_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
delete from performance_schema.events_stages_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
LOCK TABLES performance_schema.events_stages_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result
index 4fb98fdfdcc..f238c4cbd23 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result
@@ -5,23 +5,23 @@ where event_name='FOO';
insert into performance_schema.events_stages_summary_global_by_event_name
set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
update performance_schema.events_stages_summary_global_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
update performance_schema.events_stages_summary_global_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
delete from performance_schema.events_stages_summary_global_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
delete from performance_schema.events_stages_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
LOCK TABLES performance_schema.events_stages_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result
index fdcf5f45c37..2d34f5ee320 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_statements_summary_by_account_by_event_nam
set event_name='FOO', user='BAR', host='BAZ',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
update performance_schema.events_statements_summary_by_account_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
update performance_schema.events_statements_summary_by_account_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
delete from performance_schema.events_statements_summary_by_account_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
delete from performance_schema.events_statements_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
LOCK TABLES performance_schema.events_statements_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_digest.result b/mysql-test/suite/perfschema/r/dml_esms_by_digest.result
index 0d43041b502..8240093de69 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_digest.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_digest.result
@@ -7,23 +7,23 @@ SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT AVG_TIME
insert into performance_schema.events_statements_summary_by_digest
set digest='XXYYZZ', count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
update performance_schema.events_statements_summary_by_digest
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
update performance_schema.events_statements_summary_by_digest
set count_star=12 where digest like "XXYYZZ";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
delete from performance_schema.events_statements_summary_by_digest
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
delete from performance_schema.events_statements_summary_by_digest;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
LOCK TABLES performance_schema.events_statements_summary_by_digest READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_digest WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result
index 3d38c94ac52..847caf205ec 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_statements_summary_by_host_by_event_name
set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
update performance_schema.events_statements_summary_by_host_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
update performance_schema.events_statements_summary_by_host_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
delete from performance_schema.events_statements_summary_by_host_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
delete from performance_schema.events_statements_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
LOCK TABLES performance_schema.events_statements_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_program.result b/mysql-test/suite/perfschema/r/dml_esms_by_program.result
index b8c86fe3e45..b507652ea89 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_program.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_program.result
@@ -7,21 +7,21 @@ OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COUNT_STAR SUM_TIMER_WAIT MIN_TIMER_WAIT A
insert into performance_schema.events_statements_summary_by_program
set object_name='XXYYZZ', count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
update performance_schema.events_statements_summary_by_program
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
update performance_schema.events_statements_summary_by_program
set count_star=12 where object_name like "XXYYZZ";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
delete from performance_schema.events_statements_summary_by_program
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
delete from performance_schema.events_statements_summary_by_program;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
LOCK TABLES performance_schema.events_statements_summary_by_program READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_program WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result
index ef464440ebf..d8dfb72f78f 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_statements_summary_by_thread_by_event_name
set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
update performance_schema.events_statements_summary_by_thread_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
update performance_schema.events_statements_summary_by_thread_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
delete from performance_schema.events_statements_summary_by_thread_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
delete from performance_schema.events_statements_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
LOCK TABLES performance_schema.events_statements_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result
index e92d87b45ad..12290453a04 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_statements_summary_by_user_by_event_name
set event_name='FOO', user='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
update performance_schema.events_statements_summary_by_user_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
update performance_schema.events_statements_summary_by_user_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
delete from performance_schema.events_statements_summary_by_user_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
delete from performance_schema.events_statements_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
LOCK TABLES performance_schema.events_statements_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result
index 14c1026fedd..a12b308b24c 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result
@@ -5,23 +5,23 @@ where event_name='FOO';
insert into performance_schema.events_statements_summary_global_by_event_name
set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
update performance_schema.events_statements_summary_global_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
update performance_schema.events_statements_summary_global_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
delete from performance_schema.events_statements_summary_global_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
delete from performance_schema.events_statements_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
LOCK TABLES performance_schema.events_statements_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result
index 66a0f733d19..01d87f5275b 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.events_transactions_summary_by_account_by_event_n
set event_name='FOO', user='BAR', host='BAZ',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
update performance_schema.events_transactions_summary_by_account_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
update performance_schema.events_transactions_summary_by_account_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
delete from performance_schema.events_transactions_summary_by_account_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
delete from performance_schema.events_transactions_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
LOCK TABLES performance_schema.events_transactions_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_transactions_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result
index 194d8ff0b4b..4d138f9789c 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.events_transactions_summary_by_host_by_event_name
set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
update performance_schema.events_transactions_summary_by_host_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
update performance_schema.events_transactions_summary_by_host_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
delete from performance_schema.events_transactions_summary_by_host_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
delete from performance_schema.events_transactions_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
LOCK TABLES performance_schema.events_transactions_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_transactions_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result
index f096d265457..75a023a2326 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.events_transactions_summary_by_thread_by_event_na
set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
update performance_schema.events_transactions_summary_by_thread_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
update performance_schema.events_transactions_summary_by_thread_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
delete from performance_schema.events_transactions_summary_by_thread_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
delete from performance_schema.events_transactions_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
LOCK TABLES performance_schema.events_transactions_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_transactions_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result
index 11d455a35a7..0e8efe2d817 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.events_transactions_summary_by_user_by_event_name
set event_name='FOO', user='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
update performance_schema.events_transactions_summary_by_user_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
update performance_schema.events_transactions_summary_by_user_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
delete from performance_schema.events_transactions_summary_by_user_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
delete from performance_schema.events_transactions_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
LOCK TABLES performance_schema.events_transactions_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_transactions_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result
index 0f2bd599af8..e1158839d18 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result
@@ -5,21 +5,21 @@ where event_name='FOO';
insert into performance_schema.events_transactions_summary_global_by_event_name
set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
update performance_schema.events_transactions_summary_global_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
update performance_schema.events_transactions_summary_global_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
delete from performance_schema.events_transactions_summary_global_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
delete from performance_schema.events_transactions_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
LOCK TABLES performance_schema.events_transactions_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_transactions_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_stages_current.result b/mysql-test/suite/perfschema/r/dml_events_stages_current.result
index 05a0885f08f..7a27bfbf3d0 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_current.result
@@ -5,23 +5,23 @@ where event_name='FOO';
insert into performance_schema.events_stages_current
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
update performance_schema.events_stages_current
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
update performance_schema.events_stages_current
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
delete from performance_schema.events_stages_current
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
delete from performance_schema.events_stages_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
LOCK TABLES performance_schema.events_stages_current READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_current WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_stages_history.result b/mysql-test/suite/perfschema/r/dml_events_stages_history.result
index d353d8a6a7f..469ea78a867 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_history.result
@@ -9,23 +9,23 @@ where event_name like 'stage/%' order by timer_wait desc limit 1;
insert into performance_schema.events_stages_history
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
update performance_schema.events_stages_history
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
update performance_schema.events_stages_history
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
delete from performance_schema.events_stages_history
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
delete from performance_schema.events_stages_history;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
LOCK TABLES performance_schema.events_stages_history READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_history WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result b/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
index 81fb070aea5..d89b1a81519 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
@@ -9,23 +9,23 @@ where event_name like 'stage/%' order by timer_wait desc limit 1;
insert into performance_schema.events_stages_history_long
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
update performance_schema.events_stages_history_long
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
update performance_schema.events_stages_history_long
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
delete from performance_schema.events_stages_history_long
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
delete from performance_schema.events_stages_history_long;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
LOCK TABLES performance_schema.events_stages_history_long READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_stages_history_long WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_current.result b/mysql-test/suite/perfschema/r/dml_events_statements_current.result
index b9d6fce6dae..3a57d318e61 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_current.result
@@ -5,23 +5,23 @@ where event_name='FOO';
insert into performance_schema.events_statements_current
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
update performance_schema.events_statements_current
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
update performance_schema.events_statements_current
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
delete from performance_schema.events_statements_current
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
delete from performance_schema.events_statements_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
LOCK TABLES performance_schema.events_statements_current READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_current WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_history.result b/mysql-test/suite/perfschema/r/dml_events_statements_history.result
index e529c1264de..88a3f7df7e2 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_history.result
@@ -9,23 +9,23 @@ where event_name like 'statement/%' order by timer_wait desc limit 1;
insert into performance_schema.events_statements_history
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
update performance_schema.events_statements_history
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
update performance_schema.events_statements_history
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
delete from performance_schema.events_statements_history
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
delete from performance_schema.events_statements_history;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
LOCK TABLES performance_schema.events_statements_history READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_history WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result b/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
index dde16516d84..36b00606ac5 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
@@ -9,23 +9,23 @@ where event_name like 'statement/%' order by timer_wait desc limit 1;
insert into performance_schema.events_statements_history_long
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
update performance_schema.events_statements_history_long
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
update performance_schema.events_statements_history_long
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
delete from performance_schema.events_statements_history_long
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
delete from performance_schema.events_statements_history_long;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
LOCK TABLES performance_schema.events_statements_history_long READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_statements_history_long WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_current.result b/mysql-test/suite/perfschema/r/dml_events_transactions_current.result
index 9a6c4f3bd58..d34b229112c 100644
--- a/mysql-test/suite/perfschema/r/dml_events_transactions_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_current.result
@@ -5,21 +5,21 @@ where event_name='FOO';
insert into performance_schema.events_transactions_current
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
update performance_schema.events_transactions_current
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
update performance_schema.events_transactions_current
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
delete from performance_schema.events_transactions_current
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
delete from performance_schema.events_transactions_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
LOCK TABLES performance_schema.events_transactions_current READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_transactions_current WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_history.result b/mysql-test/suite/perfschema/r/dml_events_transactions_history.result
index 000e6a26753..875f49e73af 100644
--- a/mysql-test/suite/perfschema/r/dml_events_transactions_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_history.result
@@ -9,21 +9,21 @@ where event_name in ('transaction') order by timer_wait desc limit 1;
insert into performance_schema.events_transactions_history
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
update performance_schema.events_transactions_history
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
update performance_schema.events_transactions_history
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
delete from performance_schema.events_transactions_history
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
delete from performance_schema.events_transactions_history;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
LOCK TABLES performance_schema.events_transactions_history READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_transactions_history WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result b/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result
index e954bcd1be1..6f11d9a4c21 100644
--- a/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result
@@ -9,21 +9,21 @@ where event_name in ('transaction') order by timer_wait desc limit 1;
insert into performance_schema.events_transactions_history_long
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
update performance_schema.events_transactions_history_long
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
update performance_schema.events_transactions_history_long
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
delete from performance_schema.events_transactions_history_long
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
delete from performance_schema.events_transactions_history_long;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
LOCK TABLES performance_schema.events_transactions_history_long READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_transactions_history_long WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_current.result b/mysql-test/suite/perfschema/r/dml_events_waits_current.result
index 0d9b343a852..cb84d5e319c 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_current.result
@@ -5,23 +5,23 @@ where event_name='FOO';
insert into performance_schema.events_waits_current
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
update performance_schema.events_waits_current
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
update performance_schema.events_waits_current
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
delete from performance_schema.events_waits_current
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
LOCK TABLES performance_schema.events_waits_current READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_current WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_history.result b/mysql-test/suite/perfschema/r/dml_events_waits_history.result
index 96d2b4b680e..bdc853ef0e2 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_history.result
@@ -9,23 +9,23 @@ where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1;
insert into performance_schema.events_waits_history
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
update performance_schema.events_waits_history
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
update performance_schema.events_waits_history
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
delete from performance_schema.events_waits_history
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
delete from performance_schema.events_waits_history;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
LOCK TABLES performance_schema.events_waits_history READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_history WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
index 99af65297ef..b7f4e356afd 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
@@ -9,23 +9,23 @@ where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1;
insert into performance_schema.events_waits_history_long
set thread_id='1', event_id=1,
event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
update performance_schema.events_waits_history_long
set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
update performance_schema.events_waits_history_long
set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
delete from performance_schema.events_waits_history_long
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
delete from performance_schema.events_waits_history_long;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
LOCK TABLES performance_schema.events_waits_history_long READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_history_long WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result
index bfe9e29446b..c9b89209c3b 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result
@@ -9,23 +9,23 @@ insert into performance_schema.events_waits_summary_by_account_by_event_name
set event_name='FOO', user='BAR', host='BAZ',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
update performance_schema.events_waits_summary_by_account_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
update performance_schema.events_waits_summary_by_account_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
delete from performance_schema.events_waits_summary_by_account_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
delete from performance_schema.events_waits_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
LOCK TABLES performance_schema.events_waits_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result
index dc717e8b7c5..19ea3ae1f7e 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result
@@ -9,23 +9,23 @@ insert into performance_schema.events_waits_summary_by_host_by_event_name
set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
update performance_schema.events_waits_summary_by_host_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
update performance_schema.events_waits_summary_by_host_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
delete from performance_schema.events_waits_summary_by_host_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
delete from performance_schema.events_waits_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
LOCK TABLES performance_schema.events_waits_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
index a9686526a77..f203178eb75 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
@@ -14,23 +14,23 @@ insert into performance_schema.events_waits_summary_by_instance
set event_name='FOO', object_instance_begin=0,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
update performance_schema.events_waits_summary_by_instance
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
update performance_schema.events_waits_summary_by_instance
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
delete from performance_schema.events_waits_summary_by_instance
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
delete from performance_schema.events_waits_summary_by_instance;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
LOCK TABLES performance_schema.events_waits_summary_by_instance READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_instance WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
index e974523df7c..5848905248e 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_waits_summary_by_thread_by_event_name
set event_name='FOO', thread_id=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
update performance_schema.events_waits_summary_by_thread_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
update performance_schema.events_waits_summary_by_thread_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
delete from performance_schema.events_waits_summary_by_thread_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
delete from performance_schema.events_waits_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
index 6cfc44961b9..e48492b39c6 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
@@ -9,23 +9,23 @@ insert into performance_schema.events_waits_summary_by_user_by_event_name
set event_name='FOO', user='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
update performance_schema.events_waits_summary_by_user_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
update performance_schema.events_waits_summary_by_user_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
delete from performance_schema.events_waits_summary_by_user_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
delete from performance_schema.events_waits_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
LOCK TABLES performance_schema.events_waits_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
index 37a5a22795c..eecb441f704 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
@@ -5,23 +5,23 @@ where event_name='FOO';
insert into performance_schema.events_waits_summary_global_by_event_name
set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
update performance_schema.events_waits_summary_global_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
update performance_schema.events_waits_summary_global_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
delete from performance_schema.events_waits_summary_global_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
delete from performance_schema.events_waits_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
LOCK TABLES performance_schema.events_waits_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.events_waits_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_file_instances.result b/mysql-test/suite/perfschema/r/dml_file_instances.result
index 7d25481662c..75c6ad8525d 100644
--- a/mysql-test/suite/perfschema/r/dml_file_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_file_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.file_instances
where file_name='FOO';
insert into performance_schema.file_instances
set file_name='FOO', event_name='BAR', open_count=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
update performance_schema.file_instances
set file_name='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
delete from performance_schema.file_instances
where event_name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
LOCK TABLES performance_schema.file_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
UNLOCK TABLES;
LOCK TABLES performance_schema.file_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_fs_by_event_name.result b/mysql-test/suite/perfschema/r/dml_fs_by_event_name.result
index 15dededb288..4ab3e6428bd 100644
--- a/mysql-test/suite/perfschema/r/dml_fs_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_fs_by_event_name.result
@@ -5,23 +5,23 @@ where event_name='FOO';
insert into performance_schema.file_summary_by_event_name
set event_name='FOO', count_read=1, count_write=2,
sum_number_of_bytes_read=4, sum_number_of_bytes_write=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
update performance_schema.file_summary_by_event_name
set count_read=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
update performance_schema.file_summary_by_event_name
set count_write=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
delete from performance_schema.file_summary_by_event_name
where count_read=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
delete from performance_schema.file_summary_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
LOCK TABLES performance_schema.file_summary_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.file_summary_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_fs_by_instance.result b/mysql-test/suite/perfschema/r/dml_fs_by_instance.result
index 39e871b0e50..0c0d5a6c724 100644
--- a/mysql-test/suite/perfschema/r/dml_fs_by_instance.result
+++ b/mysql-test/suite/perfschema/r/dml_fs_by_instance.result
@@ -5,23 +5,23 @@ where event_name='FOO';
insert into performance_schema.file_summary_by_instance
set event_name='FOO', count_read=1, count_write=2,
sum_number_of_bytes_read=4, sum_number_of_bytes_write=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
update performance_schema.file_summary_by_instance
set count_read=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
update performance_schema.file_summary_by_instance
set count_write=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
delete from performance_schema.file_summary_by_instance
where count_read=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
delete from performance_schema.file_summary_by_instance;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
LOCK TABLES performance_schema.file_summary_by_instance READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
UNLOCK TABLES;
LOCK TABLES performance_schema.file_summary_by_instance WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_global_status.result b/mysql-test/suite/perfschema/r/dml_global_status.result
index 90b7ac8147f..27dd5859240 100644
--- a/mysql-test/suite/perfschema/r/dml_global_status.result
+++ b/mysql-test/suite/perfschema/r/dml_global_status.result
@@ -4,18 +4,18 @@ select * from performance_schema.global_status
where variable_name='FOO';
insert into performance_schema.global_status
set variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
update performance_schema.global_status
set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
delete from performance_schema.global_status
where variable_name <> 'FOO';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
delete from performance_schema.global_status;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
LOCK TABLES performance_schema.global_status READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
UNLOCK TABLES;
LOCK TABLES performance_schema.global_status WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_host_cache.result b/mysql-test/suite/perfschema/r/dml_host_cache.result
index 1165be23804..f9291e053bb 100644
--- a/mysql-test/suite/perfschema/r/dml_host_cache.result
+++ b/mysql-test/suite/perfschema/r/dml_host_cache.result
@@ -4,26 +4,26 @@ select * from performance_schema.host_cache
where IP='localhost';
insert into performance_schema.host_cache
set IP='FOO', SUM_BLOCKING_ERRORS=1, COUNT_FCRDNS_ERRORS=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
update performance_schema.host_cache
set COUNT_UNKNOWN_ERRORS=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
update performance_schema.host_cache
set SUM_BLOCKING_ERRORS=12 where IP='127.0.0.1';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
select HOST from performance_schema.host_cache
where IP='::1';
HOST
delete from performance_schema.host_cache
where IP='::1';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
delete from performance_schema.host_cache;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
LOCK TABLES performance_schema.host_cache READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
UNLOCK TABLES;
LOCK TABLES performance_schema.host_cache WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_hosts.result b/mysql-test/suite/perfschema/r/dml_hosts.result
index e282110bf77..af661363f2d 100644
--- a/mysql-test/suite/perfschema/r/dml_hosts.result
+++ b/mysql-test/suite/perfschema/r/dml_hosts.result
@@ -5,23 +5,23 @@ where host='FOO';
insert into performance_schema.hosts
set host='FOO',
current_connections=1, total_connections=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
update performance_schema.hosts
set current_connections=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
update performance_schema.hosts
set current_connections=12 where host like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
delete from performance_schema.hosts
where total_connections=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
delete from performance_schema.hosts;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
LOCK TABLES performance_schema.hosts READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
UNLOCK TABLES;
LOCK TABLES performance_schema.hosts WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
index 2532debd1ad..b8f22f8c3a3 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.memory_summary_by_account_by_event_name
set event_name='FOO', user='BAR', host='BAZ',
count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
update performance_schema.memory_summary_by_account_by_event_name
set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
update performance_schema.memory_summary_by_account_by_event_name
set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
delete from performance_schema.memory_summary_by_account_by_event_name
where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
delete from performance_schema.memory_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
LOCK TABLES performance_schema.memory_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.memory_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result
index 6e78102ba91..405317e948f 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.memory_summary_by_host_by_event_name
set event_name='FOO', host='BAZ',
count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
update performance_schema.memory_summary_by_host_by_event_name
set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
update performance_schema.memory_summary_by_host_by_event_name
set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
delete from performance_schema.memory_summary_by_host_by_event_name
where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
delete from performance_schema.memory_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
LOCK TABLES performance_schema.memory_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.memory_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result
index f1576b22896..3f9e15676f5 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.memory_summary_by_thread_by_event_name
set event_name='FOO', thread_id=12,
count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
update performance_schema.memory_summary_by_thread_by_event_name
set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
update performance_schema.memory_summary_by_thread_by_event_name
set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
delete from performance_schema.memory_summary_by_thread_by_event_name
where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
delete from performance_schema.memory_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
LOCK TABLES performance_schema.memory_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.memory_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result
index 3e81a141e32..6250fde2d10 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.memory_summary_by_user_by_event_name
set event_name='FOO', user='BAR',
count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
update performance_schema.memory_summary_by_user_by_event_name
set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
update performance_schema.memory_summary_by_user_by_event_name
set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
delete from performance_schema.memory_summary_by_user_by_event_name
where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
delete from performance_schema.memory_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
LOCK TABLES performance_schema.memory_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.memory_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result
index cd9eafd0a1e..cb0aaee6e52 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.memory_summary_global_by_event_name
set event_name='FOO',
count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
update performance_schema.memory_summary_global_by_event_name
set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
update performance_schema.memory_summary_global_by_event_name
set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
delete from performance_schema.memory_summary_global_by_event_name
where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
delete from performance_schema.memory_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
LOCK TABLES performance_schema.memory_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.memory_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_metadata_locks.result b/mysql-test/suite/perfschema/r/dml_metadata_locks.result
index 3ec90064737..cf87b6efdb7 100644
--- a/mysql-test/suite/perfschema/r/dml_metadata_locks.result
+++ b/mysql-test/suite/perfschema/r/dml_metadata_locks.result
@@ -4,20 +4,20 @@ where object_name='foo';
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME OBJECT_INSTANCE_BEGIN LOCK_TYPE LOCK_DURATION LOCK_STATUS SOURCE OWNER_THREAD_ID OWNER_EVENT_ID
insert into performance_schema.metadata_locks
set object_name='FOO', owner_thread_id=1;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
update performance_schema.metadata_locks
set owner_thread_id=12 where object_name='foo';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
delete from performance_schema.metadata_locks;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
delete from performance_schema.metadata_locks
where timer_name='CYCLE';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
LOCK TABLES performance_schema.metadata_locks READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
UNLOCK TABLES;
LOCK TABLES performance_schema.metadata_locks WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mutex_instances.result b/mysql-test/suite/perfschema/r/dml_mutex_instances.result
index 2f222118001..c2de16c87bb 100644
--- a/mysql-test/suite/perfschema/r/dml_mutex_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_mutex_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.mutex_instances
where name='FOO';
insert into performance_schema.mutex_instances
set name='FOO', object_instance_begin=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
update performance_schema.mutex_instances
set name='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
delete from performance_schema.mutex_instances
where name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
delete from performance_schema.mutex_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
LOCK TABLES performance_schema.mutex_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
UNLOCK TABLES;
LOCK TABLES performance_schema.mutex_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_os_global_by_type.result b/mysql-test/suite/perfschema/r/dml_os_global_by_type.result
index 72ba764e7c3..eb8eeda6384 100644
--- a/mysql-test/suite/perfschema/r/dml_os_global_by_type.result
+++ b/mysql-test/suite/perfschema/r/dml_os_global_by_type.result
@@ -25,23 +25,23 @@ insert into performance_schema.objects_summary_global_by_type
set object_type='TABLE', schema_name='FOO', object_name='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
update performance_schema.objects_summary_global_by_type
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
update performance_schema.objects_summary_global_by_type
set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
delete from performance_schema.objects_summary_global_by_type
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
delete from performance_schema.objects_summary_global_by_type;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
LOCK TABLES performance_schema.objects_summary_global_by_type READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
UNLOCK TABLES;
LOCK TABLES performance_schema.objects_summary_global_by_type WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_performance_timers.result b/mysql-test/suite/perfschema/r/dml_performance_timers.result
index b1d4406137c..c99784742f4 100644
--- a/mysql-test/suite/perfschema/r/dml_performance_timers.result
+++ b/mysql-test/suite/perfschema/r/dml_performance_timers.result
@@ -12,20 +12,20 @@ CYCLE <frequency> <resolution> <overhead>
insert into performance_schema.performance_timers
set timer_name='FOO', timer_frequency=1,
timer_resolution=2, timer_overhead=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
update performance_schema.performance_timers
set timer_frequency=12 where timer_name='CYCLE';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
delete from performance_schema.performance_timers;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
delete from performance_schema.performance_timers
where timer_name='CYCLE';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
LOCK TABLES performance_schema.performance_timers READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
UNLOCK TABLES;
LOCK TABLES performance_schema.performance_timers WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result b/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result
index dbccb963a61..92be22051b0 100644
--- a/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result
@@ -7,20 +7,20 @@ OBJECT_INSTANCE_BEGIN STATEMENT_ID STATEMENT_NAME SQL_TEXT OWNER_THREAD_ID OWNER
insert into performance_schema.prepared_statements_instances
set owner_object_name='XXYYZZ', count_execute=1, sum_timer_execute=2,
min_timer_execute=3, avg_timer_execute=4, max_timer_execute=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
update performance_schema.prepared_statements_instances set count_execute=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
update performance_schema.prepared_statements_instances
set count_execute=12 where owner_object_name like "XXYYZZ";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
delete from performance_schema.prepared_statements_instances
where count_execute=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
delete from performance_schema.prepared_statements_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
LOCK TABLES performance_schema.prepared_statements_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
UNLOCK TABLES;
LOCK TABLES performance_schema.prepared_statements_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result b/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result
index 0e5711b5732..eee36e49fbf 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result
@@ -4,18 +4,18 @@ sELECT * FROM performance_schema.replication_applier_configuration
WHERE desired_delay=12;
INSERT INTO performance_schema.replication_applier_configuration
SET desired_delay=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
UPDATE performance_schema.replication_applier_configuration
SET desired_delay=12 WHERE desired_delay=2;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
DELETE FROM performance_schema.replication_applier_configuration
WHERE desired_delay=12;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
DELETE FROM performance_schema.replication_applier_configuration;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
LOCK TABLES performance_schema.replication_applier_configuration READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
UNLOCK TABLES;
LOCK TABLES performance_schema.replication_applier_configuration WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status.result
index e6464c58e85..11f5d80fce7 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_applier_status.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status.result
@@ -4,21 +4,21 @@ SELECT * FROM performance_schema.replication_applier_status
WHERE service_state='YES' OR remaining_delay=12;
INSERT INTO performance_schema.replication_applier_status
SET service_state='YES', remaining_delay=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
UPDATE performance_schema.replication_applier_status
SET remaining_delay=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
UPDATE performance_schema.replication_applier_status
SET remaining_delay=12 WHERE service_state='YES';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
DELETE FROM performance_schema.replication_applier_status
WHERE service_state='YES';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
DELETE FROM performance_schema.replication_applier_status;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
LOCK TABLES performance_schema.replication_applier_status READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
UNLOCK TABLES;
LOCK TABLES performance_schema.replication_applier_status WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
index d6818fd1280..19dae11a8c9 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
@@ -5,21 +5,21 @@ WHERE service_state='YES' or last_error_message='ERROR';
INSERT INTO performance_schema.replication_applier_status_by_coordinator
SET service_state='YES', last_error_message='ERROR', thread_id=2,
last_error_number=1234;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
UPDATE performance_schema.replication_applier_status_by_coordinator
SET last_error_number=1234;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
UPDATE performance_schema.replication_applier_status_by_coordinator
SET last_error_number=1234 where service_state like "YES";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
DELETE FROM performance_schema.replication_applier_status_by_coordinator
WHERE thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
DELETE FROM performance_schema.replication_applier_status_by_coordinator;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
LOCK TABLES performance_schema.replication_applier_status_by_coordinator READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
UNLOCK TABLES;
LOCK TABLES performance_schema.replication_applier_status_by_coordinator WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result
index 2a1552c8453..e61e5a2d0b4 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result
@@ -5,23 +5,23 @@ WHERE service_state='YES' OR last_error_message='ERROR';
INSERT INTO performance_schema.replication_applier_status_by_worker
SET service_state='YES', last_error_message='ERROR',
worker_id=1, thread_id=2, last_error_number=1234;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
UPDATE performance_schema.replication_applier_status_by_worker
SET worker_id=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
UPDATE performance_schema.replication_applier_status_by_worker
SET worker_d=12 where service_state like "YES";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
DELETE FROM performance_schema.replication_applier_status_by_worker
WHERE worker_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
DELETE FROM performance_schema.replication_applier_status_by_worker;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
LOCK TABLES performance_schema.replication_applier_status_by_worker READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
UNLOCK TABLES;
LOCK TABLES performance_schema.replication_applier_status_by_worker WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result b/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
index d338d4ab38a..a57b6901095 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
@@ -5,21 +5,21 @@ WHERE user='FOO' or host='BAR';
INSERT INTO performance_schema.replication_connection_configuration
SET user='FOO', host='BAR',
port=1, connection_retry_count=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
UPDATE performance_schema.replication_connection_configuration
SET connection_retry_interval=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
UPDATE performance_schema.replication_connection_configuration
SET connection_retry_interval=12 WHERE host LIKE "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
DELETE FROM performance_schema.replication_connection_configuration
WHERE connection_retry_count=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
DELETE FROM performance_schema.replication_connection_configuration;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
LOCK TABLES performance_schema.replication_connection_configuration READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
UNLOCK TABLES;
LOCK TABLES performance_schema.replication_connection_configuration WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
index 4ffe125dfd7..0c1c211e5b7 100644
--- a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.rwlock_instances
where name='FOO';
insert into performance_schema.rwlock_instances
set name='FOO', object_instance_begin=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
update performance_schema.rwlock_instances
set name='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
delete from performance_schema.rwlock_instances
where name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
delete from performance_schema.rwlock_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
LOCK TABLES performance_schema.rwlock_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
UNLOCK TABLES;
LOCK TABLES performance_schema.rwlock_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result b/mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result
index e79deb172b3..ca9ad32d9bb 100644
--- a/mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result
@@ -5,23 +5,23 @@ where ATTR_NAME='FOO' OR ATTR_VALUE='BAR';
INSERT INTO performance_schema.session_account_connect_attrs
SET ATTR_NAME='FOO', ATTR_VALUE='BAR',
ORDINAL_POSITION=100, PROCESS_ID=102;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
UPDATE performance_schema.session_account_connect_attrs
SET ATTR_NAME='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
UPDATE performance_schema.session_account_connect_attrs
SET ATTR_NAME='FOO' WHERE ATTR_VALUE='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
DELETE FROM performance_schema.session_account_connect_attrs
WHERE ATTR_VALUE='BAR';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
DELETE FROM performance_schema.session_account_connect_attrs;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
LOCK TABLES performance_schema.session_account_connect_attrs READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
UNLOCK TABLES;
LOCK TABLES performance_schema.session_account_connect_attrs WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_session_connect_attrs.result b/mysql-test/suite/perfschema/r/dml_session_connect_attrs.result
index c56af4a448d..e6b76c386f4 100644
--- a/mysql-test/suite/perfschema/r/dml_session_connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/dml_session_connect_attrs.result
@@ -5,23 +5,23 @@ where ATTR_NAME='FOO' OR ATTR_VALUE='BAR';
INSERT INTO performance_schema.session_connect_attrs
SET ATTR_NAME='FOO', ATTR_VALUE='BAR',
ORDINAL_POSITION=100, PROCESS_ID=102;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
UPDATE performance_schema.session_connect_attrs
SET ATTR_NAME='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
UPDATE performance_schema.session_connect_attrs
SET ATTR_NAME='FOO' WHERE ATTR_VALUE='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
DELETE FROM performance_schema.session_connect_attrs
WHERE ATTR_VALUE='BAR';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
DELETE FROM performance_schema.session_connect_attrs;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
LOCK TABLES performance_schema.session_connect_attrs READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
UNLOCK TABLES;
LOCK TABLES performance_schema.session_connect_attrs WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_session_status.result b/mysql-test/suite/perfschema/r/dml_session_status.result
index 979d97daa83..4f36d9e8b6f 100644
--- a/mysql-test/suite/perfschema/r/dml_session_status.result
+++ b/mysql-test/suite/perfschema/r/dml_session_status.result
@@ -4,18 +4,18 @@ select * from performance_schema.session_status
where variable_name='FOO';
insert into performance_schema.session_status
set variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
update performance_schema.session_status
set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
delete from performance_schema.session_status
where variable_name <> 'FOO';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
delete from performance_schema.session_status;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
LOCK TABLES performance_schema.session_status READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
UNLOCK TABLES;
LOCK TABLES performance_schema.session_status WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_consumers.result b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
index d5db0fb7a88..a72b238f9ad 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_consumers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
@@ -42,17 +42,17 @@ where enabled='NO';
NAME ENABLED
insert into performance_schema.setup_consumers
set name='FOO', enabled='YES';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_consumers'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_consumers`
update performance_schema.setup_consumers
set name='FOO';
ERROR HY000: Invalid performance_schema usage
update performance_schema.setup_consumers
set enabled='YES';
delete from performance_schema.setup_consumers;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_consumers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_consumers`
delete from performance_schema.setup_consumers
where name='events_waits_current';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_consumers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_consumers`
LOCK TABLES performance_schema.setup_consumers READ;
UNLOCK TABLES;
LOCK TABLES performance_schema.setup_consumers WRITE;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
index e87faf723f0..cdc52da54dc 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
@@ -57,7 +57,7 @@ select * from performance_schema.setup_instruments
where enabled='YES';
insert into performance_schema.setup_instruments
set name='FOO', enabled='YES', timed='YES';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
update performance_schema.setup_instruments
set name='FOO';
ERROR HY000: Invalid performance_schema usage
@@ -69,10 +69,10 @@ select * from performance_schema.setup_instruments;
update performance_schema.setup_instruments
set enabled='YES', timed='YES';
delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
delete from performance_schema.setup_instruments
where name like 'Wait/Synch/%';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
LOCK TABLES performance_schema.setup_instruments READ;
UNLOCK TABLES;
LOCK TABLES performance_schema.setup_instruments WRITE;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_timers.result b/mysql-test/suite/perfschema/r/dml_setup_timers.result
index 9783425a642..6f5a1f5cb4b 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_timers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_timers.result
@@ -41,7 +41,7 @@ Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
insert into performance_schema.setup_timers
set name='FOO', timer_name='CYCLE';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_timers'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_timers`
update performance_schema.setup_timers
set name='FOO';
ERROR HY000: Invalid performance_schema usage
@@ -63,10 +63,10 @@ set timer_name='CYCLE';
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
delete from performance_schema.setup_timers;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_timers`
delete from performance_schema.setup_timers
where name='Wait';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_timers`
LOCK TABLES performance_schema.setup_timers READ;
UNLOCK TABLES;
LOCK TABLES performance_schema.setup_timers WRITE;
diff --git a/mysql-test/suite/perfschema/r/dml_socket_instances.result b/mysql-test/suite/perfschema/r/dml_socket_instances.result
index d54e956e51b..571d4ad5552 100644
--- a/mysql-test/suite/perfschema/r/dml_socket_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_socket_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.socket_instances
where ip='FOO';
insert into performance_schema.socket_instances
set ip='FOO', event_name='BAR', port=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
update performance_schema.socket_instances
set ip='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
delete from performance_schema.socket_instances
where event_name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
delete from performance_schema.socket_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
LOCK TABLES performance_schema.socket_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
UNLOCK TABLES;
LOCK TABLES performance_schema.socket_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result b/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result
index 62085b067cc..8701f92dbb1 100644
--- a/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.socket_summary_by_event_name
set event_name='FOO',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
update performance_schema.socket_summary_by_event_name
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
update performance_schema.socket_summary_by_event_name
set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
delete from performance_schema.socket_summary_by_event_name
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
delete from performance_schema.socket_summary_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
LOCK TABLES performance_schema.socket_summary_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
UNLOCK TABLES;
LOCK TABLES performance_schema.socket_summary_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result b/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result
index 77baea763cb..ffbab5c7cdb 100644
--- a/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result
+++ b/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result
@@ -6,23 +6,23 @@ insert into performance_schema.socket_summary_by_instance
set object_instance_begin=1,
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
update performance_schema.socket_summary_by_instance
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
update performance_schema.socket_summary_by_instance
set count_star=12 where object_instance_begin like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
delete from performance_schema.socket_summary_by_instance
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
delete from performance_schema.socket_summary_by_instance;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
LOCK TABLES performance_schema.socket_summary_by_instance READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
UNLOCK TABLES;
LOCK TABLES performance_schema.socket_summary_by_instance WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_account.result b/mysql-test/suite/perfschema/r/dml_status_by_account.result
index 1b45920c70b..7b107bd84c9 100644
--- a/mysql-test/suite/perfschema/r/dml_status_by_account.result
+++ b/mysql-test/suite/perfschema/r/dml_status_by_account.result
@@ -4,21 +4,21 @@ select * from performance_schema.status_by_account
where variable_name='FOO';
insert into performance_schema.status_by_account
set user='USER', host='HOST', variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
update performance_schema.status_by_account
set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
update performance_schema.status_by_account
set variable_name='FOO' where user <> 'USER';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
delete from performance_schema.status_by_account
where user <> 'USER';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
delete from performance_schema.status_by_account;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
LOCK TABLES performance_schema.status_by_account READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
UNLOCK TABLES;
LOCK TABLES performance_schema.status_by_account WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_host.result b/mysql-test/suite/perfschema/r/dml_status_by_host.result
index cfe74eaabbf..99b83e2ada1 100644
--- a/mysql-test/suite/perfschema/r/dml_status_by_host.result
+++ b/mysql-test/suite/perfschema/r/dml_status_by_host.result
@@ -4,21 +4,21 @@ select * from performance_schema.status_by_host
where variable_name='FOO';
insert into performance_schema.status_by_host
set host='HOST', variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
update performance_schema.status_by_host
set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
update performance_schema.status_by_host
set variable_name='FOO' where host <> 'HOST';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
delete from performance_schema.status_by_host
where host <> 'HOST';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
delete from performance_schema.status_by_host;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
LOCK TABLES performance_schema.status_by_host READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
UNLOCK TABLES;
LOCK TABLES performance_schema.status_by_host WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_thread.result b/mysql-test/suite/perfschema/r/dml_status_by_thread.result
index afe2cf407ed..9eab97891cb 100644
--- a/mysql-test/suite/perfschema/r/dml_status_by_thread.result
+++ b/mysql-test/suite/perfschema/r/dml_status_by_thread.result
@@ -4,21 +4,21 @@ select * from performance_schema.status_by_thread
where variable_name='FOO';
insert into performance_schema.status_by_thread
set thread_id=1, variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
update performance_schema.status_by_thread
set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
update performance_schema.status_by_thread
set variable_name='FOO' where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
delete from performance_schema.status_by_thread
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
delete from performance_schema.status_by_thread;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
LOCK TABLES performance_schema.status_by_thread READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
UNLOCK TABLES;
LOCK TABLES performance_schema.status_by_thread WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_user.result b/mysql-test/suite/perfschema/r/dml_status_by_user.result
index 430bb622d3b..d81153aef5e 100644
--- a/mysql-test/suite/perfschema/r/dml_status_by_user.result
+++ b/mysql-test/suite/perfschema/r/dml_status_by_user.result
@@ -4,21 +4,21 @@ select * from performance_schema.status_by_user
where variable_name='FOO';
insert into performance_schema.status_by_user
set user='USER', variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
update performance_schema.status_by_user
set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
update performance_schema.status_by_user
set variable_name='FOO' where user <> 'USER';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
delete from performance_schema.status_by_user
where user <> 'USER';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
delete from performance_schema.status_by_user;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
LOCK TABLES performance_schema.status_by_user READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
UNLOCK TABLES;
LOCK TABLES performance_schema.status_by_user WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_table_handles.result b/mysql-test/suite/perfschema/r/dml_table_handles.result
index 5f6f0a43ad8..8089d5f66f8 100644
--- a/mysql-test/suite/perfschema/r/dml_table_handles.result
+++ b/mysql-test/suite/perfschema/r/dml_table_handles.result
@@ -4,18 +4,18 @@ where object_name='foo';
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME OBJECT_INSTANCE_BEGIN OWNER_THREAD_ID OWNER_EVENT_ID INTERNAL_LOCK EXTERNAL_LOCK
insert into performance_schema.table_handles
set object_name='FOO', owner_event_id=1;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
update performance_schema.table_handles
set owner_event_id=12 where object_name='foo';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
delete from performance_schema.table_handles;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
delete from performance_schema.table_handles
where timer_name='CYCLE';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
LOCK TABLES performance_schema.table_handles READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
UNLOCK TABLES;
LOCK TABLES performance_schema.table_handles WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_threads.result b/mysql-test/suite/perfschema/r/dml_threads.result
index 4826b3e66d9..c0c7281ba1a 100644
--- a/mysql-test/suite/perfschema/r/dml_threads.result
+++ b/mysql-test/suite/perfschema/r/dml_threads.result
@@ -4,7 +4,7 @@ select * from performance_schema.threads
where name='FOO';
insert into performance_schema.threads
set name='FOO', thread_id=1, processlist_id=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'threads'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`threads`
update performance_schema.threads
set thread_id=12;
ERROR HY000: Invalid performance_schema usage
@@ -25,9 +25,9 @@ instrumented
YES
delete from performance_schema.threads
where id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`threads`
delete from performance_schema.threads;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`threads`
LOCK TABLES performance_schema.threads READ;
UNLOCK TABLES;
LOCK TABLES performance_schema.threads WRITE;
diff --git a/mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result b/mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result
index f7bb29cae4e..81ef27d3c70 100644
--- a/mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result
+++ b/mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result
@@ -6,23 +6,23 @@ insert into performance_schema.table_io_waits_summary_by_index_usage
set object_type='TABLE', object_name='FOO', object_schema='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
update performance_schema.table_io_waits_summary_by_index_usage
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
update performance_schema.table_io_waits_summary_by_index_usage
set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
delete from performance_schema.table_io_waits_summary_by_index_usage
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
delete from performance_schema.table_io_waits_summary_by_index_usage;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
LOCK TABLES performance_schema.table_io_waits_summary_by_index_usage READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
UNLOCK TABLES;
LOCK TABLES performance_schema.table_io_waits_summary_by_index_usage WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_tiws_by_table.result b/mysql-test/suite/perfschema/r/dml_tiws_by_table.result
index 5a83ddfa87e..46c8604c6c4 100644
--- a/mysql-test/suite/perfschema/r/dml_tiws_by_table.result
+++ b/mysql-test/suite/perfschema/r/dml_tiws_by_table.result
@@ -6,23 +6,23 @@ insert into performance_schema.table_io_waits_summary_by_table
set object_type='TABLE', object_name='FOO', object_schema='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
update performance_schema.table_io_waits_summary_by_table
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
update performance_schema.table_io_waits_summary_by_table
set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
delete from performance_schema.table_io_waits_summary_by_table
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
delete from performance_schema.table_io_waits_summary_by_table;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
LOCK TABLES performance_schema.table_io_waits_summary_by_table READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
UNLOCK TABLES;
LOCK TABLES performance_schema.table_io_waits_summary_by_table WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_tlws_by_table.result b/mysql-test/suite/perfschema/r/dml_tlws_by_table.result
index 24f6c79ac61..6d130abff50 100644
--- a/mysql-test/suite/perfschema/r/dml_tlws_by_table.result
+++ b/mysql-test/suite/perfschema/r/dml_tlws_by_table.result
@@ -6,23 +6,23 @@ insert into performance_schema.table_lock_waits_summary_by_table
set object_type='TABLE', object_name='FOO', object_schema='BAR',
count_star=1, sum_timer_wait=2, min_timer_wait=3,
avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
update performance_schema.table_lock_waits_summary_by_table
set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
update performance_schema.table_lock_waits_summary_by_table
set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
delete from performance_schema.table_lock_waits_summary_by_table
where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
delete from performance_schema.table_lock_waits_summary_by_table;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
LOCK TABLES performance_schema.table_lock_waits_summary_by_table READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
UNLOCK TABLES;
LOCK TABLES performance_schema.table_lock_waits_summary_by_table WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_users.result b/mysql-test/suite/perfschema/r/dml_users.result
index b38cf034bc0..53b220c79a5 100644
--- a/mysql-test/suite/perfschema/r/dml_users.result
+++ b/mysql-test/suite/perfschema/r/dml_users.result
@@ -5,23 +5,23 @@ where user='FOO';
insert into performance_schema.users
set user='FOO',
current_connections=1, total_connections=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`users`
update performance_schema.users
set current_connections=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`users`
update performance_schema.users
set current_connections=12 where user like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`users`
delete from performance_schema.users
where total_connections=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`users`
delete from performance_schema.users;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`users`
LOCK TABLES performance_schema.users READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`users`
UNLOCK TABLES;
LOCK TABLES performance_schema.users WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`users`
UNLOCK TABLES;
#
# MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result b/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result
index ae6dc4ec3d9..7c9a7a3db8f 100644
--- a/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result
+++ b/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result
@@ -4,23 +4,23 @@ select * from performance_schema.user_variables_by_thread
where variable_name='FOO';
insert into performance_schema.user_variables_by_thread
set thread_id=12, variable_name='foo', variable_value='bar';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
update performance_schema.user_variables_by_thread
set thread_id=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
update performance_schema.user_variables_by_thread
set thread_id=12 where variable_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
delete from performance_schema.user_variables_by_thread
where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
delete from performance_schema.user_variables_by_thread;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
LOCK TABLES performance_schema.user_variables_by_thread READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
UNLOCK TABLES;
LOCK TABLES performance_schema.user_variables_by_thread WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
UNLOCK TABLES;
CREATE TRIGGER test_uvar_trigger
AFTER INSERT ON performance_schema.user_variables_by_thread
diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result
index b1fa4f6c765..2258cbceea4 100644
--- a/mysql-test/suite/perfschema/r/misc.result
+++ b/mysql-test/suite/perfschema/r/misc.result
@@ -52,7 +52,7 @@ SELECT object_schema, object_name FROM performance_schema.objects_summary_global
WHERE object_schema='test';
object_schema object_name
create table performance_schema.t1(a int);
-ERROR 42000: CREATE command denied to user 'root'@'localhost' for table 't1'
+ERROR 42000: CREATE command denied to user 'root'@'localhost' for table `performance_schema`.`t1`
SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type
WHERE object_schema='test';
object_schema object_name
diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result
index c5e0ebf3c92..79d69b87ca7 100644
--- a/mysql-test/suite/perfschema/r/privilege.result
+++ b/mysql-test/suite/perfschema/r/privilege.result
@@ -56,9 +56,9 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_
grant TRIGGER on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INSERT on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
grant DELETE on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
grant SELECT on performance_schema.setup_instruments to 'pfs_user_3'@localhost
with GRANT OPTION;
grant UPDATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost
@@ -81,11 +81,11 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_
grant TRIGGER on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INSERT on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
grant UPDATE on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
-ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
grant DELETE on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
grant SELECT on performance_schema.events_waits_current to 'pfs_user_3'@localhost
with GRANT OPTION;
grant ALL on performance_schema.file_instances to 'pfs_user_3'@localhost
@@ -106,11 +106,11 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_
grant TRIGGER on performance_schema.file_instances to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant INSERT on performance_schema.file_instances to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
grant UPDATE on performance_schema.file_instances to 'pfs_user_3'@localhost;
-ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
grant DELETE on performance_schema.file_instances to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
grant SELECT on performance_schema.file_instances to 'pfs_user_3'@localhost
with GRANT OPTION;
grant LOCK TABLES on performance_schema.* to 'pfs_user_3'@localhost
@@ -164,34 +164,34 @@ create table test.t1 like performance_schema.file_instances;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
insert into performance_schema.setup_instruments
set name="foo";
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
insert into performance_schema.events_waits_current
set name="foo";
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
insert into performance_schema.file_instances
set name="foo";
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
lock table performance_schema.setup_instruments read;
unlock tables;
lock table performance_schema.setup_instruments write;
unlock tables;
lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
unlock tables;
lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
unlock tables;
lock table performance_schema.file_instances read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
unlock tables;
lock table performance_schema.file_instances write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
unlock tables;
#
# WL#4818, NFS2: Can use grants to give normal user access
@@ -263,34 +263,34 @@ create table test.t1 like performance_schema.file_instances;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
insert into performance_schema.setup_instruments
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`setup_instruments`
insert into performance_schema.events_waits_current
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`events_waits_current`
insert into performance_schema.file_instances
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`file_instances`
delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`setup_instruments`
delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`events_waits_current`
delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`file_instances`
lock table performance_schema.setup_instruments read;
unlock tables;
lock table performance_schema.setup_instruments write;
unlock tables;
lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`events_waits_current`
unlock tables;
lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`events_waits_current`
unlock tables;
lock table performance_schema.file_instances read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`file_instances`
unlock tables;
lock table performance_schema.file_instances write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`file_instances`
unlock tables;
#
# WL#4818, NFS2: Can use grants to give normal user access
@@ -363,34 +363,34 @@ create table test.t1 like performance_schema.file_instances;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
insert into performance_schema.setup_instruments
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`setup_instruments`
insert into performance_schema.events_waits_current
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`events_waits_current`
insert into performance_schema.file_instances
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`file_instances`
delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`setup_instruments`
delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`events_waits_current`
delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`file_instances`
lock table performance_schema.setup_instruments read;
unlock tables;
lock table performance_schema.setup_instruments write;
unlock tables;
lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`events_waits_current`
unlock tables;
lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`events_waits_current`
unlock tables;
lock table performance_schema.file_instances read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`file_instances`
unlock tables;
lock table performance_schema.file_instances write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`file_instances`
unlock tables;
#
# WL#4818, NFS2: Can use grants to give normal user access
@@ -463,34 +463,34 @@ create table test.t1 like performance_schema.file_instances;
ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
insert into performance_schema.setup_instruments
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`setup_instruments`
insert into performance_schema.events_waits_current
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_current`
insert into performance_schema.file_instances
set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_instances`
delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`setup_instruments`
delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_current`
delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_instances`
lock table performance_schema.setup_instruments read;
unlock tables;
lock table performance_schema.setup_instruments write;
unlock tables;
lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_current`
unlock tables;
lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_current`
unlock tables;
lock table performance_schema.file_instances read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_instances`
unlock tables;
lock table performance_schema.file_instances write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_instances`
unlock tables;
#
# WL#4818, NFS2: Can use grants to give normal user access
@@ -499,16 +499,16 @@ unlock tables;
# Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3.
# (Except for events_waits_current, which is granted.)
SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1;
-ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_history`
SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1;
-ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_history_long`
SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1;
can select
can select
SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1;
-ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1;
-ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_summary_by_instance`
disconnect con3;
connection default;
revoke all privileges, grant option from 'pfs_user_1'@localhost;
@@ -529,15 +529,15 @@ connect pfs_user_4, localhost, pfs_user_4, , ;
connection pfs_user_4;
# Select as pfs_user_4 should fail without grant
SELECT event_id FROM performance_schema.events_waits_history;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_history`
SELECT event_id FROM performance_schema.events_waits_history_long;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_history_long`
SELECT event_id FROM performance_schema.events_waits_current;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_current`
SELECT event_name FROM performance_schema.events_waits_summary_by_instance;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
SELECT event_name FROM performance_schema.file_summary_by_instance;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`file_summary_by_instance`
#
# WL#4818, NFS3: Normal user does not have access to change what is
# instrumented without grants
@@ -546,21 +546,21 @@ connection pfs_user_4;
# User pfs_user_4 should not be allowed to tweak instrumentation without
# explicit grant
UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
-ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_instruments'
+ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`setup_instruments`
UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/synch/mutex/%'
OR name LIKE 'wait/synch/rwlock/%';
-ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_instruments'
+ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`setup_instruments`
UPDATE performance_schema.setup_consumers SET enabled = 'YES';
-ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_consumers'
+ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`setup_consumers`
UPDATE performance_schema.setup_timers SET timer_name = 'TICK';
-ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_timers'
+ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`setup_timers`
TRUNCATE TABLE performance_schema.events_waits_history_long;
-ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_history_long`
TRUNCATE TABLE performance_schema.events_waits_history;
-ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history'
+ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_history`
TRUNCATE TABLE performance_schema.events_waits_current;
-ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_current'
+ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_current`
#
# WL#4814, NFS1: Can use grants to give normal user access
# to turn on and off instrumentation
diff --git a/mysql-test/suite/perfschema/r/setup_actors.result b/mysql-test/suite/perfschema/r/setup_actors.result
index b6d528173bf..4fda296fc5a 100644
--- a/mysql-test/suite/perfschema/r/setup_actors.result
+++ b/mysql-test/suite/perfschema/r/setup_actors.result
@@ -115,7 +115,7 @@ from performance_schema.threads
where PROCESSLIST_ID = connection_id();
connect con5, localhost, user5, , ;
select * from performance_schema.threads;
-ERROR 42000: SELECT command denied to user 'user5'@'localhost' for table 'threads'
+ERROR 42000: SELECT command denied to user 'user5'@'localhost' for table `performance_schema`.`threads`
select * from test.v1;
NAME TYPE INSTRUMENTED PROCESSLIST_USER PROCESSLIST_HOST
thread/sql/one_connection FOREGROUND YES user5 localhost
diff --git a/mysql-test/suite/perfschema/r/setup_actors_enabled.result b/mysql-test/suite/perfschema/r/setup_actors_enabled.result
index c0dda748f28..f71cfdbd47a 100644
--- a/mysql-test/suite/perfschema/r/setup_actors_enabled.result
+++ b/mysql-test/suite/perfschema/r/setup_actors_enabled.result
@@ -72,7 +72,7 @@ flush privileges;
connect con2, localhost, user2, , ;
update performance_schema.setup_actors
set ENABLED='NO';
-ERROR 42000: UPDATE command denied to user 'user2'@'localhost' for table 'setup_actors'
+ERROR 42000: UPDATE command denied to user 'user2'@'localhost' for table `performance_schema`.`setup_actors`
disconnect con2;
connection default;
insert into performance_schema.setup_actors
diff --git a/mysql-test/suite/roles/definer.result b/mysql-test/suite/roles/definer.result
index 49ff21845eb..8b5e36d8b3c 100644
--- a/mysql-test/suite/roles/definer.result
+++ b/mysql-test/suite/roles/definer.result
@@ -50,9 +50,9 @@ a+b c current_role()
select * from test.v3;
ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
create definer=role4 view test.v4 as select a+b,c from t1;
-ERROR 42000: ANY command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: ANY command denied to user 'foo'@'localhost' for table `mysqltest1`.`t1`
select * from t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t1`
set role role4;
select * from t1;
a b c
@@ -113,7 +113,7 @@ tr1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE
insert t1 values (111, 222, 333) latin1 latin1_swedish_ci latin1_swedish_ci #
set role none;
insert t2 values (11,22,33);
-ERROR 42000: INSERT command denied to user ''@'' for table 't1'
+ERROR 42000: INSERT command denied to user ''@'' for table `mysqltest1`.`t1`
select * from t1;
a b c
1 10 100
@@ -179,7 +179,7 @@ pr1 STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE
insert t1 values (111, 222, 333) latin1 latin1_swedish_ci latin1_swedish_ci
set role none;
call pr1();
-ERROR 42000: INSERT command denied to user ''@'' for table 't1'
+ERROR 42000: INSERT command denied to user ''@'' for table `mysqltest1`.`t1`
select * from t1;
a b c
1 10 100
diff --git a/mysql-test/suite/roles/recursive.result b/mysql-test/suite/roles/recursive.result
index 0d45a0e03d0..05f28745f02 100644
--- a/mysql-test/suite/roles/recursive.result
+++ b/mysql-test/suite/roles/recursive.result
@@ -49,7 +49,7 @@ show status like 'debug%';
Variable_name Value
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role role10;
select count(*) from mysql.roles_mapping;
count(*)
@@ -99,7 +99,7 @@ count(*)
set role none;
set role role10;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role none;
connection default;
grant select on mysql.* to role1;
@@ -107,7 +107,7 @@ show status like 'debug%';
Variable_name Value
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role role10;
select count(*) from mysql.roles_mapping;
count(*)
@@ -142,7 +142,7 @@ show status like 'debug%';
Variable_name Value
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role none;
connection default;
grant select on mysql.roles_mapping to role1;
@@ -150,7 +150,7 @@ show status like 'debug%';
Variable_name Value
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role role10;
select count(*) from mysql.roles_mapping;
count(*)
@@ -185,7 +185,7 @@ show status like 'debug%';
Variable_name Value
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role none;
connection default;
grant select(User) on mysql.roles_mapping to role1;
@@ -193,7 +193,7 @@ show status like 'debug%';
Variable_name Value
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role role10;
select count(concat(User,Host,Role)) from mysql.roles_mapping;
ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'Host' in table 'roles_mapping'
@@ -275,7 +275,7 @@ show status like 'debug%';
Variable_name Value
connection foo;
select count(concat(Host)) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role none;
connection default;
create procedure pr1() select "pr1";
diff --git a/mysql-test/suite/roles/recursive_dbug.result b/mysql-test/suite/roles/recursive_dbug.result
index 6a86df655e7..55bbad51c09 100644
--- a/mysql-test/suite/roles/recursive_dbug.result
+++ b/mysql-test/suite/roles/recursive_dbug.result
@@ -63,7 +63,7 @@ Debug_role_merges_column 0
Debug_role_merges_routine 0
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role role10;
select count(*) from mysql.roles_mapping;
count(*)
@@ -118,7 +118,7 @@ count(*)
set role none;
set role role10;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role none;
connection default;
grant select on mysql.* to role1;
@@ -131,7 +131,7 @@ Debug_role_merges_column 0
Debug_role_merges_routine 0
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role role10;
select count(*) from mysql.roles_mapping;
count(*)
@@ -171,7 +171,7 @@ Debug_role_merges_column 0
Debug_role_merges_routine 0
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role none;
connection default;
grant select on mysql.roles_mapping to role1;
@@ -184,7 +184,7 @@ Debug_role_merges_column 0
Debug_role_merges_routine 0
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role role10;
select count(*) from mysql.roles_mapping;
count(*)
@@ -224,7 +224,7 @@ Debug_role_merges_column 0
Debug_role_merges_routine 0
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role none;
connection default;
grant select(User) on mysql.roles_mapping to role1;
@@ -237,7 +237,7 @@ Debug_role_merges_column 9
Debug_role_merges_routine 0
connection foo;
select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role role10;
select count(concat(User,Host,Role)) from mysql.roles_mapping;
ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'Host' in table 'roles_mapping'
@@ -334,7 +334,7 @@ Debug_role_merges_column 30
Debug_role_merges_routine 0
connection foo;
select count(concat(Host)) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
set role none;
connection default;
create procedure pr1() select "pr1";
diff --git a/mysql-test/suite/roles/role_case_sensitive-10744.result b/mysql-test/suite/roles/role_case_sensitive-10744.result
index 2f27db1525a..8cb45b13ae0 100644
--- a/mysql-test/suite/roles/role_case_sensitive-10744.result
+++ b/mysql-test/suite/roles/role_case_sensitive-10744.result
@@ -44,7 +44,7 @@ show tables from secret_db;
Tables_in_secret_db
t1
select * from secret_db.t1;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `secret_db`.`t1`
insert into secret_db.t1 values ("|-|4><");
set role test_role;
select * from secret_db.t1 order by secret;
@@ -52,7 +52,7 @@ secret
Some Secret P4ssw0rd
|-|4><
insert into secret_db.t1 values ("|_33T|-|4><");
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `secret_db`.`t1`
connection default;
drop role test_ROLE;
drop role test_role;
diff --git a/mysql-test/suite/roles/role_grant_propagate-29458.result b/mysql-test/suite/roles/role_grant_propagate-29458.result
index 28aa053f38a..88d3c0e38fb 100644
--- a/mysql-test/suite/roles/role_grant_propagate-29458.result
+++ b/mysql-test/suite/roles/role_grant_propagate-29458.result
@@ -81,7 +81,7 @@ grant alter routine on procedure some_db.p1 to r_active_proc;
grant alter routine on function some_db.f1 to r_active_func;
connect con1, localhost, foo,,;
select * from some_db.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `some_db`.`t1`
#
# Before MDEV-29458 fix, all these commands would return
# ER_TABLEACCESS_DENIED_ERROR
diff --git a/mysql-test/suite/roles/roles_tables_priv-29465.result b/mysql-test/suite/roles/roles_tables_priv-29465.result
index 1e0721956b4..85ab188145e 100644
--- a/mysql-test/suite/roles/roles_tables_priv-29465.result
+++ b/mysql-test/suite/roles/roles_tables_priv-29465.result
@@ -18,7 +18,7 @@ localhost mysql mariadb.sys global_priv root@localhost 0000-00-00 00:00:00 Selec
some_db r_select_column t1 root@localhost 0000-00-00 00:00:00 Select
connect con1, localhost, foo,,;
insert into some_db.t1(a) values (1);
-ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table `some_db`.`t1`
set role r_active_column;
insert into some_db.t1(a) values (1);
disconnect con1;
@@ -26,10 +26,10 @@ connection default;
revoke insert(a) on some_db.t1 from r_active_column;
connect con1, localhost, foo,,;
insert into some_db.t1(a) values (1);
-ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table `some_db`.`t1`
set role r_active_column;
insert into some_db.t1(a) values (1);
-ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table `some_db`.`t1`
disconnect con1;
connection default;
drop role r_select_column;
diff --git a/mysql-test/suite/roles/set_and_drop.result b/mysql-test/suite/roles/set_and_drop.result
index 87ccad2b447..e52a82bd77b 100644
--- a/mysql-test/suite/roles/set_and_drop.result
+++ b/mysql-test/suite/roles/set_and_drop.result
@@ -18,7 +18,7 @@ connect foo,localhost,foo;
flush tables;
ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
show tables from mysqltest1;
ERROR 42000: Access denied for user 'foo'@'localhost' to database 'mysqltest1'
set role role1;
@@ -38,7 +38,7 @@ a b
1 2
3 4
select * from mysqltest1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t2`
select a from mysqltest1.t2;
a
5
@@ -64,11 +64,11 @@ ROLE_NAME
role1
flush tables;
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
select * from mysqltest1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t1`
select a from mysqltest1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t2`
set role none;
connection default;
grant reload on *.* to role1;
@@ -92,7 +92,7 @@ a b
1 2
3 4
select * from mysqltest1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t2`
select a from mysqltest1.t2;
a
5
@@ -105,11 +105,11 @@ drop role role1;
connection foo;
flush tables;
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
select * from mysqltest1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t1`
select a from mysqltest1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t2`
show grants;
Grants for foo@localhost
GRANT USAGE ON *.* TO `foo`@`localhost`
diff --git a/mysql-test/suite/roles/set_default_role_clear.result b/mysql-test/suite/roles/set_default_role_clear.result
index d8508f5d0d6..8a3ae908435 100644
--- a/mysql-test/suite/roles/set_default_role_clear.result
+++ b/mysql-test/suite/roles/set_default_role_clear.result
@@ -8,7 +8,7 @@ GRANT `test_role` TO `test_user`@`localhost`
GRANT USAGE ON *.* TO `test_user`@`localhost`
set default role test_role;
select user, host, default_role from mysql.user;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
select user, host, default_role from mysql.user where user='test_user';
User Host default_role
test_user localhost test_role
@@ -31,6 +31,6 @@ select user, host, default_role from mysql.user where user='test_user';
User Host default_role
test_user localhost
select user, host, default_role from mysql.user;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
drop role test_role;
drop user test_user@localhost;
diff --git a/mysql-test/suite/roles/set_default_role_for.result b/mysql-test/suite/roles/set_default_role_for.result
index 3ddf48eb416..57a1471126c 100644
--- a/mysql-test/suite/roles/set_default_role_for.result
+++ b/mysql-test/suite/roles/set_default_role_for.result
@@ -45,7 +45,7 @@ GRANT USAGE ON *.* TO `user_b`@`localhost`
GRANT INSERT, UPDATE ON *.* TO `role_b`
SET DEFAULT ROLE `role_b` FOR `user_b`@`localhost`
select user, host, default_role from mysql.user where user like 'user_%';
-ERROR 42000: SELECT command denied to user 'user_b'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'user_b'@'localhost' for table `mysql`.`user`
set default role NONE for user_a@localhost;
show grants;
Grants for user_a@localhost
@@ -53,7 +53,7 @@ GRANT `role_a` TO `user_a`@`localhost`
GRANT USAGE ON *.* TO `user_a`@`localhost`
GRANT INSERT, UPDATE ON *.* TO `role_b`
select user, host, default_role from mysql.user where user like 'user_%';
-ERROR 42000: SELECT command denied to user 'user_a'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'user_a'@'localhost' for table `mysql`.`user`
drop role role_a;
drop role role_b;
drop user user_a@localhost;
diff --git a/mysql-test/suite/roles/set_default_role_invalid.result b/mysql-test/suite/roles/set_default_role_invalid.result
index eb3924dc617..12e2c035a7d 100644
--- a/mysql-test/suite/roles/set_default_role_invalid.result
+++ b/mysql-test/suite/roles/set_default_role_invalid.result
@@ -8,14 +8,14 @@ Grants for test_user@localhost
GRANT `test_role` TO `test_user`@`localhost`
GRANT USAGE ON *.* TO `test_user`@`localhost`
select user, host, default_role from mysql.user;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
set default role invalid_role;
ERROR OP000: Invalid role specification `invalid_role`
set default role not_granted_role;
ERROR OP000: Invalid role specification `not_granted_role`
set default role test_role;
select user, host, default_role from mysql.user;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
select user, host, default_role from mysql.user where user='test_user';
User Host default_role
test_user localhost test_role
@@ -35,7 +35,7 @@ User Host default_role
test_user localhost test_role
revoke test_role from test_user@localhost;
select user, host, default_role from mysql.user where user='test_user';
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
drop role test_role;
drop role not_granted_role;
drop user test_user@localhost;
diff --git a/mysql-test/suite/roles/set_default_role_new_connection.result b/mysql-test/suite/roles/set_default_role_new_connection.result
index 5c51b782ab7..95c712746db 100644
--- a/mysql-test/suite/roles/set_default_role_new_connection.result
+++ b/mysql-test/suite/roles/set_default_role_new_connection.result
@@ -8,10 +8,10 @@ Grants for test_user@localhost
GRANT `test_role` TO `test_user`@`localhost`
GRANT USAGE ON *.* TO `test_user`@`localhost`
select user, host, default_role from mysql.user where user = 'test_user';
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
set default role test_role;
select user, host, default_role from mysql.user where user = 'test_user';
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
disconnect c1;
connection default;
select user, host, default_role from mysql.user where user = 'test_user';
@@ -39,7 +39,7 @@ Grants for test_user@localhost
GRANT `test_role` TO `test_user`@`localhost`
GRANT USAGE ON *.* TO `test_user`@`localhost`
select user, host, default_role from mysql.user where user = 'test_user';
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
disconnect c1;
connection default;
select user, host, default_role from mysql.user where user = 'test_user';
diff --git a/mysql-test/suite/roles/set_role-5232.result b/mysql-test/suite/roles/set_role-5232.result
index 31cb4b105ec..6158c95e5c0 100644
--- a/mysql-test/suite/roles/set_role-5232.result
+++ b/mysql-test/suite/roles/set_role-5232.result
@@ -8,7 +8,7 @@ select user(), current_user();
user() current_user()
c@localhost @localhost
select user from mysql.user group by user;
-ERROR 42000: SELECT command denied to user ''@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user ''@'localhost' for table `mysql`.`user`
set role r1;
ERROR OP000: Invalid role specification `r1`
disconnect c;
diff --git a/mysql-test/suite/roles/set_role-database-recursive.result b/mysql-test/suite/roles/set_role-database-recursive.result
index bc3914413a3..be31e645362 100644
--- a/mysql-test/suite/roles/set_role-database-recursive.result
+++ b/mysql-test/suite/roles/set_role-database-recursive.result
@@ -24,7 +24,7 @@ user host
grant select on mysql.* to test_role2;
flush privileges;
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
select current_user(), current_role();
current_user() current_role()
test_user@localhost NULL
@@ -44,7 +44,7 @@ select current_user(), current_role();
current_user() current_role()
test_user@localhost NULL
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
set role test_role2;
select current_user(), current_role();
current_user() current_role()
@@ -62,7 +62,7 @@ create role test_role4;
grant test_role4 to test_role3;
set role test_role1;
delete from mysql.user where user='no such user';
-ERROR 42000: DELETE command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: DELETE command denied to user 'test_user'@'localhost' for table `mysql`.`user`
grant delete on mysql.* to test_role4;
set role test_role1;
delete from mysql.user where user='no such user';
diff --git a/mysql-test/suite/roles/set_role-database-simple.result b/mysql-test/suite/roles/set_role-database-simple.result
index a48f04985bb..969a7ab10fa 100644
--- a/mysql-test/suite/roles/set_role-database-simple.result
+++ b/mysql-test/suite/roles/set_role-database-simple.result
@@ -14,7 +14,7 @@ grant select on mysql.* to test_role1;
grant insert, delete on mysql.roles_mapping to test_role1;
grant reload on *.* to test_role1;
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
select current_user(), current_role();
current_user() current_role()
test_user@localhost NULL
@@ -27,7 +27,7 @@ Host User Role Admin_option
localhost root test_role1 Y
localhost test_user test_role1 N
insert into mysql.user (user, host) values ('Dummy', 'Dummy');
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
insert into mysql.roles_mapping values ('localhost', 'test_user', 'test_role2', 'N');
delete from mysql.roles_mapping where Role='test_role2';
use mysql;
@@ -38,13 +38,13 @@ test_user@localhost NULL
use mysql;
ERROR 42000: Access denied for user 'test_user'@'localhost' to database 'mysql'
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
insert into mysql.user (user, host) values ('Dummy', 'Dummy');
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
insert into mysql.roles_mapping values ('localhost', 'test_user', 'test_role2', 'N');
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
delete from mysql.roles_mapping where Role='test_role2';
-ERROR 42000: DELETE command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: DELETE command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
drop user 'test_user'@'localhost';
revoke select on mysql.* from test_role1;
revoke insert, delete on mysql.roles_mapping from test_role1;
diff --git a/mysql-test/suite/roles/set_role-multiple-role.result b/mysql-test/suite/roles/set_role-multiple-role.result
index 2ddd1e8a510..e4cb3b8542c 100644
--- a/mysql-test/suite/roles/set_role-multiple-role.result
+++ b/mysql-test/suite/roles/set_role-multiple-role.result
@@ -22,7 +22,7 @@ grant r_drp to test_user@localhost;
grant r_rld to test_user@localhost;
flush privileges;
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
show grants;
Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -83,7 +83,7 @@ GRANT `r_rld` TO `test_user`@`localhost`
GRANT `r_sel` TO `test_user`@`localhost`
GRANT `r_upd` TO `test_user`@`localhost`
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
insert into mysql.roles_mapping values ('', 'r_sel', 'r_rld', 'N');
flush privileges;
ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
@@ -139,7 +139,7 @@ select current_user(), current_role();
current_user() current_role()
test_user@localhost r_sel
insert into mysql.random_test_table values (1);
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 'random_test_table'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `mysql`.`random_test_table`
drop table mysql.random_test_table;
delete from mysql.user where user like 'r\_%';
delete from mysql.roles_mapping where Role like 'r\_%';
diff --git a/mysql-test/suite/roles/set_role-recursive.result b/mysql-test/suite/roles/set_role-recursive.result
index 102ee392581..f93a731bedb 100644
--- a/mysql-test/suite/roles/set_role-recursive.result
+++ b/mysql-test/suite/roles/set_role-recursive.result
@@ -23,7 +23,7 @@ select * from mysql.user where user like 'test_role2';
Host User Password Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Reload_priv Shutdown_priv Process_priv File_priv Grant_priv References_priv Index_priv Alter_priv Show_db_priv Super_priv Create_tmp_table_priv Lock_tables_priv Execute_priv Repl_slave_priv Repl_client_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Create_user_priv Event_priv Trigger_priv Create_tablespace_priv Delete_history_priv ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections max_user_connections plugin authentication_string password_expired is_role default_role max_statement_time
test_role2 Y N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 0 0 0 0 N Y 0.000000
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
show grants;
Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -61,7 +61,7 @@ Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
GRANT `test_role1` TO `test_user`@`localhost`
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
show grants;
Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -76,7 +76,7 @@ Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
GRANT `test_role1` TO `test_user`@`localhost`
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
show grants;
Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -111,7 +111,7 @@ Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
GRANT `test_role1` TO `test_user`@`localhost`
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
delete from mysql.user where user='test_role1';
delete from mysql.user where user='test_role2';
delete from mysql.roles_mapping;
diff --git a/mysql-test/suite/roles/set_role-simple.result b/mysql-test/suite/roles/set_role-simple.result
index 59e61d4836a..c603f727fd1 100644
--- a/mysql-test/suite/roles/set_role-simple.result
+++ b/mysql-test/suite/roles/set_role-simple.result
@@ -15,7 +15,7 @@ select * from mysql.user where user='test_role1';
Host User Password Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Reload_priv Shutdown_priv Process_priv File_priv Grant_priv References_priv Index_priv Alter_priv Show_db_priv Super_priv Create_tmp_table_priv Lock_tables_priv Execute_priv Repl_slave_priv Repl_client_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Create_user_priv Event_priv Trigger_priv Create_tablespace_priv Delete_history_priv ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections max_user_connections plugin authentication_string password_expired is_role default_role max_statement_time
test_role1 Y N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 0 0 0 0 N Y 0.000000
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
show grants;
Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -41,7 +41,7 @@ select current_user(), current_role();
current_user() current_role()
test_user@localhost NULL
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
delete from mysql.user where user='test_role1';
delete from mysql.roles_mapping where Role='test_role1';
flush privileges;
diff --git a/mysql-test/suite/roles/set_role-table-column-priv.result b/mysql-test/suite/roles/set_role-table-column-priv.result
index 4aaa0388170..e0e8732e7a5 100644
--- a/mysql-test/suite/roles/set_role-table-column-priv.result
+++ b/mysql-test/suite/roles/set_role-table-column-priv.result
@@ -17,7 +17,7 @@ localhost root test_role2 Y
localhost test_user test_role1 N
grant select (Role) on mysql.roles_mapping to test_role2;
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
show grants;
Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -59,7 +59,7 @@ select current_user(), current_role();
current_user() current_role()
test_user@localhost NULL
select Role from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
drop user 'test_user'@'localhost';
select * from mysql.tables_priv;
Host Db User Table_name Grantor Timestamp Table_priv Column_priv
diff --git a/mysql-test/suite/roles/set_role-table-simple.result b/mysql-test/suite/roles/set_role-table-simple.result
index f33df34d85e..3f1a68eeaa0 100644
--- a/mysql-test/suite/roles/set_role-table-simple.result
+++ b/mysql-test/suite/roles/set_role-table-simple.result
@@ -17,7 +17,7 @@ localhost root test_role2 Y
localhost test_user test_role1 N
grant select on mysql.roles_mapping to test_role2;
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
show grants;
Grants for test_user@localhost
GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -57,7 +57,7 @@ select current_user(), current_role();
current_user() current_role()
test_user@localhost NULL
select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
drop user 'test_user'@'localhost';
select * from mysql.tables_priv;
Host Db User Table_name Grantor Timestamp Table_priv Column_priv
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence.result
deleted file mode 100644
index aa9fb34ec02..00000000000
--- a/mysql-test/suite/rpl/r/rpl_row_img_sequence.result
+++ /dev/null
@@ -1,2290 +0,0 @@
-include/rpl_init.inc [topology=1->2->3]
-connection server_1;
-connection server_2;
-connection server_3;
-connection server_1;
-#
-# Test Case 1) binlog_row_image=MINIMAL should write only columns
-# 1 and 8 to the binary log
-#
-CON: 'server_1', IMG: 'MINIMAL', RESTART SLAVE: 'N'
-connection server_1;
-SET SESSION binlog_row_image= 'MINIMAL';
-SET GLOBAL binlog_row_image= 'MINIMAL';
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image MINIMAL
-CON: 'server_2', IMG: 'MINIMAL', RESTART SLAVE: 'Y'
-connection server_2;
-SET SESSION binlog_row_image= 'MINIMAL';
-SET GLOBAL binlog_row_image= 'MINIMAL';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image MINIMAL
-CON: 'server_3', IMG: 'MINIMAL', RESTART SLAVE: 'Y'
-connection server_3;
-SET SESSION binlog_row_image= 'MINIMAL';
-SET GLOBAL binlog_row_image= 'MINIMAL';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image MINIMAL
-connection server_1;
-### engines: MyISAM, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-#
-# Test Case 2) binlog_row_image=NOBLOB should write all columns to the
-# binary log
-#
-CON: 'server_1', IMG: 'NOBLOB', RESTART SLAVE: 'N'
-connection server_1;
-SET SESSION binlog_row_image= 'NOBLOB';
-SET GLOBAL binlog_row_image= 'NOBLOB';
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image NOBLOB
-CON: 'server_2', IMG: 'NOBLOB', RESTART SLAVE: 'Y'
-connection server_2;
-SET SESSION binlog_row_image= 'NOBLOB';
-SET GLOBAL binlog_row_image= 'NOBLOB';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image NOBLOB
-CON: 'server_3', IMG: 'NOBLOB', RESTART SLAVE: 'Y'
-connection server_3;
-SET SESSION binlog_row_image= 'NOBLOB';
-SET GLOBAL binlog_row_image= 'NOBLOB';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image NOBLOB
-connection server_3;
-### engines: MyISAM, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-#
-# Test Case 3) binlog_row_image=NOBLOB should write all columns to the
-# binary log
-#
-CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
-connection server_1;
-SET SESSION binlog_row_image= 'FULL';
-SET GLOBAL binlog_row_image= 'FULL';
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image FULL
-CON: 'server_2', IMG: 'FULL', RESTART SLAVE: 'Y'
-connection server_2;
-SET SESSION binlog_row_image= 'FULL';
-SET GLOBAL binlog_row_image= 'FULL';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image FULL
-CON: 'server_3', IMG: 'FULL', RESTART SLAVE: 'Y'
-connection server_3;
-SET SESSION binlog_row_image= 'FULL';
-SET GLOBAL binlog_row_image= 'FULL';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name Value
-binlog_row_image FULL
-connection server_3;
-### engines: MyISAM, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-include/rpl_end.inc
-# End of tests
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result
new file mode 100644
index 00000000000..2303911637f
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result
@@ -0,0 +1,767 @@
+include/rpl_init.inc [topology=1->2->3]
+connection server_1;
+connection server_2;
+connection server_3;
+connection server_1;
+#
+# binlog_row_image=FULL should write all columns to the binary log
+#
+CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+CON: 'server_2', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+CON: 'server_3', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+connection server_1;
+### engines: MyISAM, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+include/rpl_end.inc
+# End of tests
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result
new file mode 100644
index 00000000000..eaf770f245c
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result
@@ -0,0 +1,797 @@
+include/rpl_init.inc [topology=1->2->3]
+connection server_1;
+connection server_2;
+connection server_3;
+connection server_1;
+#
+# binlog_row_image=MINIMAL should write only columns 1 and 8 to the
+# binary log
+#
+CON: 'server_1', IMG: 'MINIMAL', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'MINIMAL';
+SET GLOBAL binlog_row_image= 'MINIMAL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image MINIMAL
+CON: 'server_2', IMG: 'MINIMAL', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'MINIMAL';
+SET GLOBAL binlog_row_image= 'MINIMAL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image MINIMAL
+CON: 'server_3', IMG: 'MINIMAL', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'MINIMAL';
+SET GLOBAL binlog_row_image= 'MINIMAL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image MINIMAL
+connection server_1;
+### engines: MyISAM, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+CON: 'server_2', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+CON: 'server_3', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+connection server_3;
+include/rpl_end.inc
+# End of tests
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result
new file mode 100644
index 00000000000..496bd8dc6b8
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result
@@ -0,0 +1,796 @@
+include/rpl_init.inc [topology=1->2->3]
+connection server_1;
+connection server_2;
+connection server_3;
+connection server_1;
+#
+# binlog_row_image=NOBLOB should write all columns to the binary logs
+#
+CON: 'server_1', IMG: 'NOBLOB', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'NOBLOB';
+SET GLOBAL binlog_row_image= 'NOBLOB';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image NOBLOB
+CON: 'server_2', IMG: 'NOBLOB', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'NOBLOB';
+SET GLOBAL binlog_row_image= 'NOBLOB';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image NOBLOB
+CON: 'server_3', IMG: 'NOBLOB', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'NOBLOB';
+SET GLOBAL binlog_row_image= 'NOBLOB';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image NOBLOB
+connection server_1;
+### engines: MyISAM, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+CON: 'server_2', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+CON: 'server_3', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name Value
+binlog_row_image FULL
+connection server_3;
+include/rpl_end.inc
+# End of tests
diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
index 3c3fed4d9cf..0bb3d9dc52a 100644
--- a/mysql-test/suite/rpl/r/rpl_sp.result
+++ b/mysql-test/suite/rpl/r/rpl_sp.result
@@ -305,7 +305,7 @@ a
100
connection con1;
create trigger trg before insert on t1 for each row set new.a= 10;
-ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table `mysqltest1`.`t1`
connection master;
delete from t1;
create trigger trg before insert on t1 for each row set new.a= 10;
diff --git a/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test b/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
index 3a4a24e1762..8c4baafe23d 100644
--- a/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
+++ b/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
@@ -13,6 +13,7 @@
# during this window while forcing a rotation in the binlog.
#
--source include/have_debug.inc
+--source include/have_debug_sync.inc
--source include/master-slave.inc
--connection master
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf
index 7104b4e4502..7104b4e4502 100644
--- a/mysql-test/suite/rpl/t/rpl_row_img_sequence.cnf
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.test b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.test
new file mode 100644
index 00000000000..a0c6aa4dc7a
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.test
@@ -0,0 +1,48 @@
+#
+# Purpose:
+# The rpl_row_img_sequence group of tests verify that sequence MDL updates,
+# i.e. NEXTVAL and SETVAL, respect the binlog_row_image variable value when
+# written into the binary log. In particular, it ensures that only changed
+# columns are written with MINIMAL image mode, and all columns are written
+# otherwise. This test focuses on validating the behavior of
+# binlog_row_img=FULL.
+#
+# Methodology
+# After issuing a sequence update, ensure that both 1) it was replicated
+# correctly, and 2) it was binlogged respective to the binlog_row_image value.
+# The sequence table does not use caching to ensure each update is immediately
+# binlogged. Each command is binlogged into its own unique log file, and the
+# entirety of the file is analyzed for correctness of its sequence event.
+# Specifically, mysqlbinlog is used in verbose mode so it outputs the columns
+# which belong to the event, and the columns are analyzed to ensure the correct
+# ones were logged. rpl_row_img_general_loop.inc is used to test with multiple
+# chained replicas, varying engines between InnoDB and MyISAM.
+#
+# References:
+# MDEV-28487: sequences not respect value of binlog_row_image with select
+# nextval(seq_gen)
+#
+
+--let $rpl_topology= 1->2->3
+--source include/rpl_init.inc
+--source include/have_binlog_format_row.inc
+
+--connection server_1
+--source include/have_innodb.inc
+--connection server_2
+--source include/have_innodb.inc
+--connection server_3
+--source include/have_innodb.inc
+--connection server_1
+
+--echo #
+--echo # binlog_row_image=FULL should write all columns to the binary log
+--echo #
+--let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
+--source include/rpl_row_img_set.inc
+--let $expected_columns=(1,2,3,4,5,6,7,8)
+--let row_img_test_script= include/rpl_row_img_sequence.inc
+--source include/rpl_row_img_general_loop.inc
+
+--source include/rpl_end.inc
+--echo # End of tests
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf
new file mode 100644
index 00000000000..7104b4e4502
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf
@@ -0,0 +1,21 @@
+!include include/default_mysqld.cnf
+
+[mysqld.1]
+log-slave-updates
+innodb
+gtid_domain_id=0
+
+[mysqld.2]
+log-slave-updates
+innodb
+gtid_domain_id=1
+
+[mysqld.3]
+log-slave-updates
+innodb
+gtid_domain_id=2
+
+[ENV]
+SERVER_MYPORT_1= @mysqld.1.port
+SERVER_MYPORT_2= @mysqld.2.port
+SERVER_MYPORT_3= @mysqld.3.port
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence.test b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.test
index 23860fb2de5..0a3b2827ffa 100644
--- a/mysql-test/suite/rpl/t/rpl_row_img_sequence.test
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.test
@@ -1,9 +1,11 @@
#
# Purpose:
-# This test verifies that sequence DML updates, i.e. NEXTVAL and SETVAL,
-# respect the binlog_row_image variable value when written into the binary log.
-# In particular, it ensures that only changed columns are written with MINIMAL
-# image mode, and all columns are written otherwise.
+# The rpl_row_img_sequence group of tests verify that sequence MDL updates,
+# i.e. NEXTVAL and SETVAL, respect the binlog_row_image variable value when
+# written into the binary log. In particular, it ensures that only changed
+# columns are written with MINIMAL image mode, and all columns are written
+# otherwise. This test focuses on validating the behavior of
+# binlog_row_img=MINIMAL.
#
# Methodology
# After issuing a sequence update, ensure that both 1) it was replicated
@@ -34,8 +36,8 @@
--connection server_1
--echo #
---echo # Test Case 1) binlog_row_image=MINIMAL should write only columns
---echo # 1 and 8 to the binary log
+--echo # binlog_row_image=MINIMAL should write only columns 1 and 8 to the
+--echo # binary log
--echo #
--let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y
--source include/rpl_row_img_set.inc
@@ -43,23 +45,8 @@
--let row_img_test_script= include/rpl_row_img_sequence.inc
--source include/rpl_row_img_general_loop.inc
---echo #
---echo # Test Case 2) binlog_row_image=NOBLOB should write all columns to the
---echo # binary log
---echo #
---let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y
---source include/rpl_row_img_set.inc
---let $expected_columns=(1,2,3,4,5,6,7,8)
---source include/rpl_row_img_general_loop.inc
-
---echo #
---echo # Test Case 3) binlog_row_image=NOBLOB should write all columns to the
---echo # binary log
---echo #
--let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
--source include/rpl_row_img_set.inc
---let $expected_columns=(1,2,3,4,5,6,7,8)
---source include/rpl_row_img_general_loop.inc
--source include/rpl_end.inc
--echo # End of tests
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf
new file mode 100644
index 00000000000..7104b4e4502
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf
@@ -0,0 +1,21 @@
+!include include/default_mysqld.cnf
+
+[mysqld.1]
+log-slave-updates
+innodb
+gtid_domain_id=0
+
+[mysqld.2]
+log-slave-updates
+innodb
+gtid_domain_id=1
+
+[mysqld.3]
+log-slave-updates
+innodb
+gtid_domain_id=2
+
+[ENV]
+SERVER_MYPORT_1= @mysqld.1.port
+SERVER_MYPORT_2= @mysqld.2.port
+SERVER_MYPORT_3= @mysqld.3.port
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.test b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.test
new file mode 100644
index 00000000000..38ff469f22f
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.test
@@ -0,0 +1,51 @@
+#
+# Purpose:
+# The rpl_row_img_sequence group of tests verify that sequence MDL updates,
+# i.e. NEXTVAL and SETVAL, respect the binlog_row_image variable value when
+# written into the binary log. In particular, it ensures that only changed
+# columns are written with MINIMAL image mode, and all columns are written
+# otherwise. This test focuses on validating the behavior of
+# binlog_row_img=NOBLOB.
+#
+# Methodology
+# After issuing a sequence update, ensure that both 1) it was replicated
+# correctly, and 2) it was binlogged respective to the binlog_row_image value.
+# The sequence table does not use caching to ensure each update is immediately
+# binlogged. Each command is binlogged into its own unique log file, and the
+# entirety of the file is analyzed for correctness of its sequence event.
+# Specifically, mysqlbinlog is used in verbose mode so it outputs the columns
+# which belong to the event, and the columns are analyzed to ensure the correct
+# ones were logged. rpl_row_img_general_loop.inc is used to test with multiple
+# chained replicas, varying engines between InnoDB and MyISAM.
+#
+# References:
+# MDEV-28487: sequences not respect value of binlog_row_image with select
+# nextval(seq_gen)
+#
+
+--let $rpl_topology= 1->2->3
+--source include/rpl_init.inc
+--source include/have_binlog_format_row.inc
+
+--connection server_1
+--source include/have_innodb.inc
+--connection server_2
+--source include/have_innodb.inc
+--connection server_3
+--source include/have_innodb.inc
+--connection server_1
+
+--echo #
+--echo # binlog_row_image=NOBLOB should write all columns to the binary logs
+--echo #
+--let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y
+--source include/rpl_row_img_set.inc
+--let $expected_columns=(1,2,3,4,5,6,7,8)
+--let row_img_test_script= include/rpl_row_img_sequence.inc
+--source include/rpl_row_img_general_loop.inc
+
+--let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
+--source include/rpl_row_img_set.inc
+
+--source include/rpl_end.inc
+--echo # End of tests
diff --git a/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
index 31a9478f632..d1bfbf25bae 100644
--- a/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
+++ b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
@@ -20,6 +20,7 @@
# MDEV-16091: Seconds_Behind_Master spikes to millions of seconds
#
--source include/have_debug.inc
+--source include/have_debug_sync.inc
--source include/have_innodb.inc
--source include/master-slave.inc
diff --git a/mysql-test/suite/sql_sequence/alter_notembedded.result b/mysql-test/suite/sql_sequence/alter_notembedded.result
index 25b33dd742b..f3e1f5f18cd 100644
--- a/mysql-test/suite/sql_sequence/alter_notembedded.result
+++ b/mysql-test/suite/sql_sequence/alter_notembedded.result
@@ -9,12 +9,12 @@ select * from s1;
next_not_cached_value minimum_value maximum_value start_value increment cache_size cycle_option cycle_count
1 1 9223372036854775806 1 1 1000 0 0
select nextval(s1);
-ERROR 42000: INSERT command denied to user 'normal_1'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_1'@'localhost' for table `s_db`.`s1`
show create sequence s1;
Table Create Table
s1 CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=MyISAM
alter sequence s1 restart 50;
-ERROR 42000: ALTER command denied to user 'normal_1'@'localhost' for table 's1'
+ERROR 42000: ALTER command denied to user 'normal_1'@'localhost' for table `s_db`.`s1`
connection default;
grant insert on s_db.s1 to normal_1@'%';
connection m_normal_1;
@@ -22,7 +22,7 @@ select nextval(s1);
nextval(s1)
1
alter sequence s1 restart 50;
-ERROR 42000: ALTER command denied to user 'normal_1'@'localhost' for table 's1'
+ERROR 42000: ALTER command denied to user 'normal_1'@'localhost' for table `s_db`.`s1`
connection default;
grant alter on s_db.s1 to normal_1@'%';
connection m_normal_1;
@@ -31,7 +31,7 @@ select nextval(s1);
nextval(s1)
50
drop sequence s1;
-ERROR 42000: DROP command denied to user 'normal_1'@'localhost' for table 's1'
+ERROR 42000: DROP command denied to user 'normal_1'@'localhost' for table `s_db`.`s1`
connection default;
disconnect m_normal_1;
drop database s_db;
diff --git a/mysql-test/suite/sql_sequence/grant.result b/mysql-test/suite/sql_sequence/grant.result
index 7085d548588..0a69d69fc74 100644
--- a/mysql-test/suite/sql_sequence/grant.result
+++ b/mysql-test/suite/sql_sequence/grant.result
@@ -22,9 +22,9 @@ next_not_cached_value minimum_value maximum_value start_value increment cache_si
11 1 9223372036854775806 1 1 1000 0 0
connection read_only;
select next value for s1;
-ERROR 42000: INSERT command denied to user 'read_only'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'read_only'@'localhost' for table `mysqltest_1`.`s1`
alter sequence s1 restart= 11;
-ERROR 42000: ALTER command denied to user 'read_only'@'localhost' for table 's1'
+ERROR 42000: ALTER command denied to user 'read_only'@'localhost' for table `mysqltest_1`.`s1`
select * from s1;
next_not_cached_value minimum_value maximum_value start_value increment cache_size cycle_option cycle_count
11 1 9223372036854775806 1 1 1000 0 0
@@ -33,7 +33,7 @@ select next value for s1;
next value for s1
11
alter sequence s1 restart= 11;
-ERROR 42000: ALTER command denied to user 'read_write'@'localhost' for table 's1'
+ERROR 42000: ALTER command denied to user 'read_write'@'localhost' for table `mysqltest_1`.`s1`
select * from s1;
next_not_cached_value minimum_value maximum_value start_value increment cache_size cycle_option cycle_count
1011 1 9223372036854775806 1 1 1000 0 0
@@ -47,10 +47,10 @@ next_not_cached_value minimum_value maximum_value start_value increment cache_si
11 1 9223372036854775806 1 1 1000 0 0
connection only_alter;
select next value for s1;
-ERROR 42000: INSERT command denied to user 'only_alter'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'only_alter'@'localhost' for table `mysqltest_1`.`s1`
alter sequence s1 restart= 11;
select * from s1;
-ERROR 42000: SELECT command denied to user 'only_alter'@'localhost' for table 's1'
+ERROR 42000: SELECT command denied to user 'only_alter'@'localhost' for table `mysqltest_1`.`s1`
connection default;
drop database mysqltest_1;
drop user 'normal'@'%';
diff --git a/mysql-test/suite/sql_sequence/gtid.result b/mysql-test/suite/sql_sequence/gtid.result
index 495e4b806b7..5c0003d4ea3 100644
--- a/mysql-test/suite/sql_sequence/gtid.result
+++ b/mysql-test/suite/sql_sequence/gtid.result
@@ -174,9 +174,9 @@ create sequence s_db.s2;
drop sequence s_db.s2;
connection m_normal_2;
select next value for s_db.s1;
-ERROR 42000: INSERT command denied to user 'normal_2'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_2'@'localhost' for table `s_db`.`s1`
create sequence s_db.s2;
-ERROR 42000: CREATE command denied to user 'normal_2'@'localhost' for table 's2'
+ERROR 42000: CREATE command denied to user 'normal_2'@'localhost' for table `s_db`.`s2`
connection m_normal_1;
drop sequence s_db.s1;
###########################################
@@ -796,11 +796,11 @@ select previous value for s1;
previous value for s1
NULL
insert into t1 values (2);
-ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table `test`.`t1`
select next value for s1;
-ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table `test`.`s1`
do setval(s1,1000,0);
-ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table `test`.`s1`
connection master;
grant insert on test.* to normal_5@'%' identified by 'pass';
disconnect m_normal_3;
diff --git a/mysql-test/suite/sql_sequence/replication.result b/mysql-test/suite/sql_sequence/replication.result
index c429b74b4cd..762c332dbd6 100644
--- a/mysql-test/suite/sql_sequence/replication.result
+++ b/mysql-test/suite/sql_sequence/replication.result
@@ -285,9 +285,9 @@ create sequence s_db.s2;
drop sequence s_db.s2;
connection m_normal_2;
select NEXT VALUE for s_db.s1;
-ERROR 42000: INSERT command denied to user 'normal_2'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_2'@'localhost' for table `s_db`.`s1`
create sequence s_db.s2;
-ERROR 42000: CREATE command denied to user 'normal_2'@'localhost' for table 's2'
+ERROR 42000: CREATE command denied to user 'normal_2'@'localhost' for table `s_db`.`s2`
connection m_normal_1;
drop sequence s_db.s1;
###########################################
diff --git a/mysql-test/suite/stress/t/deadlock_drop_table.test b/mysql-test/suite/stress/t/deadlock_drop_table.test
index b49ca0b9fb7..0ec19f87389 100644
--- a/mysql-test/suite/stress/t/deadlock_drop_table.test
+++ b/mysql-test/suite/stress/t/deadlock_drop_table.test
@@ -1,4 +1,5 @@
--source include/have_debug.inc
+--source include/have_debug_sync.inc
create or replace table t1 (a int primary key, b int, c int, key(b),key(c)) engine=myisam;
insert into t1 (a) values(1);
diff --git a/mysql-test/suite/sys_vars/t/sysvars_debug.test b/mysql-test/suite/sys_vars/t/sysvars_debug.test
index fbdcbd683df..6e64d48c6cd 100644
--- a/mysql-test/suite/sys_vars/t/sysvars_debug.test
+++ b/mysql-test/suite/sys_vars/t/sysvars_debug.test
@@ -1,4 +1,5 @@
--source include/have_debug.inc
+--source include/have_debug_sync.inc
--source include/word_size.inc
--vertical_results
diff --git a/mysql-test/suite/versioning/r/not_embedded.result b/mysql-test/suite/versioning/r/not_embedded.result
index f17ab18349c..b8972a48370 100644
--- a/mysql-test/suite/versioning/r/not_embedded.result
+++ b/mysql-test/suite/versioning/r/not_embedded.result
@@ -47,7 +47,7 @@ show grants;
Grants for mysqltest_1@localhost
GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
delete history from mysqltest.t before system_time now();
-ERROR 42000: DELETE HISTORY command denied to user 'mysqltest_1'@'localhost' for table 't'
+ERROR 42000: DELETE HISTORY command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t`
connection root;
grant delete history on mysqltest.* to mysqltest_1@localhost;
grant delete history on mysqltest.t to mysqltest_1@localhost;
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 2001cb64db0..4b0fef183d2 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
- Copyright (c) 2017, MariaDB Corporation.
+ Copyright (c) 2017, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -377,7 +377,7 @@ static void keycache_debug_print(const char *fmt,...);
#define KEYCACHE_DBUG_ASSERT(a) DBUG_ASSERT(a)
#endif /* defined(KEYCACHE_DEBUG_LOG) && defined(KEYCACHE_DEBUG) */
-#if defined(KEYCACHE_DEBUG) || !defined(DBUG_OFF)
+#if defined(KEYCACHE_DEBUG) || defined(DBUG_TRACE)
static long keycache_thread_id;
#define KEYCACHE_THREAD_TRACE(l) \
KEYCACHE_DBUG_PRINT(l,("|thread %ld",keycache_thread_id))
@@ -393,7 +393,7 @@ static long keycache_thread_id;
#define KEYCACHE_THREAD_TRACE_BEGIN(l)
#define KEYCACHE_THREAD_TRACE_END(l)
#define KEYCACHE_THREAD_TRACE(l)
-#endif /* defined(KEYCACHE_DEBUG) || !defined(DBUG_OFF) */
+#endif /* defined(KEYCACHE_DEBUG) || defined(DBUG_TRACE) */
#define BLOCK_NUMBER(b) \
((uint) (((char*)(b)-(char *) keycache->block_root)/sizeof(BLOCK_LINK)))
diff --git a/plugin/auth_gssapi/CMakeLists.txt b/plugin/auth_gssapi/CMakeLists.txt
index 1bf727ddf2e..8c82d335ab2 100644
--- a/plugin/auth_gssapi/CMakeLists.txt
+++ b/plugin/auth_gssapi/CMakeLists.txt
@@ -38,6 +38,7 @@ ELSE()
IF(HAVE_KRB5_XFREE)
ADD_DEFINITIONS(-DHAVE_KRB5_XFREE=1)
ENDIF()
+ MY_CHECK_AND_SET_COMPILER_FLAG(-Wl,--as-needed)
ELSE()
# Can't build plugin
diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm
index c7d4b0adf5b..48c1bcccd45 100644
--- a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm
+++ b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm
@@ -22,6 +22,4 @@ push @::global_suppressions,
qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
);
-sub is_default { 1 }
-
bless { };
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
index debda4c8970..55523a728f8 100644
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2009, 2013, Oracle and/or its affiliates.
- Copyright (c) 2009, 2020, MariaDB Corporation.
+ Copyright (c) 2009, 2022, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -353,7 +353,7 @@ static char *debug_sync_bmove_len(char *to, char *to_end,
}
-#if !defined(DBUG_OFF)
+#ifdef DBUG_TRACE
/**
Create a string that describes an action.
@@ -443,8 +443,7 @@ static void debug_sync_print_actions(THD *thd)
DBUG_VOID_RETURN;
}
-
-#endif /* !defined(DBUG_OFF) */
+#endif /* defined(DBUG_TRACE) */
/**
@@ -775,6 +774,7 @@ static bool debug_sync_set_action(THD *thd, st_debug_sync_action *action)
else
{
const char *dsp_name= action->sync_point.c_ptr();
+#ifdef DBUG_TRACE
DBUG_EXECUTE("debug_sync", {
/* Functions as DBUG_PRINT args can change keyword and line nr. */
const char *sig_emit= action->signal.c_ptr();
@@ -785,6 +785,7 @@ static bool debug_sync_set_action(THD *thd, st_debug_sync_action *action)
dsp_name, action->activation_count,
action->hit_limit, action->execute, action->timeout,
sig_emit, sig_wait));});
+#endif
/* Check this before sorting the array. action may move. */
is_dsp_now= !my_strcasecmp(system_charset_info, dsp_name, "now");
@@ -797,7 +798,9 @@ static bool debug_sync_set_action(THD *thd, st_debug_sync_action *action)
sizeof(st_debug_sync_action), debug_sync_qsort_cmp);
}
}
+#ifdef DBUG_TRACE
DBUG_EXECUTE("debug_sync_list", debug_sync_print_actions(thd););
+#endif
/* Execute the special sync point 'now' if activated above. */
if (is_dsp_now)
@@ -1367,7 +1370,7 @@ uchar *debug_sync_value_ptr(THD *thd)
static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
{
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
const char *dsp_name= action->sync_point.c_ptr();
const char *sig_emit= action->signal.c_ptr();
const char *sig_wait= action->wait_for.c_ptr();
@@ -1458,12 +1461,12 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
restore_current_mutex = false;
set_timespec(abstime, action->timeout);
- DBUG_EXECUTE("debug_sync_exec", {
+ DBUG_EXECUTE("debug_sync_exec",
/* Functions as DBUG_PRINT args can change keyword and line nr. */
- const char *sig_glob= debug_sync_global.ds_signal.c_ptr();
DBUG_PRINT("debug_sync_exec",
("wait for '%s' at: '%s' curr: '%s'",
- sig_wait, dsp_name, sig_glob));});
+ sig_wait, dsp_name,
+ debug_sync_global.ds_signal.c_ptr())););
/*
Wait until global signal string matches the wait_for string.
@@ -1472,17 +1475,17 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
the required dynamic memory allocated.
*/
while (stringcmp(&debug_sync_global.ds_signal, &action->wait_for) &&
- !thd->killed && opt_debug_sync_timeout)
+ !(thd->killed & KILL_HARD_BIT) && opt_debug_sync_timeout)
{
error= mysql_cond_timedwait(&debug_sync_global.ds_cond,
&debug_sync_global.ds_mutex,
&abstime);
- DBUG_EXECUTE("debug_sync", {
+ DBUG_EXECUTE("debug_sync",
/* Functions as DBUG_PRINT args can change keyword and line nr. */
- const char *sig_glob= debug_sync_global.ds_signal.c_ptr();
DBUG_PRINT("debug_sync",
("awoke from %s global: %s error: %d",
- sig_wait, sig_glob, error));});
+ sig_wait, debug_sync_global.ds_signal.c_ptr(),
+ error)););
if (unlikely(error == ETIMEDOUT || error == ETIME))
{
// We should not make the statement fail, even if in strict mode.
diff --git a/sql/event_queue.cc b/sql/event_queue.cc
index 873be03faac..ebd2dfeefd6 100644
--- a/sql/event_queue.cc
+++ b/sql/event_queue.cc
@@ -544,7 +544,7 @@ Event_queue::empty_queue()
void
Event_queue::dbug_dump_queue(my_time_t when)
{
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
my_time_t now= when;
Event_queue_element *et;
uint i;
diff --git a/sql/field.cc b/sql/field.cc
index 9f5add3e75a..ca45aeb5278 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -3425,7 +3425,7 @@ bool Field_new_decimal::store_value(const my_decimal *decimal_value,
DBUG_ASSERT(marked_for_write_or_computed());
int error= 0;
DBUG_ENTER("Field_new_decimal::store_value");
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
{
char dbug_buff[DECIMAL_MAX_STR_LENGTH+2];
DBUG_PRINT("enter", ("value: %s", dbug_decimal_as_string(dbug_buff, decimal_value)));
@@ -3440,7 +3440,7 @@ bool Field_new_decimal::store_value(const my_decimal *decimal_value,
error= 1;
decimal_value= &decimal_zero;
}
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
{
char dbug_buff[DECIMAL_MAX_STR_LENGTH+2];
DBUG_PRINT("info", ("saving with precision %d scale: %d value %s",
@@ -3532,7 +3532,7 @@ int Field_new_decimal::store(const char *from, size_t length,
}
}
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
char dbug_buff[DECIMAL_MAX_STR_LENGTH+2];
DBUG_PRINT("enter", ("value: %s",
dbug_decimal_as_string(dbug_buff, &decimal_value)));
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc
index e35f9155967..f94c7190532 100644
--- a/sql/gcalc_slicescan.cc
+++ b/sql/gcalc_slicescan.cc
@@ -116,16 +116,20 @@ static void GCALC_DBUG_PRINT_PI(const Gcalc_heap::Info *pi)
int n_buf;
if (pi->type == Gcalc_heap::nt_intersection)
{
+#ifdef DBUG_TRACE
const Gcalc_scan_iterator::intersection_info *ic= i_data(pi);
GCALC_DBUG_PRINT(("intersection point %d %d",
ic->edge_a->thread, ic->edge_b->thread));
+#endif
return;
}
if (pi->type == Gcalc_heap::nt_eq_node)
{
+#ifdef DBUG_TRACE
const Gcalc_scan_iterator::point *e= eq_sp(pi);
GCALC_DBUG_PRINT(("eq point %d", e->thread));
+#endif
return;
}
n_buf= gcalc_pi_str(buf, pi, "");
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index a860fba2099..a8eebe54868 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -3777,7 +3777,22 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
for (i= 0; i < m_tot_parts; i++)
{
if (!bitmap_is_set(&m_is_clone_of->m_opened_partitions, i))
+ {
+ /* Here we should just create the handler instance, not open it. */
+ if (!(m_file[i]= get_new_handler(table->s, m_clone_mem_root,
+ file[i]->ht)))
+ {
+ error= HA_ERR_INITIALIZATION;
+ file= &m_file[i];
+ goto err_handler;
+ }
+ if (m_file[i]->set_ha_share_ref(file[i]->ha_share))
+ {
+ error= HA_ERR_INITIALIZATION;
+ goto err_handler;
+ }
continue;
+ }
if (unlikely((error= create_partition_name(name_buff, sizeof(name_buff),
name, name_buffer_ptr,
diff --git a/sql/handler.cc b/sql/handler.cc
index 1b5fe4b2237..2476b06251d 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -899,15 +899,14 @@ void ha_close_connection(THD* thd)
{
for (auto i= 0; i < MAX_HA; i++)
{
- if (thd->ha_data[i].lock)
+ if (plugin_ref plugin= thd->ha_data[i].lock)
{
- handlerton *hton= plugin_hton(thd->ha_data[i].lock);
+ thd->ha_data[i].lock= NULL;
+ handlerton *hton= plugin_hton(plugin);
if (hton->close_connection)
hton->close_connection(hton, thd);
- /* make sure SE didn't reset ha_data in close_connection() */
- DBUG_ASSERT(thd->ha_data[i].lock);
- /* make sure ha_data is reset and ha_data_lock is released */
thd_set_ha_data(thd, hton, 0);
+ plugin_unlock(NULL, plugin);
}
DBUG_ASSERT(!thd->ha_data[i].ha_ptr);
}
diff --git a/sql/item.h b/sql/item.h
index c720ab47a92..21377664d5c 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -2173,7 +2173,6 @@ public:
virtual bool enumerate_field_refs_processor(void *arg) { return 0; }
virtual bool mark_as_eliminated_processor(void *arg) { return 0; }
virtual bool eliminate_subselect_processor(void *arg) { return 0; }
- virtual bool set_fake_select_as_master_processor(void *arg) { return 0; }
virtual bool view_used_tables_processor(void *arg) { return 0; }
virtual bool eval_not_null_tables(void *arg) { return 0; }
virtual bool is_subquery_processor(void *arg) { return 0; }
diff --git a/sql/item_create.cc b/sql/item_create.cc
index a2fe1542cb9..640e536641a 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -5811,7 +5811,7 @@ int item_create_init()
DBUG_RETURN(1);
#endif
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
for (uint i=0 ; i < native_functions_hash.records ; i++)
{
Native_func_registry *func;
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 76096dd73f3..d01099512f6 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4604,10 +4604,12 @@ longlong Item_func_sleep::val_int()
mysql_cond_destroy(&cond);
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sleep_inject_query_done_debug_sync", {
debug_sync_set_action
(thd, STRING_WITH_LEN("dispatch_command_end SIGNAL query_done"));
};);
+#endif
return MY_TEST(!error); // Return 1 killed
}
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 2277fba67ac..ae57462df8e 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -399,50 +399,6 @@ bool Item_subselect::eliminate_subselect_processor(void *arg)
}
-/**
- Adjust the master select of the subquery to be the fake_select which
- represents the whole UNION right above the subquery, instead of the
- last query of the UNION.
-
- @param arg pointer to the fake select
-
- @return
- FALSE to force the evaluation of the processor for the subsequent items.
-*/
-
-bool Item_subselect::set_fake_select_as_master_processor(void *arg)
-{
- SELECT_LEX *fake_select= (SELECT_LEX*) arg;
- /*
- Move the st_select_lex_unit of a subquery from a global ORDER BY clause to
- become a direct child of the fake_select of a UNION. In this way the
- ORDER BY that is applied to the temporary table that contains the result of
- the whole UNION, and all columns in the subquery are resolved against this
- table. The transformation is applied only for immediate child subqueries of
- a UNION query.
- */
- if (unit->outer_select()->master_unit()->fake_select_lex == fake_select)
- {
- /*
- Set the master of the subquery to be the fake select (i.e. the whole
- UNION), instead of the last query in the UNION.
- */
- fake_select->add_slave(unit);
- DBUG_ASSERT(unit->outer_select() == fake_select);
- /* Adjust the name resolution context hierarchy accordingly. */
- for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select())
- sl->context.outer_context= &(fake_select->context);
- /*
- Undo Item_subselect::eliminate_subselect_processor because at that phase
- we don't know yet that the ORDER clause will be moved to the fake select.
- */
- unit->item= this;
- eliminated= FALSE;
- }
- return FALSE;
-}
-
-
bool Item_subselect::mark_as_dependent(THD *thd, st_select_lex *select,
Item *item)
{
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index 54e4f8f0ced..4b672243ee0 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -240,7 +240,6 @@ public:
bool unknown_splocal_processor(void *arg) override;
bool mark_as_eliminated_processor(void *arg) override;
bool eliminate_subselect_processor(void *arg) override;
- bool set_fake_select_as_master_processor(void *arg) override;
bool enumerate_field_refs_processor(void *arg) override;
bool check_vcol_func_processor(void *arg) override
{
diff --git a/sql/log.cc b/sql/log.cc
index 3d2b47cc79b..f9fd684c620 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -8216,10 +8216,12 @@ MYSQL_BIN_LOG::trx_group_commit_leader(group_commit_entry *leader)
DBUG_ENTER("MYSQL_BIN_LOG::trx_group_commit_leader");
{
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("inject_binlog_commit_before_get_LOCK_log",
DBUG_ASSERT(!debug_sync_set_action(leader->thd, STRING_WITH_LEN
("commit_before_get_LOCK_log SIGNAL waiting WAIT_FOR cont TIMEOUT 1")));
);
+#endif
/*
Lock the LOCK_log(), and once we get it, collect any additional writes
that queued up while we were waiting.
@@ -8509,7 +8511,11 @@ MYSQL_BIN_LOG::trx_group_commit_leader(group_commit_entry *leader)
++num_commits;
if (current->cache_mngr->using_xa && likely(!current->error) &&
!DBUG_IF("skip_commit_ordered"))
+ {
+ mysql_mutex_lock(&current->thd->LOCK_thd_data);
run_commit_ordered(current->thd, current->all);
+ mysql_mutex_unlock(&current->thd->LOCK_thd_data);
+ }
current->thd->wakeup_subsequent_commits(current->error);
/*
@@ -10552,6 +10558,7 @@ binlog_background_thread(void *arg __attribute__((unused)))
mysql_mutex_unlock(&mysql_bin_log.LOCK_binlog_background_thread);
/* Process any incoming commit_checkpoint_notify() calls. */
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("inject_binlog_background_thread_before_mark_xid_done",
DBUG_ASSERT(!debug_sync_set_action(
thd,
@@ -10560,6 +10567,7 @@ binlog_background_thread(void *arg __attribute__((unused)))
"WAIT_FOR something_that_will_never_happen "
"TIMEOUT 2")));
);
+#endif
while (queue)
{
long count= queue->notify_count;
@@ -10574,11 +10582,13 @@ binlog_background_thread(void *arg __attribute__((unused)))
mysql_bin_log.mark_xid_done(queue->binlog_id, true);
queue= next;
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("binlog_background_checkpoint_processed",
DBUG_ASSERT(!debug_sync_set_action(
thd,
STRING_WITH_LEN("now SIGNAL binlog_background_checkpoint_processed")));
);
+#endif
}
if (stop)
diff --git a/sql/log.h b/sql/log.h
index 84e3bd2cdba..13819b73d9d 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -735,7 +735,7 @@ public:
}
void harvest_bytes_written(Atomic_counter<uint64> *counter)
{
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
char buf1[22],buf2[22];
#endif
DBUG_ENTER("harvest_bytes_written");
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 1d59726c7e5..856e4e1cb7f 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2018, Oracle and/or its affiliates.
- Copyright (c) 2009, 2021, MariaDB
+ Copyright (c) 2009, 2022, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1359,7 +1359,7 @@ static void copy_str_and_move(const char **src, Log_event::Byte **dst,
}
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
static char const *
code_name(int code)
{
diff --git a/sql/mdl.cc b/sql/mdl.cc
index 7bc488b0016..c7cdb639827 100644
--- a/sql/mdl.cc
+++ b/sql/mdl.cc
@@ -1187,6 +1187,7 @@ MDL_wait::timed_wait(MDL_context_owner *owner, struct timespec *abs_timeout,
wait_result != ETIMEDOUT && wait_result != ETIME)
{
#ifdef WITH_WSREP
+# ifdef ENABLED_DEBUG_SYNC
// Allow tests to block the applier thread using the DBUG facilities
DBUG_EXECUTE_IF("sync.wsrep_before_mdl_wait",
{
@@ -1196,6 +1197,7 @@ MDL_wait::timed_wait(MDL_context_owner *owner, struct timespec *abs_timeout,
DBUG_ASSERT(!debug_sync_set_action((owner->get_thd()),
STRING_WITH_LEN(act)));
};);
+# endif
if (WSREP_ON && wsrep_thd_is_BF(owner->get_thd(), false))
{
wait_result= mysql_cond_wait(&m_COND_wait_status, &m_LOCK_wait_status);
@@ -2279,7 +2281,7 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout)
MDL_ticket *ticket;
MDL_wait::enum_wait_status wait_status;
DBUG_ENTER("MDL_context::acquire_lock");
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
const char *mdl_lock_name= get_mdl_lock_name(
mdl_request->key.mdl_namespace(), mdl_request->type)->str;
#endif
@@ -2305,7 +2307,7 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout)
DBUG_RETURN(FALSE);
}
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
const char *ticket_msg= dbug_print_mdl(ticket);
#endif
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 872a57aef11..91c88ccb73d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1704,6 +1704,7 @@ void kill_mysql(THD *thd)
shutdown_thread_id= thd->thread_id;
DBUG_EXECUTE_IF("mysql_admin_shutdown_wait_for_slaves",
thd->lex->is_shutdown_wait_for_slaves= true;);
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("simulate_delay_at_shutdown",
{
DBUG_ASSERT(binlog_dump_thread_count == 3);
@@ -1713,6 +1714,7 @@ void kill_mysql(THD *thd)
DBUG_ASSERT(!debug_sync_set_action(thd,
STRING_WITH_LEN(act)));
};);
+#endif
if (thd->lex->is_shutdown_wait_for_slaves)
shutdown_wait_for_slaves= true;
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 39b4290a161..70e71d9a21b 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
- Copyright (c) 2012, 2020, MariaDB Corporation.
+ Copyright (c) 2012, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -507,6 +507,7 @@ net_write_command(NET *net,uchar command,
DBUG_ENTER("net_write_command");
DBUG_PRINT("enter",("length: %lu", (ulong) len));
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("simulate_error_on_packet_write",
{
if (command == COM_BINLOG_DUMP)
@@ -518,6 +519,7 @@ net_write_command(NET *net,uchar command,
DBUG_RETURN(true);
}
};);
+#endif
MYSQL_NET_WRITE_START(length);
buff[4]=command; /* For first packet */
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index 57140019341..f4aae1300e2 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -175,11 +175,12 @@ write_parameter(IO_CACHE *file, const uchar* base, File_option *parameter)
{
/* string have to be allocated already */
LEX_STRING *val_s= (LEX_STRING *)(base + parameter->offset);
- time_t tm= my_time(0);
-
- get_date(val_s->str, GETDATE_DATE_TIME|GETDATE_GMT|GETDATE_FIXEDLENGTH,
- tm);
- val_s->length= PARSE_FILE_TIMESTAMPLENGTH;
+ // number of microseconds since Epoch, timezone-independent
+ my_hrtime_t tm= my_hrtime();
+ // Paded to 19 characters for compatibility
+ val_s->length= snprintf(val_s->str, MICROSECOND_TIMESTAMP_BUFFER_SIZE,
+ "%019lld", tm.val);
+ DBUG_ASSERT(val_s->length == MICROSECOND_TIMESTAMP_BUFFER_SIZE-1);
if (my_b_write(file, (const uchar *)val_s->str,
PARSE_FILE_TIMESTAMPLENGTH))
DBUG_RETURN(TRUE);
@@ -884,16 +885,16 @@ File_parser::parse(uchar* base, MEM_ROOT *mem_root,
{
/* string have to be allocated already */
LEX_STRING *val= (LEX_STRING *)(base + parameter->offset);
- /* yyyy-mm-dd HH:MM:SS = 19(PARSE_FILE_TIMESTAMPLENGTH) characters */
- if (ptr[PARSE_FILE_TIMESTAMPLENGTH] != '\n')
+ /* 19 characters of timestamp */
+ if (ptr[MICROSECOND_TIMESTAMP_BUFFER_SIZE-1] != '\n')
{
my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
parameter->name.str, line);
DBUG_RETURN(TRUE);
}
- memcpy(val->str, ptr, PARSE_FILE_TIMESTAMPLENGTH);
- val->str[val->length= PARSE_FILE_TIMESTAMPLENGTH]= '\0';
- ptr+= (PARSE_FILE_TIMESTAMPLENGTH+1);
+ memcpy(val->str, ptr, MICROSECOND_TIMESTAMP_BUFFER_SIZE-1);
+ val->str[val->length= MICROSECOND_TIMESTAMP_BUFFER_SIZE-1]= '\0';
+ ptr+= MICROSECOND_TIMESTAMP_BUFFER_SIZE;
break;
}
case FILE_OPTIONS_STRLIST:
diff --git a/sql/records.cc b/sql/records.cc
index b3b69f19665..3aad36ca862 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2010, Oracle and/or its affiliates.
- Copyright (c) 2009, 2017, MariaDB Corporation
+ Copyright (c) 2009, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -568,7 +568,7 @@ template<bool Packed_addon_fields>
static int rr_unpack_from_tempfile(READ_RECORD *info)
{
uchar *destination= info->rec_buf;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
my_off_t where= my_b_tell(info->io_cache);
#endif
if (Packed_addon_fields)
diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h
index 669a8e29543..28359d9555a 100644
--- a/sql/rpl_injector.h
+++ b/sql/rpl_injector.h
@@ -264,14 +264,14 @@ public:
*/
int check_state(enum_state const target_state)
{
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
static char const *state_name[] = {
"START_STATE", "TABLE_STATE", "ROW_STATE", "STATE_COUNT"
};
- DBUG_ASSERT(target_state <= STATE_COUNT);
DBUG_PRINT("info", ("In state %s", state_name[m_state]));
#endif
+ DBUG_ASSERT(target_state <= STATE_COUNT);
if (m_state <= target_state && target_state <= m_state + 1 &&
m_state < STATE_COUNT)
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc
index 49ec08a9cea..962da9b46af 100644
--- a/sql/rpl_parallel.cc
+++ b/sql/rpl_parallel.cc
@@ -247,6 +247,7 @@ finish_event_group(rpl_parallel_thread *rpt, uint64 sub_id,
entry->stop_on_error_sub_id == (uint64)ULONGLONG_MAX)
entry->stop_on_error_sub_id= sub_id;
mysql_mutex_unlock(&entry->LOCK_parallel_entry);
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("hold_worker_on_schedule", {
if (entry->stop_on_error_sub_id < (uint64)ULONGLONG_MAX)
{
@@ -261,6 +262,7 @@ finish_event_group(rpl_parallel_thread *rpt, uint64 sub_id,
STRING_WITH_LEN("now WAIT_FOR proceed_by_1000"));
}
});
+#endif
if (rgi->killed_for_retry == rpl_group_info::RETRY_KILL_PENDING)
wait_for_pending_deadlock_kill(thd, rgi);
@@ -774,6 +776,7 @@ do_retry:
rgi->killed_for_retry= rpl_group_info::RETRY_KILL_KILLED;
thd->set_killed(KILL_CONNECTION);
});
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("rpl_parallel_simulate_wait_at_retry", {
if (rgi->current_gtid.seq_no == 1001) {
debug_sync_set_action(thd,
@@ -781,6 +784,7 @@ do_retry:
}
DEBUG_SYNC(thd, "rpl_parallel_simulate_wait_at_retry");
});
+#endif
rgi->cleanup_context(thd, 1);
wait_for_pending_deadlock_kill(thd, rgi);
@@ -1204,6 +1208,7 @@ handle_rpl_parallel_thread(void *arg)
bool did_enter_cond= false;
PSI_stage_info old_stage;
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("hold_worker_on_schedule", {
if (rgi->current_gtid.domain_id == 0 &&
rgi->current_gtid.seq_no == 100) {
@@ -1218,6 +1223,7 @@ handle_rpl_parallel_thread(void *arg)
STRING_WITH_LEN("now SIGNAL scheduled_gtid_0_x_100"));
}
});
+#endif
if(unlikely(thd->wait_for_commit_ptr) && group_rgi != NULL)
{
@@ -2255,11 +2261,13 @@ rpl_parallel_entry::choose_thread(rpl_group_info *rgi, bool *did_enter_cond,
unlock_or_exit_cond(rli->sql_driver_thd, &thr->LOCK_rpl_thread,
did_enter_cond, old_stage);
my_error(ER_CONNECTION_KILLED, MYF(0));
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("rpl_parallel_wait_queue_max",
{
debug_sync_set_action(rli->sql_driver_thd,
STRING_WITH_LEN("now SIGNAL wait_queue_killed"));
};);
+#endif
slave_output_error_info(rgi, rli->sql_driver_thd);
return NULL;
}
@@ -2277,11 +2285,13 @@ rpl_parallel_entry::choose_thread(rpl_group_info *rgi, bool *did_enter_cond,
Because debug_sync changes the thd->mysys_var->current_mutex,
and this can cause THD::awake to use the wrong mutex.
*/
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("rpl_parallel_wait_queue_max",
{
debug_sync_set_action(rli->sql_driver_thd,
STRING_WITH_LEN("now SIGNAL wait_queue_ready"));
};);
+#endif
rli->sql_driver_thd->ENTER_COND(&thr->COND_rpl_thread_queue,
&thr->LOCK_rpl_thread,
&stage_waiting_for_room_in_worker_thread,
@@ -2437,11 +2447,13 @@ rpl_parallel::wait_for_done(THD *thd, Relay_log_info *rli)
}
}
}
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("rpl_parallel_wait_for_done_trigger",
{
debug_sync_set_action(thd,
STRING_WITH_LEN("now SIGNAL wait_for_done_waiting"));
};);
+#endif
global_rpl_thread_pool.copy_pool_for_pfs(rli);
for (i= 0; i < domain_hash.records; ++i)
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index 7da296b47d9..6266acf7805 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2007, 2013, Oracle and/or its affiliates.
- Copyright (c) 2008, 2019, MariaDB Corporation.
+ Copyright (c) 2008, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -319,7 +319,9 @@ unpack_row(rpl_group_info *rgi,
normal unpack operation.
*/
uint16 const metadata= tabledef->field_metadata(i);
- IF_DBUG(uchar const *const old_pack_ptr= pack_ptr;,)
+#ifdef DBUG_TRACE
+ uchar const *const old_pack_ptr= pack_ptr;
+#endif
pack_ptr= f->unpack(f->ptr, pack_ptr, row_end, metadata);
DBUG_PRINT("debug", ("field: %s; metadata: 0x%x;"
diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc
index 0e72ff441c4..b57fc199826 100644
--- a/sql/semisync_master.cc
+++ b/sql/semisync_master.cc
@@ -1,6 +1,6 @@
/* Copyright (C) 2007 Google Inc.
Copyright (c) 2008, 2013, Oracle and/or its affiliates.
- Copyright (c) 2011, 2016, MariaDB
+ Copyright (c) 2011, 2022, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -275,12 +275,16 @@ void Active_tranx::clear_active_tranx_nodes(const char *log_file_name,
Tranx_node *curr_node, *next_node;
/* Delete all transaction nodes before the confirmation point. */
+#ifdef DBUG_TRACE
int n_frees = 0;
+#endif
curr_node = m_trx_front;
while (curr_node != new_front)
{
next_node = curr_node->next;
+#ifdef DBUG_TRACE
n_frees++;
+#endif
/* Remove the node from the hash table. */
unsigned int hash_val = get_hash_value(curr_node->log_name, curr_node->log_pos);
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 9fc4ebe34e6..76da0b8f598 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -3389,25 +3389,25 @@ ER_NONEXISTING_GRANT 42000
swe "Det finns inget privilegium definierat för användare '%-.48s' på '%-.64s'"
ukr "Повноважень не визначено для користувача '%-.48s' з хосту '%-.64s'"
ER_TABLEACCESS_DENIED_ERROR 42000
- chi "%-.100T 命令的权限拒绝用户 '%s'@'%s' 用在表 '%-.192s'"
- cze "%-.100T příkaz nepřístupný pro uživatele: '%s'@'%s' pro tabulku '%-.192s'"
- dan "%-.100T-kommandoen er ikke tilladt for brugeren '%s'@'%s' for tabellen '%-.192s'"
- eng "%-.100T command denied to user '%s'@'%s' for table '%-.192s'"
- est "%-.100T käsk ei ole lubatud kasutajale '%s'@'%s' tabelis '%-.192s'"
- fre "La commande '%-.100T' est interdite à l'utilisateur: '%s'@'%s' sur la table '%-.192s'"
- ger "%-.100T Befehl nicht erlaubt für Benutzer '%s'@'%s' auf Tabelle '%-.192s'"
- hun "%-.100T parancs a '%s'@'%s' felhasznalo szamara nem engedelyezett a '%-.192s' tablaban"
- ita "Comando %-.100T negato per l'utente: '%s'@'%s' sulla tabella '%-.192s'"
- jpn "コマンド %-.100T は ユーザー '%s'@'%s' ,テーブル '%-.192s' に対して許可されていません"
- kor "'%-.100T' 명령은 다음 사용자에게 거부되었습니다. : '%s'@'%s' for 테이블 '%-.192s'"
- nla "%-.100T commando geweigerd voor gebruiker: '%s'@'%s' voor tabel '%-.192s'"
- por "Comando '%-.100T' negado para o usuário '%s'@'%s' na tabela '%-.192s'"
- rum "Comanda %-.100T interzisa utilizatorului: '%s'@'%s' pentru tabela '%-.192s'"
- rus "Команда %-.100T запрещена пользователю '%s'@'%s' для таблицы '%-.192s'"
- serbian "%-.100T komanda zabranjena za korisnika '%s'@'%s' za tabelu '%-.192s'"
- spa "%-.100T comando denegado a usuario '%s'@'%s' para la tabla '%-.192s'"
- swe "%-.100T ej tillåtet för '%s'@'%s' för tabell '%-.192s'"
- ukr "%-.100T команда заборонена користувачу: '%s'@'%s' у таблиці '%-.192s'"
+ chi "%-.100T 命令的权限拒绝用户 '%s'@'%s' 用在表 %`s.%`s"
+ cze "%-.100T příkaz nepřístupný pro uživatele: '%s'@'%s' pro tabulku %`s.%`s"
+ dan "%-.100T-kommandoen er ikke tilladt for brugeren '%s'@'%s' for tabellen %`s.%`s"
+ nla "%-.100T commando geweigerd voor gebruiker: '%s'@'%s' voor tabel %`s.%`s"
+ eng "%-.100T command denied to user '%s'@'%s' for table %`s.%`s"
+ est "%-.100T käsk ei ole lubatud kasutajale '%s'@'%s' tabelis %`s.%`s"
+ fre "La commande '%-.100T' est interdite à l'utilisateur: '%s'@'%s' sur la table %`s.%`s"
+ ger "%-.100T Befehl nicht erlaubt für Benutzer '%s'@'%s' auf Tabelle %`s.%`s"
+ hun "%-.100T parancs a '%s'@'%s' felhasznalo szamara nem engedelyezett a %`s.%`s tablaban"
+ ita "Comando %-.100T negato per l'utente: '%s'@'%s' sulla tabella %`s.%`s"
+ jpn "コマンド %-.100T は ユーザー '%s'@'%s' ,テーブル %`s.%`s に対して許可されていません"
+ kor "'%-.100T' 명령은 다음 사용자에게 거부되었습니다. : '%s'@'%s' for 테이블 %`s.%`s"
+ por "Comando '%-.100T' negado para o usuário '%s'@'%s' na tabela %`s.%`s"
+ rum "Comanda %-.100T interzisa utilizatorului: '%s'@'%s' pentru tabela %`s.%`s"
+ rus "Команда %-.100T запрещена пользователю '%s'@'%s' для таблицы %`s.%`s"
+ serbian "%-.100T komanda zabranjena za korisnika '%s'@'%s' za tabelu %`s.%`s"
+ spa "%-.100T comando denegado a usuario '%s'@'%s' para la tabla %`s.%`s"
+ swe "%-.100T ej tillåtet för '%s'@'%s' för tabell %`s.%`s"
+ ukr "%-.100T команда заборонена користувачу: '%s'@'%s' у таблиці %`s.%`s"
ER_COLUMNACCESS_DENIED_ERROR 42000
chi "%-.32s 命令的权限拒绝用户 '%s'@'%s' 用在列 '%-.192s' 在表 '%-.192s'"
cze "%-.32s příkaz nepřístupný pro uživatele: '%s'@'%s' pro sloupec '%-.192s' v tabulce '%-.192s'"
diff --git a/sql/slave.cc b/sql/slave.cc
index 16b47c52179..cf290fb8a89 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -3871,12 +3871,14 @@ apply_event_and_update_pos_apply(Log_event* ev, THD* thd, rpl_group_info *rgi,
Relay_log_info* rli= rgi->rli;
DBUG_ENTER("apply_event_and_update_pos_apply");
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("inject_slave_sql_before_apply_event",
{
DBUG_ASSERT(!debug_sync_set_action
(thd, STRING_WITH_LEN("now WAIT_FOR continue")));
DBUG_SET_INITIAL("-d,inject_slave_sql_before_apply_event");
};);
+#endif
if (reason == Log_event::EVENT_SKIP_NOT)
exec_res= ev->apply_event(rgi);
@@ -3905,7 +3907,7 @@ apply_event_and_update_pos_apply(Log_event* ev, THD* thd, rpl_group_info *rgi,
}
#endif
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
/*
This only prints information to the debug trace.
@@ -3931,7 +3933,7 @@ apply_event_and_update_pos_apply(Log_event* ev, THD* thd, rpl_group_info *rgi,
if (exec_res == 0)
{
int error= ev->update_pos(rgi);
- #ifndef DBUG_OFF
+#ifdef DBUG_TRACE
DBUG_PRINT("info", ("update_pos error = %d", error));
if (!rli->belongs_to_client())
{
@@ -4464,6 +4466,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli,
#ifdef WITH_WSREP
wsrep_after_statement(thd);
#endif /* WITH_WSREP */
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF(
"pause_sql_thread_on_fde",
if (ev && typ == FORMAT_DESCRIPTION_EVENT) {
@@ -4472,6 +4475,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli,
STRING_WITH_LEN(
"now SIGNAL paused_on_fde WAIT_FOR sql_thread_continue")));
});
+#endif
DBUG_RETURN(exec_res);
}
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 70017708eac..ab362603c7e 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1903,7 +1903,7 @@ sp_head::execute_trigger(THD *thd,
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), priv_desc,
thd->security_ctx->priv_user, thd->security_ctx->host_or_ip,
- table_name->str);
+ db_name->str, table_name->str);
m_security_ctx.restore_security_context(thd, save_ctx);
DBUG_RETURN(TRUE);
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index becf519901a..95ca8b233ce 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -7134,7 +7134,8 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
table_list->grant.want_privilege);
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
command, thd->security_ctx->priv_user,
- thd->security_ctx->host_or_ip, table_list->alias.str);
+ thd->security_ctx->host_or_ip, table_list->db.str,
+ table_list->alias.str);
DBUG_RETURN(-1);
}
}
@@ -8186,8 +8187,8 @@ bool grant_reload(THD *thd)
@see check_table_access
@note
- This functions assumes that either number of tables to be inspected
- by it is limited explicitly (i.e. is is not UINT_MAX) or table list
+ This function assumes that either number of tables to be inspected
+ by it is limited explicitly (i.e. is not UINT_MAX) or table list
used and thd->lex->query_tables_own_last value correspond to each
other (the latter should be either 0 or point to next_global member
of one of elements of this table list).
@@ -8392,7 +8393,7 @@ err:
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
command,
sctx->priv_user,
- sctx->host_or_ip,
+ sctx->host_or_ip, tl ? tl->db.str : "unknown",
tl ? tl->get_table_name() : "unknown");
}
DBUG_RETURN(TRUE);
@@ -8576,7 +8577,7 @@ bool check_grant_all_columns(THD *thd, privilege_t want_access_arg,
Security_context *sctx= thd->security_ctx;
privilege_t want_access(NO_ACL);
const char *table_name= NULL;
- const char* db_name;
+ const char* db_name= NULL;
GRANT_INFO *grant;
GRANT_TABLE *UNINIT_VAR(grant_table);
GRANT_TABLE *UNINIT_VAR(grant_table_role);
@@ -8665,7 +8666,7 @@ err:
if (using_column_privileges)
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
command, sctx->priv_user,
- sctx->host_or_ip, table_name);
+ sctx->host_or_ip, db_name, table_name);
else
my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0),
command,
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index d609fff5487..a0d32145abe 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -409,7 +409,7 @@ void field_real::add()
if ((decs = decimals()) >= FLOATING_POINT_DECIMALS)
{
- length= sprintf(buff, "%g", num);
+ length= snprintf(buff, sizeof(buff), "%g", num);
if (rint(num) != num)
max_notzero_dec_len = 1;
}
@@ -420,7 +420,7 @@ void field_real::add()
snprintf(buff, sizeof(buff)-1, "%-.*f", (int) decs, num);
length = (uint) strlen(buff);
#else
- length= sprintf(buff, "%-.*f", (int) decs, num);
+ length= snprintf(buff, sizeof(buff), "%-.*f", (int) decs, num);
#endif
// We never need to check further than this
@@ -814,32 +814,32 @@ void field_str::get_opt_type(String *answer, ha_rows total_rows)
if (can_be_still_num)
{
if (num_info.is_float)
- sprintf(buff, "DOUBLE"); // number was like 1e+50... TODO:
+ snprintf(buff, sizeof(buff), "DOUBLE"); // number was like 1e+50... TODO:
else if (num_info.decimals) // DOUBLE(%d,%d) sometime
{
if (num_info.dval > -FLT_MAX && num_info.dval < FLT_MAX)
- sprintf(buff, "FLOAT(%d,%d)", (num_info.integers + num_info.decimals), num_info.decimals);
+ snprintf(buff, sizeof(buff), "FLOAT(%d,%d)", (num_info.integers + num_info.decimals), num_info.decimals);
else
- sprintf(buff, "DOUBLE(%d,%d)", (num_info.integers + num_info.decimals), num_info.decimals);
+ snprintf(buff, sizeof(buff), "DOUBLE(%d,%d)", (num_info.integers + num_info.decimals), num_info.decimals);
}
else if (ev_num_info.llval >= -128 &&
ev_num_info.ullval <=
(ulonglong) (ev_num_info.llval >= 0 ? 255 : 127))
- sprintf(buff, "TINYINT(%d)", num_info.integers);
+ snprintf(buff, sizeof(buff), "TINYINT(%d)", num_info.integers);
else if (ev_num_info.llval >= INT_MIN16 &&
ev_num_info.ullval <= (ulonglong) (ev_num_info.llval >= 0 ?
UINT_MAX16 : INT_MAX16))
- sprintf(buff, "SMALLINT(%d)", num_info.integers);
+ snprintf(buff, sizeof(buff), "SMALLINT(%d)", num_info.integers);
else if (ev_num_info.llval >= INT_MIN24 &&
ev_num_info.ullval <= (ulonglong) (ev_num_info.llval >= 0 ?
UINT_MAX24 : INT_MAX24))
- sprintf(buff, "MEDIUMINT(%d)", num_info.integers);
+ snprintf(buff, sizeof(buff), "MEDIUMINT(%d)", num_info.integers);
else if (ev_num_info.llval >= INT_MIN32 &&
ev_num_info.ullval <= (ulonglong) (ev_num_info.llval >= 0 ?
UINT_MAX32 : INT_MAX32))
- sprintf(buff, "INT(%d)", num_info.integers);
+ snprintf(buff, sizeof(buff), "INT(%d)", num_info.integers);
else
- sprintf(buff, "BIGINT(%d)", num_info.integers);
+ snprintf(buff, sizeof(buff), "BIGINT(%d)", num_info.integers);
answer->append(buff, (uint) strlen(buff));
if (ev_num_info.llval >= 0 && ev_num_info.min_dval >= 0)
answer->append(STRING_WITH_LEN(" UNSIGNED"));
@@ -857,12 +857,12 @@ void field_str::get_opt_type(String *answer, ha_rows total_rows)
}
else if ((max_length * (total_rows - nulls)) < (sum + total_rows))
{
- sprintf(buff, "CHAR(%d)", (int) max_length);
+ snprintf(buff, sizeof(buff), "CHAR(%d)", (int) max_length);
answer->append(buff, (uint) strlen(buff));
}
else
{
- sprintf(buff, "VARCHAR(%d)", (int) max_length);
+ snprintf(buff, sizeof(buff), "VARCHAR(%d)", (int) max_length);
answer->append(buff, (uint) strlen(buff));
}
}
@@ -901,18 +901,18 @@ void field_real::get_opt_type(String *answer,
0 : (item->decimals + 1));
if (min_arg >= -128 && max_arg <= (min_arg >= 0 ? 255 : 127))
- sprintf(buff, "TINYINT(%d)", len);
+ snprintf(buff, sizeof(buff), "TINYINT(%d)", len);
else if (min_arg >= INT_MIN16 && max_arg <= (min_arg >= 0 ?
UINT_MAX16 : INT_MAX16))
- sprintf(buff, "SMALLINT(%d)", len);
+ snprintf(buff, sizeof(buff), "SMALLINT(%d)", len);
else if (min_arg >= INT_MIN24 && max_arg <= (min_arg >= 0 ?
UINT_MAX24 : INT_MAX24))
- sprintf(buff, "MEDIUMINT(%d)", len);
+ snprintf(buff, sizeof(buff), "MEDIUMINT(%d)", len);
else if (min_arg >= INT_MIN32 && max_arg <= (min_arg >= 0 ?
UINT_MAX32 : INT_MAX32))
- sprintf(buff, "INT(%d)", len);
+ snprintf(buff, sizeof(buff), "INT(%d)", len);
else
- sprintf(buff, "BIGINT(%d)", len);
+ snprintf(buff, sizeof(buff), "BIGINT(%d)", len);
answer->append(buff, (uint) strlen(buff));
if (min_arg >= 0)
answer->append(STRING_WITH_LEN(" UNSIGNED"));
@@ -927,10 +927,10 @@ void field_real::get_opt_type(String *answer,
else
{
if (min_arg >= -FLT_MAX && max_arg <= FLT_MAX)
- sprintf(buff, "FLOAT(%d,%d)", (int) max_length - (item->decimals + 1) + max_notzero_dec_len,
+ snprintf(buff, sizeof(buff), "FLOAT(%d,%d)", (int) max_length - (item->decimals + 1) + max_notzero_dec_len,
max_notzero_dec_len);
else
- sprintf(buff, "DOUBLE(%d,%d)", (int) max_length - (item->decimals + 1) + max_notzero_dec_len,
+ snprintf(buff, sizeof(buff), "DOUBLE(%d,%d)", (int) max_length - (item->decimals + 1) + max_notzero_dec_len,
max_notzero_dec_len);
answer->append(buff, (uint) strlen(buff));
}
@@ -949,18 +949,18 @@ void field_longlong::get_opt_type(String *answer,
char buff[MAX_FIELD_WIDTH];
if (min_arg >= -128 && max_arg <= (min_arg >= 0 ? 255 : 127))
- sprintf(buff, "TINYINT(%d)", (int) max_length);
+ snprintf(buff, sizeof(buff), "TINYINT(%d)", (int) max_length);
else if (min_arg >= INT_MIN16 && max_arg <= (min_arg >= 0 ?
UINT_MAX16 : INT_MAX16))
- sprintf(buff, "SMALLINT(%d)", (int) max_length);
+ snprintf(buff, sizeof(buff), "SMALLINT(%d)", (int) max_length);
else if (min_arg >= INT_MIN24 && max_arg <= (min_arg >= 0 ?
UINT_MAX24 : INT_MAX24))
- sprintf(buff, "MEDIUMINT(%d)", (int) max_length);
+ snprintf(buff, sizeof(buff), "MEDIUMINT(%d)", (int) max_length);
else if (min_arg >= INT_MIN32 && max_arg <= (min_arg >= 0 ?
UINT_MAX32 : INT_MAX32))
- sprintf(buff, "INT(%d)", (int) max_length);
+ snprintf(buff, sizeof(buff), "INT(%d)", (int) max_length);
else
- sprintf(buff, "BIGINT(%d)", (int) max_length);
+ snprintf(buff, sizeof(buff), "BIGINT(%d)", (int) max_length);
answer->append(buff, (uint) strlen(buff));
if (min_arg >= 0)
answer->append(STRING_WITH_LEN(" UNSIGNED"));
@@ -980,15 +980,15 @@ void field_ulonglong::get_opt_type(String *answer,
char buff[MAX_FIELD_WIDTH];
if (max_arg < 256)
- sprintf(buff, "TINYINT(%d) UNSIGNED", (int) max_length);
+ snprintf(buff, sizeof(buff), "TINYINT(%d) UNSIGNED", (int) max_length);
else if (max_arg <= ((2 * INT_MAX16) + 1))
- sprintf(buff, "SMALLINT(%d) UNSIGNED", (int) max_length);
+ snprintf(buff, sizeof(buff), "SMALLINT(%d) UNSIGNED", (int) max_length);
else if (max_arg <= ((2 * INT_MAX24) + 1))
- sprintf(buff, "MEDIUMINT(%d) UNSIGNED", (int) max_length);
+ snprintf(buff, sizeof(buff), "MEDIUMINT(%d) UNSIGNED", (int) max_length);
else if (max_arg < (((ulonglong) 1) << 32))
- sprintf(buff, "INT(%d) UNSIGNED", (int) max_length);
+ snprintf(buff, sizeof(buff), "INT(%d) UNSIGNED", (int) max_length);
else
- sprintf(buff, "BIGINT(%d) UNSIGNED", (int) max_length);
+ snprintf(buff, sizeof(buff), "BIGINT(%d) UNSIGNED", (int) max_length);
// if item is FIELD_ITEM, it _must_be_ Field_num in this class
answer->append(buff, (uint) strlen(buff));
if (item->type() == Item::FIELD_ITEM &&
@@ -1009,7 +1009,7 @@ void field_decimal::get_opt_type(String *answer,
my_decimal_set_zero(&zero);
my_bool is_unsigned= (zero.cmp(&min_arg) >= 0);
- length= sprintf(buff, "DECIMAL(%d, %d)",
+ length= snprintf(buff, sizeof(buff), "DECIMAL(%d, %d)",
(int) (max_length - (item->decimals ? 1 : 0)),
item->decimals);
if (is_unsigned)
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 4fb8070fee8..b7296395444 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1933,6 +1933,11 @@ retry_share:
table_list->alias.str);
goto err_lock;
}
+
+ /* Open view */
+ if (mysql_make_view(thd, share, table_list, false))
+ goto err_lock;
+
/*
This table is a view. Validate its metadata version: in particular,
that it was a view when the statement was prepared.
@@ -1940,10 +1945,6 @@ retry_share:
if (check_and_update_table_version(thd, table_list, share))
goto err_lock;
- /* Open view */
- if (mysql_make_view(thd, share, table_list, false))
- goto err_lock;
-
/* TODO: Don't free this */
tdc_release_share(share);
@@ -2836,7 +2837,7 @@ static bool inject_reprepare(THD *thd)
@sa Execute_observer
@sa check_prepared_statement() to see cases when an observer is installed
- @sa TABLE_LIST::is_table_ref_id_equal()
+ @sa TABLE_LIST::is_the_same_definition()
@sa TABLE_SHARE::get_table_ref_id()
@param[in] thd used to report errors
@@ -2859,7 +2860,7 @@ check_and_update_table_version(THD *thd,
created with TABLE_LIST::init_one_table() have a short life time and
aren't linked anywhere.
*/
- if (tables->prev_global && !tables->is_table_ref_id_equal(table_share))
+ if (tables->prev_global && !tables->is_the_same_definition(thd, table_share))
{
if (thd->m_reprepare_observer &&
thd->m_reprepare_observer->report_error(thd))
@@ -2965,7 +2966,9 @@ bool tdc_open_view(THD *thd, TABLE_LIST *table_list, uint flags)
DBUG_ASSERT(share->is_view);
- if (flags & CHECK_METADATA_VERSION)
+ err= mysql_make_view(thd, share, table_list, (flags & OPEN_VIEW_NO_PARSE));
+
+ if (!err && (flags & CHECK_METADATA_VERSION))
{
/*
Check TABLE_SHARE-version of view only if we have been instructed to do
@@ -2980,7 +2983,6 @@ bool tdc_open_view(THD *thd, TABLE_LIST *table_list, uint flags)
goto ret;
}
- err= mysql_make_view(thd, share, table_list, (flags & OPEN_VIEW_NO_PARSE));
ret:
tdc_release_share(share);
@@ -7567,10 +7569,12 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
Item *item;
List_iterator<Item> it(fields);
Query_arena *arena, backup;
+ uint *with_wild= returning_field ? &(thd->lex->returning()->with_wild) :
+ &(select_lex->with_wild);
DBUG_ENTER("setup_wild");
- if (!select_lex->with_wild)
- DBUG_RETURN(0);
+ if (!(*with_wild))
+ DBUG_RETURN(0);
/*
Don't use arena if we are not in prepared statements or stored procedures
@@ -7579,7 +7583,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
arena= thd->activate_stmt_arena_if_needed(&backup);
thd->lex->current_select->cur_pos_in_select_list= 0;
- while (select_lex->with_wild && (item= it++))
+ while (*with_wild && (item= it++))
{
if (item->type() == Item::FIELD_ITEM &&
((Item_field*) item)->field_name.str == star_clex_str.str &&
@@ -7617,12 +7621,12 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
*/
sum_func_list->elements+= fields.elements - elem;
}
- select_lex->with_wild--;
+ (*with_wild)--;
}
else
thd->lex->current_select->cur_pos_in_select_list++;
}
- DBUG_ASSERT(!select_lex->with_wild);
+ DBUG_ASSERT(!(*with_wild));
thd->lex->current_select->cur_pos_in_select_list= UNDEF_POS;
if (arena)
thd->restore_active_arena(arena, &backup);
@@ -8293,19 +8297,20 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
tables->is_natural_join);
DBUG_ASSERT(item->type() == Item::FIELD_ITEM);
Item_field *fld= (Item_field*) item;
+ const char *field_db_name= field_iterator.get_db_name();
const char *field_table_name= field_iterator.get_table_name();
if (!tables->schema_table &&
!(fld->have_privileges=
(get_column_grant(thd, field_iterator.grant(),
- field_iterator.get_db_name(),
+ field_db_name,
field_table_name, fld->field_name.str) &
VIEW_ANY_ACL)))
{
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), "ANY",
thd->security_ctx->priv_user,
thd->security_ctx->host_or_ip,
- field_table_name);
+ field_db_name, field_table_name);
DBUG_RETURN(TRUE);
}
}
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc
index bab2afb957a..9f61135232f 100644
--- a/sql/sql_binlog.cc
+++ b/sql/sql_binlog.cc
@@ -41,14 +41,13 @@ static int check_event_type(int type, Relay_log_info *rli)
*/
if (fd_event && fd_event->event_type_permutation)
{
- IF_DBUG({
- int new_type= fd_event->event_type_permutation[type];
- DBUG_PRINT("info",
- ("converting event type %d to %d (%s)",
- type, new_type,
- Log_event::get_type_str((Log_event_type)new_type)));
- },
- (void)0);
+#ifdef DBUG_TRACE
+ int new_type= fd_event->event_type_permutation[type];
+ DBUG_PRINT("info",
+ ("converting event type %d to %d (%s)",
+ type, new_type,
+ Log_event::get_type_str((Log_event_type)new_type)));
+#endif
type= fd_event->event_type_permutation[type];
}
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 9e8f0a8fe68..81ea002ce32 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -4770,7 +4770,7 @@ void Query_cache::cache_dump()
void Query_cache::queries_dump()
{
-
+#ifdef DBUG_TRACE
if (!initialized)
{
DBUG_PRINT("qcache", ("Query Cache not initialized"));
@@ -4831,11 +4831,13 @@ void Query_cache::queries_dump()
DBUG_PRINT("qcache", ("no queries in list"));
}
DBUG_PRINT("qcache", ("------------------"));
+#endif
}
void Query_cache::tables_dump()
{
+#ifdef DBUG_TRACE
if (!initialized || query_cache_size == 0)
{
DBUG_PRINT("qcache", ("Query Cache not initialized"));
@@ -4858,6 +4860,7 @@ void Query_cache::tables_dump()
else
DBUG_PRINT("qcache", ("no tables in list"));
DBUG_PRINT("qcache", ("--------------------"));
+#endif
}
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index a20cce7250c..173a0197bb6 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -451,6 +451,7 @@ void thd_storage_lock_wait(THD *thd, long long value)
extern "C"
void *thd_get_ha_data(const THD *thd, const struct handlerton *hton)
{
+ DBUG_ASSERT(thd == current_thd || mysql_mutex_is_owner(&thd->LOCK_thd_data));
return thd->ha_data[hton->slot].ha_ptr;
}
@@ -1522,6 +1523,8 @@ void THD::cleanup(void)
wsrep_client_thread= false;
#endif /* WITH_WSREP */
+ DEBUG_SYNC(this, "THD_cleanup_after_set_killed");
+
mysql_ha_cleanup(this);
locked_tables_list.unlock_locked_tables(this);
@@ -3936,6 +3939,7 @@ Statement::Statement(LEX *lex_arg, MEM_ROOT *mem_root_arg,
lex(lex_arg),
db(null_clex_str)
{
+ hr_prepare_time.val= 0,
name= null_clex_str;
}
@@ -3952,6 +3956,7 @@ void Statement::set_statement(Statement *stmt)
column_usage= stmt->column_usage;
lex= stmt->lex;
query_string= stmt->query_string;
+ hr_prepare_time= stmt->hr_prepare_time;
}
@@ -7374,7 +7379,7 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end, bool is_transactional)
}
-#if !defined(DBUG_OFF) && !defined(_lint)
+#if defined(DBUG_TRACE) && !defined(_lint)
static const char *
show_query_type(THD::enum_binlog_query_type qtype)
{
diff --git a/sql/sql_class.h b/sql/sql_class.h
index db9a88f06d2..9b85f92c360 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -120,8 +120,8 @@ enum enum_slave_type_conversions { SLAVE_TYPE_CONVERSIONS_ALL_LOSSY,
SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY};
/*
- MARK_COLUMNS_READ: A column is goind to be read.
- MARK_COLUMNS_WRITE: A column is going to be written to.
+ COLUMNS_READ: A column is goind to be read.
+ COLUMNS_WRITE: A column is going to be written to.
MARK_COLUMNS_READ: A column is goind to be read.
A bit in read set is set to inform handler that the field
is to be read. If field list contains duplicates, then
@@ -1336,6 +1336,7 @@ public:
LEX_CSTRING name; /* name for named prepared statements */
LEX *lex; // parse tree descriptor
+ my_hrtime_t hr_prepare_time; // time of preparation in microseconds
/*
Points to the query associated with this statement. It's const, but
we need to declare it char * because all table handlers are written
@@ -7313,7 +7314,12 @@ public:
inline bool add_item_to_list(THD *thd, Item *item)
{
- bool res= thd->lex->current_select->add_item_to_list(thd, item);
+ bool res;
+ LEX *lex= thd->lex;
+ if (lex->current_select->parsing_place == IN_RETURNING)
+ res= lex->returning()->add_item_to_list(thd, item);
+ else
+ res= lex->current_select->add_item_to_list(thd, item);
return res;
}
diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc
index 445bc97a3b5..a526bfee2d2 100644
--- a/sql/sql_cte.cc
+++ b/sql/sql_cte.cc
@@ -410,9 +410,17 @@ bool With_element::check_dependencies_in_spec()
{
for (st_select_lex *sl= spec->first_select(); sl; sl= sl->next_select())
{
- st_unit_ctxt_elem ctxt0= {NULL, owner->owner};
- st_unit_ctxt_elem ctxt1= {&ctxt0, spec};
- check_dependencies_in_select(sl, &ctxt1, false, &sl->with_dep);
+ if (owner->with_recursive)
+ {
+ st_unit_ctxt_elem ctxt0= {NULL, owner->owner};
+ st_unit_ctxt_elem ctxt1= {&ctxt0, spec};
+ check_dependencies_in_select(sl, &ctxt1, false, &sl->with_dep);
+ }
+ else
+ {
+ st_unit_ctxt_elem ctxt= {NULL, spec};
+ check_dependencies_in_select(sl, &ctxt, false, &sl->with_dep);
+ }
base_dep_map|= sl->with_dep;
}
return false;
@@ -480,29 +488,50 @@ With_element *With_clause::find_table_def(TABLE_LIST *table,
With_element *find_table_def_in_with_clauses(TABLE_LIST *tbl,
st_unit_ctxt_elem *ctxt)
{
- With_element *barrier= NULL;
+ With_element *found= 0;
for (st_unit_ctxt_elem *unit_ctxt_elem= ctxt;
unit_ctxt_elem;
unit_ctxt_elem= unit_ctxt_elem->prev)
{
st_select_lex_unit *unit= unit_ctxt_elem->unit;
With_clause *with_clause= unit->with_clause;
- if (with_clause &&
- (tbl->with= with_clause->find_table_def(tbl, barrier)))
- return tbl->with;
- barrier= NULL;
- if (unit->with_element && !unit->with_element->get_owner()->with_recursive)
+ /*
+ First look for the table definition in the with clause attached to 'unit'
+ if there is any such clause.
+ */
+ if (with_clause)
{
- /*
- This unit is the specification if the with element unit->with_element.
- The with element belongs to a with clause without the specifier RECURSIVE.
- So when searching for the matching definition of tbl this with clause must
- be looked up to this with element
- */
- barrier= unit->with_element;
+ found= with_clause->find_table_def(tbl, NULL);
+ if (found)
+ break;
+ }
+ /*
+ If 'unit' is the unit that defines a with element then reset 'unit'
+ to the unit whose attached with clause contains this with element.
+ */
+ With_element *with_elem= unit->with_element;
+ if (with_elem)
+ {
+ if (!(unit_ctxt_elem= unit_ctxt_elem->prev))
+ break;
+ unit= unit_ctxt_elem->unit;
+ }
+ with_clause= unit->with_clause;
+ /*
+ Now look for the table definition in this with clause. If the with clause
+ contains RECURSIVE the search is performed through all CTE definitions in
+ clause, otherwise up to the definition of 'with_elem' unless it is NULL.
+ */
+ if (with_clause)
+ {
+ found= with_clause->find_table_def(tbl,
+ with_clause->with_recursive ?
+ NULL : with_elem);
+ if (found)
+ break;
}
}
- return NULL;
+ return found;
}
@@ -532,22 +561,30 @@ void With_element::check_dependencies_in_select(st_select_lex *sl,
bool in_subq,
table_map *dep_map)
{
- With_clause *with_clause= sl->get_with_clause();
+ bool is_spec_select= sl->get_with_element() == this;
+
for (TABLE_LIST *tbl= sl->table_list.first; tbl; tbl= tbl->next_local)
{
- if (tbl->derived || tbl->nested_join)
+ if (tbl->with || tbl->derived || tbl->nested_join)
continue;
tbl->with_internal_reference_map= 0;
/*
- If there is a with clause attached to the unit containing sl
- look first for the definition of tbl in this with clause.
- If such definition is not found there look in the with
- clauses of the upper levels.
+ Look first for the definition of tbl in the with clause to which
+ this with element belongs. If such definition is not found there
+ look in the with clauses of the upper levels via the context
+ chain of embedding with elements.
If the definition of tbl is found somewhere in with clauses
- then tbl->with is set to point to this definition
+ then tbl->with is set to point to this definition.
*/
- if (with_clause && !tbl->with)
- tbl->with= with_clause->find_table_def(tbl, NULL);
+ if (is_spec_select)
+ {
+ With_clause *with_clause= sl->master_unit()->with_clause;
+ if (with_clause)
+ tbl->with= with_clause->find_table_def(tbl, NULL);
+ if (!tbl->with)
+ tbl->with= owner->find_table_def(tbl,
+ owner->with_recursive ? NULL : this);
+ }
if (!tbl->with)
tbl->with= find_table_def_in_with_clauses(tbl, ctxt);
@@ -574,8 +611,7 @@ void With_element::check_dependencies_in_select(st_select_lex *sl,
st_select_lex_unit *inner_unit= sl->first_inner_unit();
for (; inner_unit; inner_unit= inner_unit->next_unit())
{
- if (!inner_unit->with_element)
- check_dependencies_in_unit(inner_unit, ctxt, in_subq, dep_map);
+ check_dependencies_in_unit(inner_unit, ctxt, in_subq, dep_map);
}
}
@@ -653,10 +689,14 @@ void With_element::check_dependencies_in_unit(st_select_lex_unit *unit,
bool in_subq,
table_map *dep_map)
{
+ st_unit_ctxt_elem unit_ctxt_elem= {ctxt, unit};
if (unit->with_clause)
- check_dependencies_in_with_clause(unit->with_clause, ctxt, in_subq, dep_map);
+ {
+ (void) unit->with_clause->check_dependencies();
+ check_dependencies_in_with_clause(unit->with_clause, &unit_ctxt_elem,
+ in_subq, dep_map);
+ }
in_subq |= unit->item != NULL;
- st_unit_ctxt_elem unit_ctxt_elem= {ctxt, unit};
st_select_lex *sl= unit->first_select();
for (; sl; sl= sl->next_select())
{
diff --git a/sql/sql_cte.h b/sql/sql_cte.h
index 4cec1240d1f..e0fbd79803b 100644
--- a/sql/sql_cte.h
+++ b/sql/sql_cte.h
@@ -393,10 +393,24 @@ public:
bool add_with_element(With_element *elem);
/* Add this with clause to the list of with clauses used in the statement */
- void add_to_list(With_clause ** &last_next)
+ void add_to_list(With_clause **ptr, With_clause ** &last_next)
{
- *last_next= this;
- last_next= &this->next_with_clause;
+ if (embedding_with_clause)
+ {
+ /*
+ An embedded with clause is always placed before the embedding one
+ in the list of with clauses used in the query.
+ */
+ while (*ptr != embedding_with_clause)
+ ptr= &(*ptr)->next_with_clause;
+ *ptr= this;
+ next_with_clause= embedding_with_clause;
+ }
+ else
+ {
+ *last_next= this;
+ last_next= &this->next_with_clause;
+ }
}
st_select_lex_unit *get_owner() { return owner; }
diff --git a/sql/sql_debug.h b/sql/sql_debug.h
new file mode 100644
index 00000000000..cb4bfcec3ed
--- /dev/null
+++ b/sql/sql_debug.h
@@ -0,0 +1,168 @@
+#ifndef SQL_DEBUG_INCLUDED
+#define SQL_DEBUG_INCLUDED
+/*
+ Copyright (c) 2022, MariaDB
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; version 2 of
+ the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
+*/
+
+
+class Debug_key: public String
+{
+public:
+ Debug_key() { };
+ void print(THD *thd) const
+ {
+ push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
+ ER_UNKNOWN_ERROR, "DBUG: %.*s", length(), ptr());
+ }
+
+ bool append_key_type(ha_base_keytype type)
+ {
+ static LEX_CSTRING names[20]=
+ {
+ STRING_WITH_LEN("END"),
+ STRING_WITH_LEN("TEXT"),
+ STRING_WITH_LEN("BINARY"),
+ STRING_WITH_LEN("SHORT_INT"),
+ STRING_WITH_LEN("LONG_INT"),
+ STRING_WITH_LEN("FLOAT"),
+ STRING_WITH_LEN("DOUBLE"),
+ STRING_WITH_LEN("NUM"),
+ STRING_WITH_LEN("USHORT_INT"),
+ STRING_WITH_LEN("ULONG_INT"),
+ STRING_WITH_LEN("LONGLONG"),
+ STRING_WITH_LEN("ULONGLONG"),
+ STRING_WITH_LEN("INT24"),
+ STRING_WITH_LEN("UINT24"),
+ STRING_WITH_LEN("INT8"),
+ STRING_WITH_LEN("VARTEXT1"),
+ STRING_WITH_LEN("VARBINARY1"),
+ STRING_WITH_LEN("VARTEXT2"),
+ STRING_WITH_LEN("VARBINARY2"),
+ STRING_WITH_LEN("BIT")
+ };
+ if ((uint) type >= array_elements(names))
+ return append(STRING_WITH_LEN("???"));
+ return append(names[(uint) type]);
+ }
+
+ bool append_KEY_flag_names(ulong flags)
+ {
+ static LEX_CSTRING names[17]=
+ {
+ STRING_WITH_LEN("HA_NOSAME"),
+ STRING_WITH_LEN("HA_PACK_KEY"),
+ STRING_WITH_LEN("HA_SPACE_PACK_USED"),
+ STRING_WITH_LEN("HA_VAR_LENGTH_KEY"),
+ STRING_WITH_LEN("HA_AUTO_KEY"),
+ STRING_WITH_LEN("HA_BINARY_PACK_KEY"),
+ STRING_WITH_LEN("HA_NULL_PART_KEY"),
+ STRING_WITH_LEN("HA_FULLTEXT"),
+ STRING_WITH_LEN("HA_UNIQUE_CHECK"),
+ STRING_WITH_LEN("HA_SORT_ALLOWS_SAME"),
+ STRING_WITH_LEN("HA_SPATIAL"),
+ STRING_WITH_LEN("HA_NULL_ARE_EQUAL"),
+ STRING_WITH_LEN("HA_GENERATED_KEY"),
+ STRING_WITH_LEN("HA_USES_COMMENT"),
+ STRING_WITH_LEN("HA_USES_PARSER"),
+ STRING_WITH_LEN("HA_USES_BLOCK_SIZE"),
+ STRING_WITH_LEN("HA_KEY_HAS_PART_KEY_SEG")
+ };
+ return append_flag32_names((uint) flags, names, array_elements(names));
+ }
+
+ bool append_HA_KEYSEG_flag_names(uint32 flags)
+ {
+ static LEX_CSTRING names[]=
+ {
+ STRING_WITH_LEN("HA_SPACE_PACK"), // 1
+ STRING_WITH_LEN("??? 2 ???"), // 2
+ STRING_WITH_LEN("HA_PART_KEY_SEG"), // 4
+ STRING_WITH_LEN("HA_VAR_LENGTH_PART"), // 8
+ STRING_WITH_LEN("HA_NULL_PART"), // 16
+ STRING_WITH_LEN("HA_BLOB_PART"), // 32
+ STRING_WITH_LEN("HA_SWAP_KEY"), // 64
+ STRING_WITH_LEN("HA_REVERSE_SORT"), // 128
+ STRING_WITH_LEN("HA_NO_SORT"), // 256
+ STRING_WITH_LEN("??? 512 ???"), // 512
+ STRING_WITH_LEN("HA_BIT_PART"), // 1024
+ STRING_WITH_LEN("HA_CAN_MEMCMP") // 2048
+ };
+ return append_flag32_names(flags, names, array_elements(names));
+ }
+
+ bool append_HA_KEYSEG_type(ha_base_keytype type)
+ {
+ return append_ulonglong(type) ||
+ append(' ') ||
+ append_key_type(type);
+ }
+
+ bool append_HA_KEYSEG_flags(uint32 flags)
+ {
+ return append_hex_uint32(flags) ||
+ append(' ') ||
+ append_HA_KEYSEG_flag_names(flags);
+ }
+
+ bool append_key(const LEX_CSTRING &name, uint32 flags)
+ {
+ return
+ append_name_value(Lex_cstring(STRING_WITH_LEN("name")), name, '`') ||
+ append(Lex_cstring(STRING_WITH_LEN(" flags="))) ||
+ append_hex_uint32(flags) ||
+ append(' ') ||
+ append_KEY_flag_names(flags);
+ }
+
+ bool append_KEY(const KEY &key)
+ {
+ return append_key(key.name, key.flags);
+ }
+
+ static void print_keysegs(THD *thd, const HA_KEYSEG *seg, uint count)
+ {
+ for (uint i= 0; i < count; i++)
+ {
+ Debug_key tmp;
+ if (!tmp.append(Lex_cstring(STRING_WITH_LEN(" seg["))) &&
+ !tmp.append_ulonglong(i) &&
+ !tmp.append(Lex_cstring(STRING_WITH_LEN("].type="))) &&
+ !tmp.append_HA_KEYSEG_type((ha_base_keytype) seg[i].type))
+ tmp.print(thd);
+ tmp.length(0);
+ if (!tmp.append(Lex_cstring(STRING_WITH_LEN(" seg["))) &&
+ !tmp.append_ulonglong(i) &&
+ !tmp.append(Lex_cstring(STRING_WITH_LEN("].flag="))) &&
+ !tmp.append_HA_KEYSEG_flags(seg[i].flag))
+ tmp.print(thd);
+ }
+ }
+
+ static void print_keys(THD *thd, const char *where,
+ const KEY *keys, uint key_count)
+ {
+ for (uint i= 0; i < key_count; i++)
+ {
+ Debug_key tmp;
+ if (!tmp.append(where, strlen(where)) && !tmp.append_KEY(keys[i]))
+ tmp.print(thd);
+ }
+ }
+};
+
+
+#endif // SQL_DEBUG_INCLUDED
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 8bf65c7dd08..5a9e9ee1a62 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -3074,23 +3074,9 @@ void st_select_lex_node::include_down(st_select_lex_node *upper)
}
-void st_select_lex_node::add_slave(st_select_lex_node *slave_arg)
+void st_select_lex_node::attach_single(st_select_lex_node *slave_arg)
{
- for (; slave; slave= slave->next)
- if (slave == slave_arg)
- return;
-
- if (slave)
- {
- st_select_lex_node *slave_arg_slave= slave_arg->slave;
- /* Insert in the front of list of slaves if any. */
- slave_arg->include_neighbour(slave);
- /* include_neighbour() sets slave_arg->slave=0, restore it. */
- slave_arg->slave= slave_arg_slave;
- /* Count on include_neighbour() setting the master. */
- DBUG_ASSERT(slave_arg->master == this);
- }
- else
+ DBUG_ASSERT(slave == 0);
{
slave= slave_arg;
slave_arg->master= this;
@@ -9640,7 +9626,8 @@ Item *LEX::create_item_qualified_asterisk(THD *thd,
null_clex_str, *name,
star_clex_str)))
return NULL;
- current_select->with_wild++;
+ current_select->parsing_place == IN_RETURNING ?
+ thd->lex->returning()->with_wild++ : current_select->with_wild++;
return item;
}
@@ -9655,7 +9642,8 @@ Item *LEX::create_item_qualified_asterisk(THD *thd,
if (!(item= new (thd->mem_root) Item_field(thd, current_context(),
schema, *b, star_clex_str)))
return NULL;
- current_select->with_wild++;
+ current_select->parsing_place == IN_RETURNING ?
+ thd->lex->returning()->with_wild++ : current_select->with_wild++;
return item;
}
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 03299ae4451..6f3467fcd86 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -767,7 +767,7 @@ public:
inline st_select_lex_node* get_master() { return master; }
void include_down(st_select_lex_node *upper);
- void add_slave(st_select_lex_node *slave_arg);
+ void attach_single(st_select_lex_node *slave_arg);
void include_neighbour(st_select_lex_node *before);
void link_chain_down(st_select_lex_node *first);
void link_neighbour(st_select_lex_node *neighbour)
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 5c02bf43351..4fdae7f3534 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -7305,7 +7305,6 @@ bool check_fk_parent_table_access(THD *thd,
if (key->type == Key::FOREIGN_KEY)
{
TABLE_LIST parent_table;
- bool is_qualified_table_name;
Foreign_key *fk_key= (Foreign_key *)key;
LEX_CSTRING db_name;
LEX_CSTRING table_name= { fk_key->ref_table.str,
@@ -7322,7 +7321,6 @@ bool check_fk_parent_table_access(THD *thd,
if (fk_key->ref_db.str)
{
- is_qualified_table_name= true;
if (!(db_name.str= (char *) thd->memdup(fk_key->ref_db.str,
fk_key->ref_db.length+1)))
return true;
@@ -7344,7 +7342,6 @@ bool check_fk_parent_table_access(THD *thd,
if (!(db_name.str= (char *) thd->memdup(create_db,
db_name.length+1)))
return true;
- is_qualified_table_name= true;
if (check_db_name((LEX_STRING*) &db_name))
{
@@ -7356,8 +7353,6 @@ bool check_fk_parent_table_access(THD *thd,
{
if (thd->lex->copy_db_to(&db_name))
return true;
- else
- is_qualified_table_name= false;
}
}
@@ -7383,22 +7378,11 @@ bool check_fk_parent_table_access(THD *thd,
if (check_some_access(thd, privileges, &parent_table) ||
parent_table.grant.want_privilege)
{
- if (is_qualified_table_name)
- {
- const size_t qualified_table_name_len= NAME_LEN + 1 + NAME_LEN + 1;
- char *qualified_table_name= (char *) thd->alloc(qualified_table_name_len);
-
- my_snprintf(qualified_table_name, qualified_table_name_len, "%s.%s",
- db_name.str, table_name.str);
- table_name.str= qualified_table_name;
- }
-
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
- "REFERENCES",
- thd->security_ctx->priv_user,
- thd->security_ctx->host_or_ip,
- table_name.str);
-
+ "REFERENCES",
+ thd->security_ctx->priv_user,
+ thd->security_ctx->host_or_ip,
+ db_name.str, table_name.str);
return true;
}
}
@@ -7878,6 +7862,7 @@ static bool wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
thd->lex->sql_command != SQLCOM_SELECT &&
thd->wsrep_retry_counter < thd->variables.wsrep_retry_autocommit)
{
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sync.wsrep_retry_autocommit",
{
const char act[]=
@@ -7886,6 +7871,7 @@ static bool wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
"WAIT_FOR wsrep_retry_autocommit_continue";
DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act)));
});
+#endif
WSREP_DEBUG("wsrep retrying AC query: %lu %s",
thd->wsrep_retry_counter,
wsrep_thd_query(thd));
@@ -9206,7 +9192,7 @@ kill_one_thread(THD *thd, longlong id, killed_state kill_signal, killed_type typ
tmp= find_thread_by_id(id, type == KILL_TYPE_QUERY);
if (!tmp)
DBUG_RETURN(error);
-
+ DEBUG_SYNC(thd, "found_killee");
if (tmp->get_command() != COM_DAEMON)
{
/*
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 9631fdd331d..c82744ae48e 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -4505,6 +4505,8 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
if (thd->spcont == NULL)
general_log_write(thd, COM_STMT_PREPARE, query(), query_length());
}
+ // The same format as for triggers to compare
+ hr_prepare_time= my_hrtime();
DBUG_RETURN(error);
}
@@ -4598,8 +4600,8 @@ Prepared_statement::execute_loop(String *expanded_query,
uchar *packet_end)
{
Reprepare_observer reprepare_observer;
- bool error;
int reprepare_attempt= 0;
+ bool error;
iterations= FALSE;
/*
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index 0cb75f59094..b80825dd236 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -374,6 +374,7 @@ enum enum_parsing_place
BEFORE_OPT_LIST,
AFTER_LIST,
FOR_LOOP_BOUND,
+ IN_RETURNING,
PARSING_PLACE_SIZE /* always should be the last */
};
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 90fdce1b56f..e990b94b43c 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2018, Oracle and/or its affiliates.
- Copyright (c) 2008, 2020, MariaDB Corporation
+ Copyright (c) 2008, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2876,6 +2876,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
info->error= ER_UNKNOWN_ERROR;
goto err;
}
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("simulate_delay_at_shutdown",
{
const char act[]=
@@ -2884,6 +2885,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
DBUG_ASSERT(!debug_sync_set_action(thd,
STRING_WITH_LEN(act)));
};);
+#endif
/*
heartbeat_period from @master_heartbeat_period user variable
@@ -2973,12 +2975,14 @@ void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos,
if (should_stop(info))
break;
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("wait_after_binlog_EOF",
{
const char act[]= "now wait_for signal.rotate_finished";
DBUG_ASSERT(!debug_sync_set_action(current_thd,
STRING_WITH_LEN(act)));
};);
+#endif
THD_STAGE_INFO(thd,
stage_finished_reading_one_binlog_switching_to_next_binlog);
@@ -4119,7 +4123,7 @@ bool mysql_show_binlog_events(THD* thd)
binlog_size= s.st_size;
if (lex_mi->pos > binlog_size)
{
- sprintf(errmsg_buf, "Invalid pos specified. Requested from pos:%llu is "
+ snprintf(errmsg_buf, sizeof(errmsg_buf), "Invalid pos specified. Requested from pos:%llu is "
"greater than actual file size:%lu\n", lex_mi->pos,
(ulong)s.st_size);
errmsg= errmsg_buf;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 77abc267805..c8a48b505db 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1072,7 +1072,8 @@ public:
my_snprintf(m_view_access_denied_message, MYSQL_ERRMSG_SIZE,
ER_THD(thd, ER_TABLEACCESS_DENIED_ERROR), "SHOW VIEW",
m_sctx->priv_user,
- m_sctx->host_or_ip, m_top_view->get_table_name());
+ m_sctx->host_or_ip,
+ m_top_view->get_db_name(), m_top_view->get_table_name());
}
return m_view_access_denied_message_ptr;
}
@@ -1164,7 +1165,8 @@ mysqld_show_create_get_fields(THD *thd, TABLE_LIST *table_list,
DBUG_PRINT("debug", ("check_table_access failed"));
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
"SHOW", thd->security_ctx->priv_user,
- thd->security_ctx->host_or_ip, table_list->alias.str);
+ thd->security_ctx->host_or_ip,
+ table_list->db.str, table_list->alias.str);
goto exit;
}
DBUG_PRINT("debug", ("check_table_access succeeded"));
@@ -1193,7 +1195,8 @@ mysqld_show_create_get_fields(THD *thd, TABLE_LIST *table_list,
{
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
"SHOW", thd->security_ctx->priv_user,
- thd->security_ctx->host_or_ip, table_list->alias.str);
+ thd->security_ctx->host_or_ip,
+ table_list->db.str, table_list->alias.str);
goto exit;
}
}
@@ -7155,13 +7158,14 @@ static bool store_trigger(THD *thd, Trigger *trigger,
table->field[14]->store(STRING_WITH_LEN("OLD"), cs);
table->field[15]->store(STRING_WITH_LEN("NEW"), cs);
- if (trigger->create_time)
+ if (trigger->hr_create_time.val)
{
+ /* timestamp is in microseconds */
table->field[16]->set_notnull();
- thd->variables.time_zone->gmt_sec_to_TIME(&timestamp,
- (my_time_t)(trigger->create_time/100));
- /* timestamp is with 6 digits */
- timestamp.second_part= (trigger->create_time % 100) * 10000;
+ thd->variables.time_zone->
+ gmt_sec_to_TIME(&timestamp,
+ (my_time_t) hrtime_to_time(trigger->hr_create_time));
+ timestamp.second_part= hrtime_sec_part(trigger->hr_create_time);
table->field[16]->store_time_dec(&timestamp, 2);
}
@@ -9968,12 +9972,14 @@ static bool show_create_trigger_impl(THD *thd, Trigger *trigger)
p->store(&trigger->db_cl_name, system_charset_info);
- if (trigger->create_time)
+ if (trigger->hr_create_time.val)
{
MYSQL_TIME timestamp;
- thd->variables.time_zone->gmt_sec_to_TIME(&timestamp,
- (my_time_t)(trigger->create_time/100));
- timestamp.second_part= (trigger->create_time % 100) * 10000;
+ thd->variables.time_zone->
+ gmt_sec_to_TIME(&timestamp,
+ (my_time_t)
+ hrtime_to_time(trigger->hr_create_time));
+ timestamp.second_part= hrtime_sec_part(trigger->hr_create_time);
p->store_datetime(&timestamp, 2);
}
else
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 90693f407fb..fbc97ab54fb 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -173,6 +173,17 @@ void Binary_string::qs_append_hex(const char *str, uint32 len)
}
+void Binary_string::qs_append_hex_uint32(uint32 num)
+{
+ char *to= Ptr + str_length;
+ APPEND_HEX(to, (uchar) (num >> 24));
+ APPEND_HEX(to, (uchar) (num >> 16));
+ APPEND_HEX(to, (uchar) (num >> 8));
+ APPEND_HEX(to, (uchar) num);
+ str_length+= 8;
+}
+
+
// Convert a string to its HEX representation
bool Binary_string::set_hex(const char *str, uint32 len)
{
diff --git a/sql/sql_string.h b/sql/sql_string.h
index f9fe895b40b..b1f02bdb43b 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -399,6 +399,7 @@ public:
}
void qs_append(const char *str, size_t len);
void qs_append_hex(const char *str, uint32 len);
+ void qs_append_hex_uint32(uint32 num);
void qs_append(double d);
void qs_append(const double *d);
inline void qs_append(const char c)
@@ -614,7 +615,13 @@ public:
}
return false;
}
-
+ bool append_hex_uint32(uint32 num)
+ {
+ if (reserve(8))
+ return true;
+ qs_append_hex_uint32(num);
+ return false;
+ }
bool append_with_step(const char *s, uint32 arg_length, uint32 step_alloc)
{
uint32 new_length= arg_length + str_length;
@@ -987,6 +994,17 @@ public:
{
return append(&ls);
}
+ bool append_name_value(const LEX_CSTRING &name,
+ const LEX_CSTRING &value,
+ uchar quot= '\0')
+ {
+ return
+ append(name) ||
+ append('=') ||
+ (quot && append(quot)) ||
+ append(value) ||
+ (quot && append(quot));
+ }
bool append(const char *s, size_t size);
bool append_with_prefill(const char *s, uint32 arg_length,
uint32 full_length, char fill_char);
@@ -999,6 +1017,37 @@ public:
return append(s.str, s.length, cs);
}
+ /*
+ Append a bitmask in an uint32 with a translation into a
+ C-style human readable representation, e.g.:
+ 0x05 -> "(flag04|flag01)"
+
+ @param flags - the flags to translate
+ @param names - an array of flag names
+ @param count - the number of available elements in "names"
+ */
+ bool append_flag32_names(uint32 flags, LEX_CSTRING names[], size_t count)
+ {
+ bool added= false;
+ if (flags && append('('))
+ return true;
+ for (ulong i= 0; i <= 31; i++)
+ {
+ ulong bit= 31 - i;
+ if (flags & (1 << bit))
+ {
+ if (added && append('|'))
+ return true;
+ if (bit < count ? append(names[bit]) : append('?'))
+ return true;
+ added= true;
+ }
+ }
+ if (flags && append(')'))
+ return true;
+ return false;
+ }
+
void strip_sp();
friend String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
friend class Field;
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 66cd17e8af7..28f371fa2c6 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -59,6 +59,7 @@
#include "debug.h" // debug_crash_here()
#include <algorithm>
#include "wsrep_mysqld.h"
+#include "sql_debug.h"
#ifdef _WIN32
#include <io.h>
@@ -3760,6 +3761,13 @@ without_overlaps_err:
thd->mem_root))
DBUG_RETURN(TRUE);
+#ifndef DBUG_OFF
+ DBUG_EXECUTE_IF("key",
+ Debug_key::print_keys(thd, "prep_create_table: ",
+ *key_info_buffer, *key_count);
+ );
+#endif
+
DBUG_RETURN(FALSE);
}
@@ -9635,7 +9643,7 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
DEBUG_SYNC(thd, "alter_opened_table");
-#ifdef WITH_WSREP
+#if defined WITH_WSREP && defined ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sync.alter_opened_table",
{
const char act[]=
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 911c4e7349c..d29ef532382 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -38,6 +38,8 @@
#include "debug.h" // debug_crash_here
#include "mysql/psi/mysql_sp.h"
#include "wsrep_mysqld.h"
+#include <my_time.h>
+#include <mysql_time.h>
/*************************************************************************/
@@ -222,7 +224,7 @@ static File_option triggers_file_parameters[]=
},
{
{ STRING_WITH_LEN("created") },
- my_offsetof(class Table_triggers_list, create_times),
+ my_offsetof(class Table_triggers_list, hr_create_times),
FILE_OPTIONS_ULLLIST
},
{ { 0, 0 }, 0, FILE_OPTIONS_STRING }
@@ -644,7 +646,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
goto end;
}
-#ifdef WITH_WSREP
+#if defined WITH_WSREP && defined ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sync.mdev_20225",
{
const char act[]=
@@ -653,7 +655,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
DBUG_ASSERT(!debug_sync_set_action(thd,
STRING_WITH_LEN(act)));
};);
-#endif /* WITH_WSREP */
+#endif /* WITH_WSREP && ENABLED_DEBUG_SYNC */
if (create)
result= table->triggers->create_trigger(thd, tables, &stmt_query,
@@ -1057,6 +1059,10 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
if (!(trigger= new (&table->mem_root) Trigger(this, 0)))
goto err;
+ /* Time with in microseconds */
+ trigger->hr_create_time= make_hr_time(thd->query_start(),
+ thd->query_start_sec_part());
+
/* Create trigger_name.TRN file to ensure trigger name is unique */
if (sql_create_definition_file(NULL, &trigname_file, &trigname_file_type,
(uchar*)&trigname, trigname_file_parameters))
@@ -1069,8 +1075,6 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables,
/* Populate the trigger object */
trigger->sql_mode= thd->variables.sql_mode;
- /* Time with 2 decimals, like in MySQL 5.7 */
- trigger->create_time= ((ulonglong) thd->query_start())*100 + thd->query_start_sec_part()/10000;
build_trig_stmt_query(thd, tables, stmt_query, &trigger_definition,
&trigger->definer, trg_definer_holder);
@@ -1138,7 +1142,7 @@ void Table_triggers_list::empty_lists()
client_cs_names.empty();
connection_cl_names.empty();
db_cl_names.empty();
- create_times.empty();
+ hr_create_times.empty();
}
@@ -1174,7 +1178,7 @@ bool Trigger::add_to_file_list(void* param_arg)
base->client_cs_names.push_back(&client_cs_name, mem_root) ||
base->connection_cl_names.push_back(&connection_cl_name, mem_root) ||
base->db_cl_names.push_back(&db_cl_name, mem_root) ||
- base->create_times.push_back(&create_time, mem_root))
+ base->hr_create_times.push_back(&hr_create_time.val, mem_root))
return 1;
return 0;
}
@@ -1584,7 +1588,8 @@ bool Table_triggers_list::check_n_load(THD *thd, const LEX_CSTRING *db,
List_iterator_fast<LEX_CSTRING> it_client_cs_name(trigger_list->client_cs_names);
List_iterator_fast<LEX_CSTRING> it_connection_cl_name(trigger_list->connection_cl_names);
List_iterator_fast<LEX_CSTRING> it_db_cl_name(trigger_list->db_cl_names);
- List_iterator_fast<ulonglong> it_create_times(trigger_list->create_times);
+ List_iterator_fast<ulonglong>
+ it_create_times(trigger_list->hr_create_times);
LEX *old_lex= thd->lex;
LEX lex;
sp_rcontext *save_spcont= thd->spcont;
@@ -1670,7 +1675,13 @@ bool Table_triggers_list::check_n_load(THD *thd, const LEX_CSTRING *db,
trigger->sql_mode= sql_mode;
trigger->definition= *trg_create_str;
- trigger->create_time= trg_create_time ? *trg_create_time : 0;
+ trigger->hr_create_time.val= trg_create_time ? *trg_create_time : 0;
+ /*
+ Fix time if in 100th of second (comparison with max uint * 100
+ (max possible timestamp in the old format))
+ */
+ if (trigger->hr_create_time.val < 429496729400ULL)
+ trigger->hr_create_time.val*= 10000;
trigger->name= sp ? sp->m_name : empty_clex_str;
trigger->on_table_name.str= (char*) lex.raw_trg_on_table_name_begin;
trigger->on_table_name.length= (lex.raw_trg_on_table_name_end -
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h
index 739669c86a5..774dca7cba1 100644
--- a/sql/sql_trigger.h
+++ b/sql/sql_trigger.h
@@ -140,7 +140,7 @@ public:
GRANT_INFO subject_table_grants;
sql_mode_t sql_mode;
/* Store create time. Can't be mysql_time_t as this holds also sub seconds */
- ulonglong create_time;
+ my_hrtime_t hr_create_time; // Create time timestamp in microseconds
trg_event_type event;
trg_action_time_type action_time;
uint action_order;
@@ -223,7 +223,7 @@ public:
*/
List<ulonglong> definition_modes_list;
/** Create times for triggers */
- List<ulonglong> create_times;
+ List<ulonglong> hr_create_times;
List<LEX_CSTRING> definers_list;
diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc
index d80342a8395..a045d0e3908 100644
--- a/sql/sql_tvc.cc
+++ b/sql/sql_tvc.cc
@@ -743,7 +743,7 @@ st_select_lex *wrap_tvc(THD *thd, st_select_lex *tvc_sl,
Attach the select used of TVC as the only slave to the unit for
the derived table tvc_x of the transformation
*/
- derived_unit->add_slave(tvc_sl);
+ derived_unit->attach_single(tvc_sl);
tvc_sl->set_linkage(DERIVED_TABLE_TYPE);
/*
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index b55bbc7ffac..02f068e9bbc 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -620,7 +620,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
/* Allow creation of functions even if we can't open func table */
if (unlikely(!table))
- goto err;
+ goto err_open_func_table;
table->use_all_columns();
restore_record(table, s->default_values); // Default values for fields
table->field[0]->store(u_d->name.str, u_d->name.length, system_charset_info);
@@ -634,7 +634,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
{
my_error(ER_ERROR_ON_WRITE, MYF(0), "mysql.func", error);
del_udf(u_d);
- goto err;
+ goto err_open_func_table;
}
done:
@@ -649,6 +649,7 @@ done:
err:
if (new_dl)
dlclose(dl);
+err_open_func_table:
mysql_rwlock_unlock(&THR_LOCK_udf);
DBUG_RETURN(1);
}
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index e8bdbcba2f2..758edbdcbaa 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -1075,15 +1075,6 @@ st_select_lex_unit::init_prepare_fake_select_lex(THD *thd_arg,
order= order->next)
order->item= &order->item_ptr;
}
- for (ORDER *order= global_parameters()->order_list.first;
- order;
- order=order->next)
- {
- (*order->item)->walk(&Item::change_context_processor, 0,
- &fake_select_lex->context);
- (*order->item)->walk(&Item::set_fake_select_as_master_processor, 0,
- fake_select_lex);
- }
}
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 6dedd5e85be..7a52b822b9d 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -306,7 +306,8 @@ bool create_view_precheck(THD *thd, TABLE_LIST *tables, TABLE_LIST *view,
{
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
"ANY", thd->security_ctx->priv_user,
- thd->security_ctx->priv_host, tbl->table_name.str);
+ thd->security_ctx->priv_host,
+ tbl->db.str, tbl->table_name.str);
goto err;
}
/*
@@ -834,7 +835,7 @@ static File_option view_parameters[]=
my_offsetof(TABLE_LIST, with_check),
FILE_OPTIONS_ULONGLONG},
{{ STRING_WITH_LEN("timestamp")},
- my_offsetof(TABLE_LIST, timestamp),
+ my_offsetof(TABLE_LIST, hr_timestamp),
FILE_OPTIONS_TIMESTAMP},
{{ STRING_WITH_LEN("create-version")},
my_offsetof(TABLE_LIST, file_version),
@@ -858,6 +859,15 @@ static File_option view_parameters[]=
FILE_OPTIONS_STRING}
};
+
+static File_option view_timestamp_parameters[]=
+{
+
+ {{ C_STRING_WITH_LEN("timestamp")}, 0, FILE_OPTIONS_TIMESTAMP},
+ {{NullS, 0}, 0, FILE_OPTIONS_STRING}
+};
+
+
static LEX_CSTRING view_file_type[]= {{STRING_WITH_LEN("VIEW") }};
@@ -875,8 +885,8 @@ int mariadb_fix_view(THD *thd, TABLE_LIST *view, bool wrong_checksum,
&path, path_buff, sizeof(path_buff),
&file, view);
/* init timestamp */
- if (!view->timestamp.str)
- view->timestamp.str= view->timestamp_buffer;
+ if (!view->hr_timestamp.str)
+ view->hr_timestamp.str= view->timestamp_buffer;
if (swap_alg && view->algorithm != VIEW_ALGORITHM_UNDEFINED)
{
@@ -891,13 +901,13 @@ int mariadb_fix_view(THD *thd, TABLE_LIST *view, bool wrong_checksum,
swap_alg= 0;
if (wrong_checksum)
{
- if (view->md5.length != 32)
+ if (view->md5.length != VIEW_MD5_LEN)
{
- if ((view->md5.str= (char *)thd->alloc(32 + 1)) == NULL)
+ if ((view->md5.str= (char *)thd->alloc(VIEW_MD5_LEN + 1)) == NULL)
DBUG_RETURN(HA_ADMIN_FAILED);
}
view->calc_md5(const_cast<char*>(view->md5.str));
- view->md5.length= 32;
+ view->md5.length= VIEW_MD5_LEN;
}
view->mariadb_version= MYSQL_VERSION_ID;
@@ -1021,13 +1031,13 @@ static int mysql_register_view(THD *thd, DDL_LOG_STATE *ddl_log_state,
view->file_version= 2;
view->mariadb_version= MYSQL_VERSION_ID;
view->calc_md5(md5);
- if (!(view->md5.str= (char*) thd->memdup(md5, 32)))
+ if (!(view->md5.str= (char*) thd->memdup(md5, VIEW_MD5_LEN)))
{
my_error(ER_OUT_OF_RESOURCES, MYF(0));
error= -1;
goto err;
}
- view->md5.length= 32;
+ view->md5.length= VIEW_MD5_LEN;
can_be_merged= lex->can_be_merged();
if (lex->create_view->algorithm == VIEW_ALGORITHM_MERGE &&
!lex->can_be_merged())
@@ -1078,8 +1088,8 @@ loop_out:
&path, path_buff, sizeof(path_buff),
&file, view);
/* init timestamp */
- if (!view->timestamp.str)
- view->timestamp.str= view->timestamp_buffer;
+ if (!view->hr_timestamp.str)
+ view->hr_timestamp.str= view->timestamp_buffer;
/* check old .frm */
{
@@ -1224,7 +1234,32 @@ err:
DBUG_RETURN(error);
}
+/**
+ Reads view definition "version"
+ @param[in] share Share object of view
+
+ @return true on error, otherwise false
+*/
+
+bool mariadb_view_version_get(TABLE_SHARE *share)
+{
+ DBUG_ASSERT(share->is_view);
+
+ if (!(share->tabledef_version.str=
+ (uchar*) alloc_root(&share->mem_root,
+ MICROSECOND_TIMESTAMP_BUFFER_SIZE)))
+ return TRUE;
+ share->tabledef_version.length= 0; // safety if the drfinition file is brocken
+
+ DBUG_ASSERT(share->view_def != NULL);
+ if (share->view_def->parse((uchar *) &share->tabledef_version, NULL,
+ view_timestamp_parameters, 1,
+ &file_parser_dummy_hook))
+ return TRUE;
+ DBUG_ASSERT(share->tabledef_version.length == MICROSECOND_TIMESTAMP_BUFFER_SIZE-1);
+ return FALSE;
+}
/**
read VIEW .frm and create structures
@@ -1287,6 +1322,10 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
mysql_handle_single_derived(thd->lex, table, DT_REINIT);
DEBUG_SYNC(thd, "after_cached_view_opened");
+ if (!share->tabledef_version.length)
+ {
+ mariadb_view_version_get(share);
+ }
DBUG_RETURN(0);
}
@@ -1323,8 +1362,8 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
arena= thd->activate_stmt_arena_if_needed(&backup);
/* init timestamp */
- if (!table->timestamp.str)
- table->timestamp.str= table->timestamp_buffer;
+ if (!table->hr_timestamp.str)
+ table->hr_timestamp.str= table->timestamp_buffer;
/* prepare default values for old format */
table->view_suid= TRUE;
table->definer.user.str= table->definer.host.str= 0;
@@ -1340,6 +1379,19 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
required_view_parameters,
&file_parser_dummy_hook)))
goto end;
+ if (!share->tabledef_version.length)
+ {
+ share->tabledef_version.str= (const uchar *)
+ memdup_root(&share->mem_root,
+ (const void *)
+ table->hr_timestamp.str,
+ (share->tabledef_version.length=
+ table->hr_timestamp.length));
+ }
+ if (!table->tabledef_version.length)
+ {
+ table->set_view_def_version(&table->hr_timestamp);
+ }
/*
check old format view .frm
@@ -2196,10 +2248,10 @@ bool insert_view_fields(THD *thd, List<Item> *list, TABLE_LIST *view)
int view_checksum(THD *thd, TABLE_LIST *view)
{
char md5[MD5_BUFF_LENGTH];
- if (!view->view || view->md5.length != 32)
+ if (!view->view || view->md5.length != VIEW_MD5_LEN)
return HA_ADMIN_NOT_IMPLEMENTED;
view->calc_md5(md5);
- return (strncmp(md5, view->md5.str, 32) ?
+ return (strncmp(md5, view->md5.str, VIEW_MD5_LEN) ?
HA_ADMIN_WRONG_CHECKSUM :
HA_ADMIN_OK);
}
@@ -2304,7 +2356,7 @@ mysql_rename_view(THD *thd,
object for it.
*/
view_def.reset();
- view_def.timestamp.str= view_def.timestamp_buffer;
+ view_def.hr_timestamp.str= view_def.timestamp_buffer;
view_def.view_suid= TRUE;
/* get view definition and source */
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 005d69b55ba..9217f2f52ef 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -8944,14 +8944,20 @@ select_item_list:
| select_item
| '*'
{
+ bool is_parsing_returning=
+ thd->lex->current_select->parsing_place ==
+ IN_RETURNING;
+ SELECT_LEX *correct_select= is_parsing_returning ?
+ thd->lex->returning() :
+ thd->lex->current_select;
Item *item= new (thd->mem_root)
- Item_field(thd, &thd->lex->current_select->context,
+ Item_field(thd, &correct_select->context,
star_clex_str);
if (unlikely(item == NULL))
MYSQL_YYABORT;
if (unlikely(add_item_to_list(thd, item)))
MYSQL_YYABORT;
- (thd->lex->current_select->with_wild)++;
+ correct_select->with_wild++;
}
;
@@ -13426,19 +13432,33 @@ opt_returning:
| RETURNING_SYM
{
DBUG_ASSERT(!Lex->has_returning());
- if (($<num>$= (Select != Lex->returning())))
- {
- SELECT_LEX *sl= Lex->returning();
- sl->set_master_unit(0);
- Select->add_slave(Lex->create_unit(sl));
- sl->include_global((st_select_lex_node**)&Lex->all_selects_list);
- Lex->push_select(sl);
- }
+ /*
+ When parsing_place is IN_RETURNING, we push select items to
+ item_list of builtin_select instead of current_select.
+ But set parsing_place of current_select to true.
+
+ Because parsing_place for builtin_select will be IN_RETURNING,
+ regardless there is SELECT in RETURNING. Example, if
+ there is RETURNING (SELECT...), then when we parse
+ SELECT inside RETURNING, builtin_select->parsing_place
+ will still be true. So the select items of SELECT inside
+ RETURNING will be added to item_list of builtin_select which
+ is incorrect. We want to prevent this from happening.
+ Since for every new select, a new SELECT_LEX
+ object is created and pushed to select stack, current_select
+ will point to SELECT inside RETURNING, and also has
+ parsing_place not set to IN_RETURNING by default.
+ So items are correctly added to item_list of SELECT inside
+ RETURNING instead of builtin_select.
+ */
+
+ thd->lex->current_select->parsing_place= IN_RETURNING;
+ thd->lex->push_context(&thd->lex->returning()->context);
}
select_item_list
{
- if ($<num>2)
- Lex->pop_select();
+ thd->lex->pop_context();
+ thd->lex->current_select->parsing_place= NO_MATTER;
}
;
@@ -14956,7 +14976,8 @@ with_clause:
lex->derived_tables|= DERIVED_WITH;
lex->with_cte_resolution= true;
lex->curr_with_clause= with_clause;
- with_clause->add_to_list(Lex->with_clauses_list_last_next);
+ with_clause->add_to_list(&lex->with_clauses_list,
+ lex->with_clauses_list_last_next);
if (lex->current_select &&
lex->current_select->parsing_place == BEFORE_OPT_LIST)
lex->current_select->parsing_place= NO_MATTER;
diff --git a/sql/table.cc b/sql/table.cc
index 03fa3f34525..a73dff5415d 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -8843,7 +8843,7 @@ int TABLE::update_virtual_fields(handler *h, enum_vcol_update_mode update_mode)
{
/* Compute the actual value of the virtual fields */
DBUG_FIX_WRITE_SET(vf);
-# ifndef DBUG_OFF
+# ifdef DBUG_TRACE
int field_error=
# endif
vcol_info->expr->save_in_field(vf, 0);
@@ -9751,6 +9751,73 @@ bool TABLE_LIST::is_with_table()
return derived && derived->with_element;
}
+
+/**
+ Check if the definition are the same.
+
+ If versions do not match it check definitions (with checking and setting
+ trigger definition versions (times)
+
+ @param[in] view TABLE_LIST of the view
+ @param[in] share Share object of view
+
+ @return false on error or different definitions.
+
+ @sa check_and_update_table_version()
+*/
+
+bool TABLE_LIST::is_the_same_definition(THD* thd, TABLE_SHARE *s)
+{
+ enum enum_table_ref_type tp= s->get_table_ref_type();
+ if (m_table_ref_type == tp)
+ {
+ /*
+ Cache have not changed which means that definition was not changed
+ including triggers
+ */
+ if (m_table_ref_version == s->get_table_ref_version())
+ return TRUE;
+
+ /*
+ If cache changed then check content version
+ */
+ if ((tabledef_version.length &&
+ tabledef_version.length == s->tabledef_version.length &&
+ memcmp(tabledef_version.str, s->tabledef_version.str,
+ tabledef_version.length) == 0))
+ {
+ // Definition have not changed, let's check if triggers changed.
+ if (table && table->triggers)
+ {
+
+ my_hrtime_t hr_stmt_prepare= thd->hr_prepare_time;
+ if (hr_stmt_prepare.val)
+ for(uint i= 0; i < TRG_EVENT_MAX; i++)
+ for (uint j= 0; j < TRG_ACTION_MAX; j++)
+ {
+ Trigger *tr=
+ table->triggers->get_trigger((trg_event_type)i,
+ (trg_action_time_type)j);
+ if (tr)
+ if (hr_stmt_prepare.val <= tr->hr_create_time.val)
+ {
+ set_tabledef_version(s);
+ return FALSE;
+ }
+ }
+ }
+ set_table_id(s);
+ return TRUE;
+ }
+ else
+ tabledef_version.length= 0;
+ }
+ else
+ set_tabledef_version(s);
+ return FALSE;
+}
+
+
uint TABLE_SHARE::actual_n_key_parts(THD *thd)
{
return use_ext_keys &&
diff --git a/sql/table.h b/sql/table.h
index 613b8cf611d..84368e7c8e0 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -36,6 +36,19 @@
#include "sql_type.h" /* vers_kind_t */
#include "privilege.h" /* privilege_t */
+/*
+ Buffer for unix timestamp in microseconds:
+ 9,223,372,036,854,775,807 (signed int64 maximal value)
+ 1 234 567 890 123 456 789
+
+ Note: we can use unsigned for calculation, but practically they
+ are the same by probability to overflow them (signed int64 in
+ microseconds is enough for almost 3e5 years) and signed allow to
+ avoid increasing the buffer (the old buffer for human readable
+ date was 19+1).
+*/
+#define MICROSECOND_TIMESTAMP_BUFFER_SIZE (19 + 1)
+
/* Structs that defines the TABLE */
class Item; /* Needed by ORDER */
@@ -72,6 +85,8 @@ class Table_function_json_table;
*/
typedef ulonglong nested_join_map;
+#define VIEW_MD5_LEN 32
+
#define tmp_file_prefix "#sql" /**< Prefix for tmp tables */
#define tmp_file_prefix_length 4
@@ -1091,7 +1106,7 @@ struct TABLE_SHARE
with a base table, a base table is replaced with a temporary
table and so on.
- @sa TABLE_LIST::is_table_ref_id_equal()
+ @sa TABLE_LIST::is_the_same_definition()
*/
ulong get_table_ref_version() const
{
@@ -2461,6 +2476,12 @@ struct TABLE_LIST
to view with SQL SECURITY DEFINER)
*/
Security_context *security_ctx;
+ uchar tabledef_version_buf[MY_UUID_SIZE >
+ MICROSECOND_TIMESTAMP_BUFFER_SIZE-1 ?
+ MY_UUID_SIZE + 1 :
+ MICROSECOND_TIMESTAMP_BUFFER_SIZE];
+ LEX_CUSTRING tabledef_version;
+
/*
This view security context (non-zero only for views with
SQL SECURITY DEFINER)
@@ -2474,7 +2495,7 @@ struct TABLE_LIST
LEX_CSTRING source; /* source of CREATE VIEW */
LEX_CSTRING view_db; /* saved view database */
LEX_CSTRING view_name; /* saved view name */
- LEX_STRING timestamp; /* GMT time stamp of last operation */
+ LEX_STRING hr_timestamp; /* time stamp of last operation */
LEX_USER definer; /* definer of view */
ulonglong file_version; /* version of file's field set */
ulonglong mariadb_version; /* version of server on creation */
@@ -2558,7 +2579,7 @@ struct TABLE_LIST
/* TABLE_TYPE_UNKNOWN if any type is acceptable */
Table_type required_type;
handlerton *db_type; /* table_type for handler */
- char timestamp_buffer[MAX_DATETIME_WIDTH + 1];
+ char timestamp_buffer[MICROSECOND_TIMESTAMP_BUFFER_SIZE];
/*
This TABLE_LIST object is just placeholder for prelocking, it will be
used for implicit LOCK TABLES only and won't be used in real statement.
@@ -2756,19 +2777,7 @@ struct TABLE_LIST
*/
bool process_index_hints(TABLE *table);
- /**
- Compare the version of metadata from the previous execution
- (if any) with values obtained from the current table
- definition cache element.
-
- @sa check_and_update_table_version()
- */
- inline bool is_table_ref_id_equal(TABLE_SHARE *s) const
- {
- return (m_table_ref_type == s->get_table_ref_type() &&
- m_table_ref_version == s->get_table_ref_version());
- }
-
+ bool is_the_same_definition(THD *thd, TABLE_SHARE *s);
/**
Record the value of metadata version of the corresponding
table definition cache element in this parse tree node.
@@ -2785,6 +2794,26 @@ struct TABLE_LIST
m_table_ref_version= table_ref_version_arg;
}
+ void set_table_id(TABLE_SHARE *s)
+ {
+ set_table_ref_id(s);
+ set_tabledef_version(s);
+ }
+
+ void set_tabledef_version(TABLE_SHARE *s)
+ {
+ if (!tabledef_version.length && s->tabledef_version.length)
+ {
+ DBUG_ASSERT(s->tabledef_version.length <
+ sizeof(tabledef_version_buf));
+ tabledef_version.str= tabledef_version_buf;
+ memcpy(tabledef_version_buf, s->tabledef_version.str,
+ (tabledef_version.length= s->tabledef_version.length));
+ // safety
+ tabledef_version_buf[tabledef_version.length]= 0;
+ }
+ }
+
/* Set of functions returning/setting state of a derived table/view. */
bool is_non_derived() const { return (!derived_type); }
bool is_view_or_derived() const { return derived_type; }
@@ -2898,6 +2927,12 @@ struct TABLE_LIST
}
}
+ inline void set_view_def_version(LEX_STRING *version)
+ {
+ m_table_ref_type= TABLE_REF_VIEW;
+ tabledef_version.str= (const uchar *) version->str;
+ tabledef_version.length= version->length;
+ }
private:
bool prep_check_option(THD *thd, uint8 check_opt_type);
bool prep_where(THD *thd, Item **conds, bool no_where_clause);
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 22e14c8272a..4934531c985 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -2764,7 +2764,8 @@ main(int argc, char **argv)
trunc_tables= trunc_tables_const;
printf("set @wsrep_is_on=(%s);\n", wsrep_is_on);
- printf("SELECT concat('%%', GROUP_CONCAT(OPTION), '%%') INTO @replicate_opt "
+ printf("SET STATEMENT SQL_MODE='' FOR "
+ "SELECT concat('%%', GROUP_CONCAT(OPTION), '%%') INTO @replicate_opt "
" FROM"
" (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION"
" FROM information_schema.TABLES"
diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc
index e165a204f56..708eb552866 100644
--- a/sql/wsrep_high_priority_service.cc
+++ b/sql/wsrep_high_priority_service.cc
@@ -405,6 +405,7 @@ int Wsrep_high_priority_service::apply_toi(const wsrep::ws_meta& ws_meta,
WSREP_DEBUG("Wsrep_high_priority_service::apply_toi: %lld",
client_state.toi_meta().seqno().get());
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sync.wsrep_apply_toi",
{
const char act[]=
@@ -414,6 +415,7 @@ int Wsrep_high_priority_service::apply_toi(const wsrep::ws_meta& ws_meta,
DBUG_ASSERT(!debug_sync_set_action(thd,
STRING_WITH_LEN(act)));
};);
+#endif
int ret= apply_events(thd, m_rli, data, err);
wsrep_thd_set_ignored_error(thd, false);
@@ -459,6 +461,7 @@ int Wsrep_high_priority_service::log_dummy_write_set(const wsrep::ws_handle& ws_
DBUG_PRINT("info",
("Wsrep_high_priority_service::log_dummy_write_set: seqno=%lld",
ws_meta.seqno().get()));
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sync.wsrep_log_dummy_write_set",
{
const char act[]=
@@ -467,6 +470,7 @@ int Wsrep_high_priority_service::log_dummy_write_set(const wsrep::ws_handle& ws_
DBUG_ASSERT(!debug_sync_set_action(m_thd,
STRING_WITH_LEN(act)));
};);
+#endif
if (ws_meta.ordered())
{
@@ -562,8 +566,8 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
/* moved dbug sync point here, after possible THD switch for SR transactions
has ben done
*/
- /* Allow tests to block the applier thread using the DBUG facilities */
#ifdef ENABLED_DEBUG_SYNC
+ /* Allow tests to block the applier thread using the DBUG facilities */
DBUG_EXECUTE_IF("sync.wsrep_apply_cb",
{
const char act[]=
@@ -716,6 +720,7 @@ int Wsrep_replayer_service::apply_write_set(const wsrep::ws_meta& ws_meta,
DBUG_ASSERT(thd->wsrep_trx().active());
DBUG_ASSERT(thd->wsrep_trx().state() == wsrep::transaction::s_replaying);
+#ifdef ENABLED_DEBUG_SYNC
/* Allow tests to block the replayer thread using the DBUG facilities */
DBUG_EXECUTE_IF("sync.wsrep_replay_cb",
{
@@ -726,6 +731,7 @@ int Wsrep_replayer_service::apply_write_set(const wsrep::ws_meta& ws_meta,
DBUG_ASSERT(!debug_sync_set_action(thd,
STRING_WITH_LEN(act)));
};);
+#endif
wsrep_setup_uk_and_fk_checks(thd);
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index f43e641c8f3..23c9d49ec73 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -707,11 +707,14 @@ static std::string wsrep_server_incoming_address()
/*
In case port is not specified in wsrep_node_incoming_address, we use
mysqld_port.
+ Note that we might get here before we execute set_ports().
*/
- int port= (addr.get_port() > 0) ? addr.get_port() : (int) mysqld_port;
+ int local_port= (addr.get_port() > 0) ? addr.get_port() : (int) mysqld_port;
+ if (!local_port)
+ local_port= MYSQL_PORT;
const char *fmt= (addr.is_ipv6()) ? "[%s]:%u" : "%s:%u";
- snprintf(inc_addr, inc_addr_max, fmt, addr.get_address(), port);
+ snprintf(inc_addr, inc_addr_max, fmt, addr.get_address(), local_port);
}
done:
diff --git a/sql/wsrep_server_service.cc b/sql/wsrep_server_service.cc
index 4916005e7ed..9be6af71c56 100644
--- a/sql/wsrep_server_service.cc
+++ b/sql/wsrep_server_service.cc
@@ -391,6 +391,7 @@ int Wsrep_server_service::wait_committing_transactions(int timeout)
void Wsrep_server_service::debug_sync(const char* sync_point)
{
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF(sync_point, {
std::stringstream dbug_action;
dbug_action << "now "
@@ -401,4 +402,5 @@ void Wsrep_server_service::debug_sync(const char* sync_point)
action.c_str(),
action.length()));
};);
+#endif
}
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc
index 10212ee8da7..339b138dbf2 100644
--- a/sql/wsrep_sst.cc
+++ b/sql/wsrep_sst.cc
@@ -1740,6 +1740,7 @@ wait_signal:
WSREP_INFO("Donor state reached");
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sync.wsrep_donor_state",
{
const char act[]=
@@ -1749,6 +1750,7 @@ wait_signal:
assert(!debug_sync_set_action(thd.ptr,
STRING_WITH_LEN(act)));
};);
+#endif
goto wait_signal;
}
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc
index a615b7f609b..64b7faa2957 100644
--- a/sql/wsrep_thd.cc
+++ b/sql/wsrep_thd.cc
@@ -346,6 +346,7 @@ bool wsrep_bf_abort(THD* bf_thd, THD* victim_thd)
WSREP_LOG_THD(bf_thd, "BF aborter before");
WSREP_LOG_THD(victim_thd, "victim before");
+#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("sync.wsrep_bf_abort",
{
const char act[]=
@@ -355,6 +356,7 @@ bool wsrep_bf_abort(THD* bf_thd, THD* victim_thd)
DBUG_ASSERT(!debug_sync_set_action(bf_thd,
STRING_WITH_LEN(act)));
};);
+#endif
if (WSREP(victim_thd) && !victim_thd->wsrep_trx().active())
{
diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp
index acf723c3e22..1519ed473df 100644
--- a/storage/connect/bsonudf.cpp
+++ b/storage/connect/bsonudf.cpp
@@ -1147,7 +1147,7 @@ my_bool BJNX::LocateArray(PGLOBAL g, PBVAL jarp)
for (int i = 0; i < n && !Found; i++) {
Jp->N = m;
- sprintf(s, "[%d]", i + B);
+ snprintf(s, sizeof(s), "[%d]", i + B);
if (Jp->WriteStr(s))
return true;
@@ -1441,7 +1441,7 @@ my_bool BJNX::AddPath(void)
for (int i = 0; i <= I; i++) {
if (Jpnp[i].Type == TYPE_JAR) {
- sprintf(s, "[%d]", Jpnp[i].N + B);
+ snprintf(s, sizeof(s), "[%d]", Jpnp[i].N + B);
if (Jp->WriteStr(s))
return true;
diff --git a/storage/connect/global.h b/storage/connect/global.h
index eb3d4106477..bc1585eba41 100644
--- a/storage/connect/global.h
+++ b/storage/connect/global.h
@@ -14,6 +14,8 @@
#include <time.h> /* time_t type declaration */
#include <setjmp.h> /* Long jump declarations */
+#define ROUNDUP_TO_8(num) (((num + 7) / 8) * 8)
+
#if defined(_WIN32) && !defined(NOEX)
#define DllExport __declspec( dllexport )
#else // !_WIN32
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 5ba64f3aa1f..6d180ac5441 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -3070,6 +3070,8 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond)
if ((iscol= args[i]->type() == COND::FIELD_ITEM)) {
const char *fnm;
+ char buf[MAX_FIELD_WIDTH];
+ String strColumn(buf, sizeof(buf), system_charset_info);
ha_field_option_struct *fop;
Item_field *pField= (Item_field *)args[i];
@@ -3095,8 +3097,14 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond)
return NULL;
} else {
bool h;
-
fnm= filp->Chk(pField->field->field_name.str, &h);
+ if (tty == TYPE_AM_MYSQL && !(x || ismul))
+ {
+ strColumn.length(0);
+ strColumn.qs_append(STRING_WITH_LEN("`"));
+ strColumn.qs_append(fnm, strlen(fnm));
+ strColumn.append(STRING_WITH_LEN("`"));
+ }
if (h && i && !ishav)
return NULL; // Having should be col VOP arg
@@ -3110,9 +3118,11 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond)
htrc("Field name=%s\n", pField->field->field_name.str);
htrc("Field type=%d\n", pField->field->type());
htrc("Field_type=%d\n", args[i]->field_type());
- } // endif trace
-
- strcat((ishav ? havg : body), fnm);
+ } // endif trace
+ if (tty == TYPE_AM_MYSQL && !(x || ismul))
+ strcat((ishav ? havg : body), strColumn.ptr());
+ else
+ strcat((ishav ? havg : body), fnm);
} else if (args[i]->type() == COND::FUNC_ITEM) {
if (tty == TYPE_AM_MYSQL) {
if (!CheckCond(g, filp, args[i]))
diff --git a/storage/connect/ha_connect.h b/storage/connect/ha_connect.h
index 090f8343e1e..71ceb7974ba 100644
--- a/storage/connect/ha_connect.h
+++ b/storage/connect/ha_connect.h
@@ -555,3 +555,25 @@ public:
#if defined(JAVA_SUPPORT) || defined(CMGO_SUPPORT)
bool MongoEnabled(void);
#endif // JAVA_SUPPORT || CMGO_SUPPORT
+
+/* This is a hack for ASAN
+ * Libraries such as libxml2 and libodbc do not like being unloaded before
+ * exit and will show as a leak in ASAN with no stack trace (as the plugin
+ * has been unloaded from memory).
+ *
+ * The below is designed to trick the compiler into adding a "UNIQUE" symbol
+ * which can be seen using:
+ * readelf -s storage/connect/ha_connect.so | grep UNIQUE
+ *
+ * Having this symbol means that the plugin remains in memory after dlclose()
+ * has been called. Thereby letting the libraries clean up properly.
+ */
+#if defined(__SANITIZE_ADDRESS__)
+__attribute__((__used__))
+inline int dummy(void)
+{
+ static int d;
+ d++;
+ return d;
+}
+#endif
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp
index fc22b7033be..0ba1f56aa50 100644
--- a/storage/connect/jdbconn.cpp
+++ b/storage/connect/jdbconn.cpp
@@ -451,8 +451,14 @@ PQRYRES JDBCSrcCols(PGLOBAL g, PCSZ src, PJPARM sjp)
if (strstr(src, "%s")) {
// Place holder for an eventual where clause
- sqry = (char*)PlugSubAlloc(g, NULL, strlen(src) + 2);
- sprintf(sqry, src, "1=1"); // dummy where clause
+ size_t sqry_size = strlen(src) + 2;
+ sqry = (char*)PlugSubAlloc(g, NULL, sqry_size);
+ // Function PlugSubAlloc(...) recalculate string size
+ // while allocate memory - it rounds size up size to multiple of 8
+ // we need to know the real allocated size
+ // to use it in sprintf(...)
+ const int sqry_real_allocated_size = ROUNDUP_TO_8(sqry_size);
+ snprintf(sqry, sqry_real_allocated_size, src, "1=1"); // dummy where clause
} else
sqry = (char*)src;
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
index f27f5a9d55b..4078a03830a 100644
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -1023,13 +1023,13 @@ bool JDOC::SerializeValue(PJVAL jvp)
case TYPE_DTM:
return js->Escape(jvp->Strp);
case TYPE_INTG:
- sprintf(buf, "%d", jvp->N);
+ snprintf(buf, sizeof(buf), "%d", jvp->N);
return js->WriteStr(buf);
case TYPE_BINT:
- sprintf(buf, "%lld", jvp->LLn);
+ snprintf(buf, sizeof(buf), "%lld", jvp->LLn);
return js->WriteStr(buf);
case TYPE_DBL: // dfp to limit to the default number of decimals
- sprintf(buf, "%.*f", MY_MIN(jvp->Nd, dfp), jvp->F);
+ snprintf(buf, sizeof(buf), "%.*f", MY_MIN(jvp->Nd, dfp), jvp->F);
return js->WriteStr(buf);
case TYPE_NULL:
return js->WriteStr("null");
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp
index f6325c89c5a..6f5b0883fe1 100644
--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -909,7 +909,7 @@ my_bool JSNX::LocateArray(PGLOBAL g, PJAR jarp)
for (int i = 0; i < jarp->size() && !Found; i++) {
Jp->N = m;
- sprintf(s, "[%d]", i + B);
+ snprintf(s, sizeof(s), "[%d]", i + B);
if (Jp->WriteStr(s))
return true;
@@ -1190,7 +1190,7 @@ my_bool JSNX::AddPath(void) {
for (int i = 0; i <= I; i++) {
if (Jpnp[i].Type == TYPE_JAR) {
- sprintf(s, "[%d]", Jpnp[i].N + B);
+ snprintf(s, sizeof(s), "[%d]", Jpnp[i].N + B);
if (Jp->WriteStr(s))
return true;
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
index 60e24841a94..14e1e44895c 100644
--- a/storage/connect/libdoc.cpp
+++ b/storage/connect/libdoc.cpp
@@ -290,46 +290,8 @@ if (!rc)
/******************************************************************/
/* XML library cleanup function. */
/******************************************************************/
-/*
- This is a copy of xmlCleanupParser() from the libxml2 sources
- with xmlResetLastError() commented.
-
- xmlResetLastError() called from the original xmlCleanupParser() causes
- valgrind to report memory leaks. This happens because
- ha_initialize_handlerton() is called from the main thread in mysqld.cc,
- while ha_finalize_handlerton() is called from a non-main thread.
- libxml2 gets confused because of xmlInitParser() and xmlCleanupParser()
- being called from the different threads.
-
- Perhaps the code in mysqld.cc should eventually be modified
- to shutdown plugins from the main thread.
-*/
-static void
-xmlCleanupParser_replacement(void)
- {
- xmlCleanupCharEncodingHandlers();
-#ifdef LIBXML_CATALOG_ENABLED
- xmlCatalogCleanup();
-#endif
- xmlDictCleanup();
- xmlCleanupInputCallbacks();
-#ifdef LIBXML_OUTPUT_ENABLED
- xmlCleanupOutputCallbacks();
-#endif
-#ifdef LIBXML_SCHEMAS_ENABLED
- xmlSchemaCleanupTypes();
- xmlRelaxNGCleanupTypes();
-#endif
- //xmlResetLastError();
- xmlCleanupGlobals();
- xmlCleanupThreads(); /* must be last if called not from the main thread */
- xmlCleanupMemory();
- }
-
-
void XmlCleanupParserLib(void)
{
- xmlCleanupParser_replacement();
} // end of XmlCleanupParserLib
/******************************************************************/
diff --git a/storage/connect/mysql-test/connect/r/mysql.result b/storage/connect/mysql-test/connect/r/mysql.result
index 83c2bc0abb5..918256ac395 100644
--- a/storage/connect/mysql-test/connect/r/mysql.result
+++ b/storage/connect/mysql-test/connect/r/mysql.result
@@ -304,5 +304,27 @@ INSERT INTO t2 VALUES (10),(20),(30),(40);
DROP TABLE t2;
DROP TABLE t1;
#
+# MDEV-28533 CONNECT engine does not quote columns involved in WHERE clause
+#
+CREATE TABLE t1 (id int, `spaced col` varchar(10),`nospace` varchar(10));
+insert into t1 values (1,1,'x1'),(2,'C-003','x2');
+SELECT * from t1;
+id spaced col nospace
+1 1 x1
+2 C-003 x2
+CREATE TABLE t2 (id int, `spaced col` varchar(10), `nospace` varchar(10)) ENGINE=CONNECT TABLE_TYPE=MYSQL DBNAME='test' TABNAME='t1' OPTION_LIST='host=localhost,user=root,port=PORT';
+SELECT * from t2;
+id spaced col nospace
+1 1 x1
+2 C-003 x2
+SELECT `id` FROM t2 WHERE t2.`nospace` = 'x1';
+id
+1
+SELECT `id` FROM t2 WHERE t2.`spaced col` = 'C-003';
+id
+2
+DROP TABLE t1;
+DROP TABLE t2;
+#
# End of 10.3 tests
#
diff --git a/storage/connect/mysql-test/connect/r/odbc_postgresql.result b/storage/connect/mysql-test/connect/r/odbc_postgresql.result
index dc23dbdb990..fd23197c37f 100644
--- a/storage/connect/mysql-test/connect/r/odbc_postgresql.result
+++ b/storage/connect/mysql-test/connect/r/odbc_postgresql.result
@@ -17,6 +17,7 @@ mtr public t2 TABLE
mtr public v1 VIEW
mtr schema1 t1 TABLE
mtr schema1 t2 TABLE
+mtr schema1 t3 TABLE
mtr schema1 v1 VIEW
DROP TABLE t1;
# All tables in all schemas
@@ -28,6 +29,7 @@ mtr public t2 TABLE
mtr public v1 VIEW
mtr schema1 t1 TABLE
mtr schema1 t2 TABLE
+mtr schema1 t3 TABLE
mtr schema1 v1 VIEW
DROP TABLE t1;
# All tables in all schemas
@@ -39,6 +41,7 @@ mtr public t2 TABLE
mtr public v1 VIEW
mtr schema1 t1 TABLE
mtr schema1 t2 TABLE
+mtr schema1 t3 TABLE
mtr schema1 v1 VIEW
DROP TABLE t1;
# All tables in the default schema ("public")
@@ -101,6 +104,8 @@ mtr public t2 a 4 int4 10 4 0 10 0
mtr public v1 a 4 int4 10 4 0 10 1
mtr schema1 t1 a 1 bpchar 10 40 NULL NULL 0
mtr schema1 t2 a 1 bpchar 10 40 NULL NULL 0
+mtr schema1 t3 a 1 bpchar 10 40 NULL NULL 0
+mtr schema1 t3 b 1 bpchar 10 40 NULL NULL 0
mtr schema1 v1 a 1 bpchar 10 40 NULL NULL 1
DROP TABLE t1;
# All columns in the schemas "public" and "schema1"
@@ -112,6 +117,8 @@ mtr public t2 a 4 int4 10 4 0 10 0
mtr public v1 a 4 int4 10 4 0 10 1
mtr schema1 t1 a 1 bpchar 10 40 NULL NULL 0
mtr schema1 t2 a 1 bpchar 10 40 NULL NULL 0
+mtr schema1 t3 a 1 bpchar 10 40 NULL NULL 0
+mtr schema1 t3 b 1 bpchar 10 40 NULL NULL 0
mtr schema1 v1 a 1 bpchar 10 40 NULL NULL 1
DROP TABLE t1;
# All tables "t1" in all schemas
@@ -195,7 +202,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(10) NOT NULL
-) ENGINE=CONNECT DEFAULT CHARSET=utf8 CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='schema1.t1' `DATA_CHARSET`='utf8'
+) ENGINE=CONNECT DEFAULT CHARSET=utf8mb3 CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='schema1.t1' `DATA_CHARSET`='utf8'
SELECT * FROM t1;
a
aaa
@@ -206,7 +213,7 @@ CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `a` char(10) CHARACTER SET utf8 NOT NULL
+ `a` char(10) CHARACTER SET utf8mb3 NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT * FROM t2;
a
@@ -230,7 +237,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(10) DEFAULT NULL
-) ENGINE=CONNECT DEFAULT CHARSET=utf8 CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='schema1.v1' `DATA_CHARSET`='utf8'
+) ENGINE=CONNECT DEFAULT CHARSET=utf8mb3 CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='schema1.v1' `DATA_CHARSET`='utf8'
SELECT * FROM t1;
a
aaa
@@ -241,7 +248,7 @@ CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `a` char(10) CHARACTER SET utf8 DEFAULT NULL
+ `a` char(10) CHARACTER SET utf8mb3 DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT * FROM t2;
a
@@ -265,7 +272,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` char(10) NOT NULL
-) ENGINE=CONNECT DEFAULT CHARSET=utf8 CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='schema1.t2' `DATA_CHARSET`='utf8'
+) ENGINE=CONNECT DEFAULT CHARSET=utf8mb3 CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='schema1.t2' `DATA_CHARSET`='utf8'
SELECT * FROM t1;
a
xxx
@@ -276,7 +283,7 @@ CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `a` char(10) CHARACTER SET utf8 NOT NULL
+ `a` char(10) CHARACTER SET utf8mb3 NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT * FROM t2;
a
@@ -294,3 +301,8 @@ zzz
ÄÖÜ
DROP VIEW v1;
DROP TABLE t1;
+CREATE TABLE t1 (a VARCHAR(6), b VARCHAR(6), PRIMARY KEY(a, b)) ENGINE=CONNECT TABNAME='schema1.t3' CHARSET=utf8 DATA_CHARSET=utf8 TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr';
+DELETE FROM t1 WHERE a='20';
+Warnings:
+Note 1105 schema1.t3: 0 affected rows
+DROP TABLE t1;
diff --git a/storage/connect/mysql-test/connect/t/mysql.test b/storage/connect/mysql-test/connect/t/mysql.test
index 451de29c0b0..ce76a4665d5 100644
--- a/storage/connect/mysql-test/connect/t/mysql.test
+++ b/storage/connect/mysql-test/connect/t/mysql.test
@@ -484,5 +484,25 @@ DROP TABLE t2;
DROP TABLE t1;
--echo #
+--echo # MDEV-28533 CONNECT engine does not quote columns involved in WHERE clause
+--echo #
+
+CREATE TABLE t1 (id int, `spaced col` varchar(10),`nospace` varchar(10));
+insert into t1 values (1,1,'x1'),(2,'C-003','x2');
+
+SELECT * from t1;
+
+--replace_result $PORT PORT
+--eval CREATE TABLE t2 (id int, `spaced col` varchar(10), `nospace` varchar(10)) ENGINE=CONNECT TABLE_TYPE=MYSQL DBNAME='test' TABNAME='t1' OPTION_LIST='host=localhost,user=root,port=$PORT'
+
+SELECT * from t2;
+SELECT `id` FROM t2 WHERE t2.`nospace` = 'x1';
+SELECT `id` FROM t2 WHERE t2.`spaced col` = 'C-003';
+
+
+DROP TABLE t1;
+DROP TABLE t2;
+
+--echo #
--echo # End of 10.3 tests
--echo #
diff --git a/storage/connect/mysql-test/connect/t/odbc_postgresql.sql b/storage/connect/mysql-test/connect/t/odbc_postgresql.sql
index 1c302294393..a795817a4d3 100644
--- a/storage/connect/mysql-test/connect/t/odbc_postgresql.sql
+++ b/storage/connect/mysql-test/connect/t/odbc_postgresql.sql
@@ -25,3 +25,6 @@ INSERT INTO schema1.t1 VALUES ('aaa'),('bbb'),('ccc'),('яяя');
CREATE VIEW schema1.v1 AS SELECT * FROM schema1.t1;
CREATE TABLE schema1.t2 (a CHAR(10) NOT NULL);
INSERT INTO schema1.t2 VALUES ('xxx'),('yyy'),('zzz'),('ÄÖÜ');
+CREATE TABLE schema1.t3 (a CHAR(10) NOT NULL, b CHAR(10) NOT NULL);
+INSERT INTO schema1.t3 VALUES ('xxx', 'aaa'),('yyy', 'bbb'),('zzz', 'ccc'),('ÄÖÜ', 'яяя');
+
diff --git a/storage/connect/mysql-test/connect/t/odbc_postgresql.test b/storage/connect/mysql-test/connect/t/odbc_postgresql.test
index 7fc16130713..86597423d04 100644
--- a/storage/connect/mysql-test/connect/t/odbc_postgresql.test
+++ b/storage/connect/mysql-test/connect/t/odbc_postgresql.test
@@ -205,3 +205,9 @@ CREATE VIEW v1 AS SELECT * FROM t1;
SELECT * FROM v1;
DROP VIEW v1;
DROP TABLE t1;
+
+# MDEV-25767 DELETE with WHERE condition crashes when two columns used for
+# pkey
+CREATE TABLE t1 (a VARCHAR(6), b VARCHAR(6), PRIMARY KEY(a, b)) ENGINE=CONNECT TABNAME='schema1.t3' CHARSET=utf8 DATA_CHARSET=utf8 TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr';
+DELETE FROM t1 WHERE a='20';
+DROP TABLE t1;
diff --git a/storage/connect/plugutil.cpp b/storage/connect/plugutil.cpp
index d131482ef94..6fb40c92a1b 100644
--- a/storage/connect/plugutil.cpp
+++ b/storage/connect/plugutil.cpp
@@ -371,13 +371,13 @@ char *PlugReadMessage(PGLOBAL g, int mid, char *m)
PlugSetPath(msgfile, NULL, buff, msg_path);
if (!(mfile = fopen(msgfile, "rt"))) {
- sprintf(stmsg, "Fail to open message file %-.256s", msgfile);
+ snprintf(stmsg, sizeof(stmsg), "Fail to open message file %s", msgfile);
goto err;
} // endif mfile
for (;;)
if (!fgets(buff, 256, mfile)) {
- sprintf(stmsg, "Cannot get message %d %-.256s", mid, SVP(m));
+ snprintf(stmsg, sizeof(stmsg), "Cannot get message %d %s", mid, SVP(m));
goto fin;
} else
if (atoi(buff) == mid)
@@ -386,7 +386,7 @@ char *PlugReadMessage(PGLOBAL g, int mid, char *m)
if (sscanf(buff, " %*d %.31s \"%.255[^\"]", msgid, stmsg) < 2) {
// Old message file
if (!sscanf(buff, " %*d \"%.255[^\"]", stmsg)) {
- sprintf(stmsg, "Bad message file for %d %-.256s", mid, SVP(m));
+ snprintf(stmsg, sizeof(stmsg), "Bad message file for %d %s", mid, SVP(m));
goto fin;
} else
m = NULL;
@@ -425,17 +425,18 @@ char *PlugGetMessage(PGLOBAL g, int mid)
if (n == 0) {
DWORD rc = GetLastError();
- msg = (char*)PlugSubAlloc(g, NULL, 512); // Extend buf allocation
- n = sprintf(msg, "Message %d, rc=%d: ", mid, rc);
+ const int BUF_SIZE= 512;
+ msg = (char*)PlugSubAlloc(g, NULL, BUF_SIZE); // Extend buf allocation
+ n = snprintf(msg, BUF_SIZE, "Message %d, rc=%d: ", mid, rc);
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, NULL, rc, 0,
- (LPTSTR)(msg + n), 512 - n, NULL);
+ (LPTSTR)(msg + n), BUF_SIZE - n, NULL);
return msg;
} // endif n
#else // ALL
if (!GetRcString(mid, stmsg, 200))
- sprintf(stmsg, "Message %d not found", mid);
+ snprintf(stmsg, sizeof(stmsg) "Message %d not found", mid);
#endif // ALL
if (g) {
@@ -564,7 +565,7 @@ void *PlugSubAlloc(PGLOBAL g, void *memp, size_t size)
/*******************************************************************/
memp = g->Sarea;
- size = ((size + 7) / 8) * 8; /* Round up size to multiple of 8 */
+ size = ROUNDUP_TO_8(size); /* Round up size to multiple of 8 */
pph = (PPOOLHEADER)memp;
if (trace(16))
diff --git a/storage/connect/tabbson.cpp b/storage/connect/tabbson.cpp
index b69618a60cb..4cbb0e44e19 100644
--- a/storage/connect/tabbson.cpp
+++ b/storage/connect/tabbson.cpp
@@ -477,7 +477,7 @@ bool BSONDISC::Find(PGLOBAL g, PBVAL jvp, PCSZ key, int j)
n = sizeof(fmt) - (strlen(fmt) + 1);
if (!tdp->Xcol || stricmp(tdp->Xcol, key)) {
- sprintf(buf, "%d", k);
+ snprintf(buf, sizeof(buf), "%d", k);
if (tdp->Uri) {
strncat(strncat(fmt, sep, n), buf, n - strlen(sep));
@@ -798,7 +798,7 @@ void BCUTIL::SetJsonValue(PGLOBAL g, PVAL vp, PBVAL jvp)
break;
default:
- sprintf(G->Message, "Unsupported column type %d", vp->GetType());
+ snprintf(G->Message, sizeof(G->Message), "Unsupported column type %d", vp->GetType());
throw 888;
} // endswitch Type
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp
index fb9168f3b88..d60cd039951 100644
--- a/storage/connect/tabodbc.cpp
+++ b/storage/connect/tabodbc.cpp
@@ -553,7 +553,7 @@ bool TDBODBC::OpenDB(PGLOBAL g)
if (Memory < 3) {
// Method will depend on cursor type
- if ((Rbuf = Ocp->Rewind(Query->GetStr(), (PODBCCOL)Columns)) < 0) {
+ if (Query && (Rbuf = Ocp->Rewind(Query->GetStr(), (PODBCCOL)Columns)) < 0) {
if (Mode != MODE_READX) {
Ocp->Close();
return true;
diff --git a/storage/connect/tabwmi.cpp b/storage/connect/tabwmi.cpp
index f90ff98ca35..935d21c59c9 100644
--- a/storage/connect/tabwmi.cpp
+++ b/storage/connect/tabwmi.cpp
@@ -810,7 +810,7 @@ void WMICOL::ReadColumn(PGLOBAL g)
char buf[24];
int rc = VariantTimeToSystemTime(Prop.date, &stm);
- sprintf(buf, "%02d/%02d/%d %02d:%02d:%02d",
+ snprintf(buf, sizeof(buf), "%02d/%02d/%d %02d:%02d:%02d",
stm.wDay, stm.wMonth, stm.wYear,
stm.wHour, stm.wMinute, stm.wSecond);
Value->SetValue_psz(buf);
diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp
index 7d7da5b6252..528c4abf3db 100644
--- a/storage/connect/valblk.cpp
+++ b/storage/connect/valblk.cpp
@@ -604,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
int i, n, m;
for (i = n = 0; i < Nval; i++) {
- m = sprintf(buf, Fmt, UnalignedRead(i));
+ m = snprintf(buf, sizeof(buf), Fmt, UnalignedRead(i));
n = MY_MAX(n, m);
} // endfor i
diff --git a/storage/federatedx/federatedx_txn.cc b/storage/federatedx/federatedx_txn.cc
index 220896cc2a4..c434a00805c 100644
--- a/storage/federatedx/federatedx_txn.cc
+++ b/storage/federatedx/federatedx_txn.cc
@@ -57,10 +57,12 @@ federatedx_txn::~federatedx_txn()
void federatedx_txn::close(FEDERATEDX_SERVER *server)
{
+#ifdef DBUG_TRACE
uint count= 0;
+#endif
federatedx_io *io, **iop;
DBUG_ENTER("federatedx_txn::close");
-
+
DBUG_ASSERT(!server->use_count);
DBUG_PRINT("info",("use count: %u connections: %u",
server->use_count, server->io_count));
@@ -84,9 +86,11 @@ void federatedx_txn::close(FEDERATEDX_SERVER *server)
{
server->idle_list= io->idle_next;
delete io;
+#ifdef DBUG_TRACE
count++;
+#endif
}
-
+
DBUG_PRINT("info",("closed %u connections, txn_list: %s", count,
txn_list ? "active": "empty"));
DBUG_VOID_RETURN;
@@ -172,12 +176,14 @@ void federatedx_txn::release(federatedx_io **ioptr)
void federatedx_txn::release_scan()
{
+#ifdef DBUG_TRACE
uint count= 0, returned= 0;
+#endif
federatedx_io *io, **pio;
DBUG_ENTER("federatedx_txn::release_scan");
- /* return any inactive and idle connections to the server */
- for (pio= &txn_list; (io= *pio); count++)
+ /* return any inactive and idle connections to the server */
+ for (pio= &txn_list; (io= *pio);)
{
if (io->active || io->busy)
pio= &io->txn_next;
@@ -196,8 +202,13 @@ void federatedx_txn::release_scan()
io->idle_next= server->idle_list;
server->idle_list= io;
mysql_mutex_unlock(&server->mutex);
+#ifdef DBUG_TRACE
returned++;
+#endif
}
+#ifdef DBUG_TRACE
+ count++;
+#endif
}
DBUG_PRINT("info",("returned %u of %u connections(s)", returned, count));
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index 20a78b8e3ce..dbf83aec127 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -2650,7 +2650,7 @@ int ha_federatedx::index_read_idx_with_result_set(uchar *buf, uint index,
if (io->query(sql_query.ptr(), sql_query.length()))
{
- sprintf(error_buffer, "error: %d '%s'",
+ snprintf(error_buffer, sizeof(error_buffer), "error: %d '%s'",
io->error_code(), io->error_str());
retval= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
goto error;
@@ -3375,7 +3375,7 @@ static int test_connection(MYSQL_THD thd, federatedx_io *io,
if ((retval= io->query(str.ptr(), str.length())))
{
- sprintf(buffer, "database: '%s' username: '%s' hostname: '%s'",
+ snprintf(buffer, sizeof(buffer), "database: '%s' username: '%s' hostname: '%s'",
share->database, share->username, share->hostname);
DBUG_PRINT("info", ("error-code: %d", io->error_code()));
my_error(ER_CANT_CREATE_FEDERATED_TABLE, MYF(0), buffer);
diff --git a/storage/innobase/btr/btr0defragment.cc b/storage/innobase/btr/btr0defragment.cc
index 0c1959bb554..37219210883 100644
--- a/storage/innobase/btr/btr0defragment.cc
+++ b/storage/innobase/btr/btr0defragment.cc
@@ -656,7 +656,7 @@ release_and_exit:
mysql_mutex_unlock(&btr_defragment_mutex);
func_exit:
set_current_thd(nullptr);
- innobase_destroy_background_thd(thd);
+ destroy_background_thd(thd);
return;
}
item = *btr_defragment_wq.begin();
diff --git a/storage/innobase/dict/dict0stats_bg.cc b/storage/innobase/dict/dict0stats_bg.cc
index 10c7426103c..833d99cdaee 100644
--- a/storage/innobase/dict/dict0stats_bg.cc
+++ b/storage/innobase/dict/dict0stats_bg.cc
@@ -381,7 +381,7 @@ static void dict_stats_func(void*)
while (dict_stats_process_entry_from_recalc_pool(thd)) {}
dict_defrag_process_entries_from_defrag_pool(thd);
set_current_thd(nullptr);
- innobase_destroy_background_thd(thd);
+ destroy_background_thd(thd);
}
diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
index faf598ddd72..df60a2aadd1 100644
--- a/storage/innobase/fts/fts0fts.cc
+++ b/storage/innobase/fts/fts0fts.cc
@@ -3960,6 +3960,43 @@ fts_sync_index(
return(fts_sync_write_words(trx, index_cache));
}
+/** Rollback a sync operation
+@param[in,out] sync sync state */
+static
+void
+fts_sync_rollback(
+ fts_sync_t* sync)
+{
+ trx_t* trx = sync->trx;
+ fts_cache_t* cache = sync->table->fts->cache;
+
+ for (ulint i = 0; i < ib_vector_size(cache->indexes); ++i) {
+ ulint j;
+ fts_index_cache_t* index_cache;
+
+ index_cache = static_cast<fts_index_cache_t*>(
+ ib_vector_get(cache->indexes, i));
+
+ for (j = 0; fts_index_selector[j].value; ++j) {
+
+ if (index_cache->ins_graph[j] != NULL) {
+
+ que_graph_free(index_cache->ins_graph[j]);
+
+ index_cache->ins_graph[j] = NULL;
+ }
+ }
+ }
+
+ mysql_mutex_unlock(&cache->lock);
+
+ fts_sql_rollback(trx);
+
+ /* Avoid assertion in trx_t::free(). */
+ trx->dict_operation_lock_mode = false;
+ trx->free();
+}
+
/** Commit the SYNC, change state of processed doc ids etc.
@param[in,out] sync sync state
@return DB_SUCCESS if all OK */
@@ -4000,10 +4037,10 @@ fts_sync_commit(
mysql_mutex_unlock(&cache->lock);
fts_sql_commit(trx);
} else {
- mysql_mutex_unlock(&cache->lock);
- fts_sql_rollback(trx);
ib::error() << "(" << error << ") during SYNC of "
"table " << sync->table->name;
+ fts_sync_rollback(sync);
+ return error;
}
if (UNIV_UNLIKELY(fts_enable_diag_print) && elapsed_time) {
@@ -4023,43 +4060,6 @@ fts_sync_commit(
return(error);
}
-/** Rollback a sync operation
-@param[in,out] sync sync state */
-static
-void
-fts_sync_rollback(
- fts_sync_t* sync)
-{
- trx_t* trx = sync->trx;
- fts_cache_t* cache = sync->table->fts->cache;
-
- for (ulint i = 0; i < ib_vector_size(cache->indexes); ++i) {
- ulint j;
- fts_index_cache_t* index_cache;
-
- index_cache = static_cast<fts_index_cache_t*>(
- ib_vector_get(cache->indexes, i));
-
- for (j = 0; fts_index_selector[j].value; ++j) {
-
- if (index_cache->ins_graph[j] != NULL) {
-
- que_graph_free(index_cache->ins_graph[j]);
-
- index_cache->ins_graph[j] = NULL;
- }
- }
- }
-
- mysql_mutex_unlock(&cache->lock);
-
- fts_sql_rollback(trx);
-
- /* Avoid assertion in trx_t::free(). */
- trx->dict_operation_lock_mode = false;
- trx->free();
-}
-
/** Run SYNC on the table, i.e., write out data from the cache to the
FTS auxiliary INDEX table and clear the cache at the end.
@param[in,out] sync sync state
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc
index 9cc56f184fd..7c40a25e6e7 100644
--- a/storage/innobase/fts/fts0opt.cc
+++ b/storage/innobase/fts/fts0opt.cc
@@ -2974,7 +2974,7 @@ fts_optimize_shutdown()
&fts_optimize_wq->mutex.m_mutex);
}
- innobase_destroy_background_thd(fts_opt_thd);
+ destroy_background_thd(fts_opt_thd);
fts_opt_thd = NULL;
pthread_cond_destroy(&fts_opt_shutdown_cond);
mysql_mutex_unlock(&fts_optimize_wq->mutex);
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index ea521fb7798..d070dbea66f 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -130,7 +130,6 @@ void thd_clear_error(MYSQL_THD thd);
TABLE *find_fk_open_table(THD *thd, const char *db, size_t db_len,
const char *table, size_t table_len);
MYSQL_THD create_background_thd();
-void destroy_background_thd(MYSQL_THD thd);
void reset_thd(MYSQL_THD thd);
TABLE *get_purge_table(THD *thd);
TABLE *open_purge_table(THD *thd, const char *db, size_t dblen,
@@ -1829,20 +1828,6 @@ THD *innodb_thd_increment_pending_ops(THD *thd)
return thd;
}
-/** Destroy a background purge thread THD.
-@param[in] thd MYSQL_THD to destroy */
-void
-innobase_destroy_background_thd(
-/*============================*/
- MYSQL_THD thd)
-{
- /* need to close the connection explicitly, the server won't do it
- if innodb is in the PLUGIN_IS_DYING state */
- innobase_close_connection(innodb_hton_ptr, thd);
- thd_set_ha_data(thd, innodb_hton_ptr, NULL);
- destroy_background_thd(thd);
-}
-
/** Close opened tables, free memory, delete items for a MYSQL_THD.
@param[in] thd MYSQL_THD to reset */
void
@@ -5016,6 +5001,7 @@ static int innobase_close_connection(handlerton *hton, THD *thd)
DBUG_ASSERT(hton == innodb_hton_ptr);
if (auto trx= thd_to_trx(thd))
{
+ thd_set_ha_data(thd, innodb_hton_ptr, NULL);
if (trx->state == TRX_STATE_PREPARED && trx->has_logged_persistent())
{
trx_disconnect_prepared(trx);
@@ -5023,6 +5009,7 @@ static int innobase_close_connection(handlerton *hton, THD *thd)
}
innobase_rollback_trx(trx);
trx->free();
+ DEBUG_SYNC(thd, "innobase_connection_closed");
}
return 0;
}
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index 3d217dc3243..d9a26226e98 100644
--- a/storage/innobase/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, 2021, MariaDB Corporation.
+Copyright (c) 2017, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -460,10 +460,9 @@ normalize_table_name_c_low(
@return new MYSQL_THD */
MYSQL_THD innobase_create_background_thd(const char* name);
-/** Destroy a background purge thread THD.
+/** Destroy a THD object associated with a background task.
@param[in] thd MYSQL_THD to destroy */
-void
-innobase_destroy_background_thd(MYSQL_THD);
+void destroy_background_thd(MYSQL_THD thd);
/** Close opened tables, free memory, delete items for a MYSQL_THD.
@param[in] thd MYSQL_THD to reset */
diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
index 9033cd916c3..44b19aa666b 100644
--- a/storage/innobase/include/srv0start.h
+++ b/storage/innobase/include/srv0start.h
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, 2020, MariaDB Corporation.
+Copyright (c) 2017, 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -52,9 +52,6 @@ void innodb_preshutdown();
/** Shut down InnoDB. */
void innodb_shutdown();
-/** Shut down background threads that can generate undo log. */
-void srv_shutdown_bg_undo_sources();
-
/*************************************************************//**
Copy the file path component of the physical file to parameter. It will
copy up to and including the terminating path separator.
diff --git a/storage/innobase/que/que0que.cc b/storage/innobase/que/que0que.cc
index 642a852b473..3ea5c15bccc 100644
--- a/storage/innobase/que/que0que.cc
+++ b/storage/innobase/que/que0que.cc
@@ -507,7 +507,7 @@ que_node_get_containing_loop_node(
return(node);
}
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
/** Gets information of an SQL query graph node.
@return type description */
static MY_ATTRIBUTE((warn_unused_result, nonnull))
@@ -564,7 +564,7 @@ que_node_type_string(
return("UNKNOWN NODE TYPE");
}
}
-#endif /* !DBUG_OFF */
+#endif /* DBUG_TRACE */
/**********************************************************************//**
Performs an execution step on a query thread.
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc
index eeac4b1712e..15835ff4afd 100644
--- a/storage/innobase/row/row0log.cc
+++ b/storage/innobase/row/row0log.cc
@@ -1922,6 +1922,7 @@ func_exit:
mtr.commit();
func_exit_committed:
ut_ad(mtr.has_committed());
+ ut_free(pcur.old_rec_buf);
if (error != DB_SUCCESS) {
/* Report the erroneous row using the new
@@ -2082,7 +2083,8 @@ func_exit_committed:
entry = row_build_index_entry(old_row, old_ext, index, heap);
if (!entry) {
ut_ad(0);
- return(DB_CORRUPTION);
+ error = DB_CORRUPTION;
+ goto func_exit_committed;
}
mtr.start();
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index 156df2edc70..10b22c9de7d 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -1926,7 +1926,7 @@ static void srv_shutdown_purge_tasks()
std::unique_lock<std::mutex> lk(purge_thd_mutex);
while (!purge_thds.empty())
{
- innobase_destroy_background_thd(purge_thds.front());
+ destroy_background_thd(purge_thds.front());
purge_thds.pop_front();
}
n_purge_thds= 0;
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index f2285bfa404..e3dfc75ec7e 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -837,6 +837,21 @@ static void srv_shutdown_threads()
}
}
+
+/** Shut down background threads that can generate undo log. */
+static void srv_shutdown_bg_undo_sources()
+{
+ srv_shutdown_state= SRV_SHUTDOWN_INITIATED;
+
+ if (srv_undo_sources)
+ {
+ ut_ad(!srv_read_only_mode);
+ fts_optimize_shutdown();
+ dict_stats_shutdown();
+ srv_undo_sources= false;
+ }
+}
+
#ifdef UNIV_DEBUG
# define srv_init_abort(_db_err) \
srv_init_abort_low(create_new_db, __FILE__, __LINE__, _db_err)
@@ -1913,19 +1928,6 @@ skip_monitors:
return(DB_SUCCESS);
}
-/** Shut down background threads that can generate undo log. */
-void srv_shutdown_bg_undo_sources()
-{
- srv_shutdown_state = SRV_SHUTDOWN_INITIATED;
-
- if (srv_undo_sources) {
- ut_ad(!srv_read_only_mode);
- fts_optimize_shutdown();
- dict_stats_shutdown();
- srv_undo_sources = false;
- }
-}
-
/**
Shutdown purge to make sure that there is no possibility that we call any
plugin code (e.g., audit) inside virtual column computation.
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index f66b6ae6186..f470d3691c1 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -1070,7 +1070,7 @@ static int chk_index(HA_CHECK *param, MARIA_HA *info, MARIA_KEYDEF *keyinfo,
share->state.state.data_file_length) ||
(share->data_file_type == NO_RECORD && record != 0))
{
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
char llbuff2[22], llbuff3[22];
#endif
_ma_check_print_error(param,
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index fc46022f5b1..6572ff8e140 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -2661,7 +2661,7 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer)
i < buffer->size;
i+= TRANSLOG_PAGE_SIZE, pg++)
{
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
TRANSLOG_ADDRESS addr= (buffer->offset + i);
#endif
DBUG_PRINT("info", ("send log form %lu till %lu address: " LSN_FMT " "
@@ -2908,7 +2908,7 @@ static my_bool translog_page_validator(int res, PAGECACHE_IO_HOOK_ARGS *args)
uint flags;
uchar *page_pos;
TRANSLOG_FILE *data= (TRANSLOG_FILE *) args->data;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
pgcache_page_no_t offset= page_no * TRANSLOG_PAGE_SIZE;
#endif
DBUG_ENTER("translog_page_validator");
@@ -3268,7 +3268,7 @@ static my_bool translog_get_last_page_addr(TRANSLOG_ADDRESS *addr,
my_off_t file_size;
uint32 file_no= LSN_FILE_NO(*addr);
TRANSLOG_FILE *file;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
char buff[21];
#endif
DBUG_ENTER("translog_get_last_page_addr");
diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c
index de85ec51deb..144b10a86da 100644
--- a/storage/maria/ma_pagecache.c
+++ b/storage/maria/ma_pagecache.c
@@ -190,7 +190,7 @@ struct st_pagecache_hash_link
enum PCBLOCK_TEMPERATURE { PCBLOCK_COLD /*free*/ , PCBLOCK_WARM , PCBLOCK_HOT };
/* debug info */
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
static const char *page_cache_page_type_str[]=
{
/* used only for control page type changing during debugging */
@@ -225,8 +225,9 @@ static const char *page_cache_page_pin_str[]=
"unpinned -> pinned",
"pinned -> unpinned"
};
+#endif /* DBUG_TRACE */
-
+#ifndef DBUG_OFF
typedef struct st_pagecache_pin_info
{
struct st_pagecache_pin_info *next, **prev;
@@ -563,7 +564,7 @@ static void pagecache_debug_print _VARARGS((const char *fmt, ...));
#define KEYCACHE_DBUG_ASSERT(a) DBUG_ASSERT(a)
#endif /* defined(PAGECACHE_DEBUG) */
-#if defined(PAGECACHE_DEBUG) || !defined(DBUG_OFF)
+#if defined(PAGECACHE_DEBUG) || defined(DBUG_TRACE)
static my_thread_id pagecache_thread_id;
#define KEYCACHE_THREAD_TRACE(l) \
KEYCACHE_DBUG_PRINT(l,("|thread %lld",pagecache_thread_id))
@@ -581,7 +582,7 @@ static my_thread_id pagecache_thread_id;
#define KEYCACHE_THREAD_TRACE_BEGIN(l)
#define KEYCACHE_THREAD_TRACE_END(l)
#define KEYCACHE_THREAD_TRACE(l)
-#endif /* defined(PAGECACHE_DEBUG) || !defined(DBUG_OFF) */
+#endif /* defined(PAGECACHE_DEBUG) || defined(DBUG_TRACE) */
#define PCBLOCK_NUMBER(p, b) \
((uint) (((char*)(b)-(char *) p->block_root)/sizeof(PAGECACHE_BLOCK_LINK)))
@@ -3714,8 +3715,9 @@ uchar *pagecache_read(PAGECACHE *pagecache,
unlock_pin= lock_to_pin[buff==0][lock].unlock_pin;
PAGECACHE_BLOCK_LINK *fake_link;
my_bool reg_request;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
char llbuf[22];
+#endif
DBUG_ENTER("pagecache_read");
DBUG_PRINT("enter", ("fd: %u page: %s buffer: %p level: %u "
"t:%s (%d)%s->%s %s->%s big block: %d",
@@ -3731,7 +3733,6 @@ uchar *pagecache_read(PAGECACHE *pagecache,
DBUG_ASSERT(buff != 0 || (buff == 0 && (unlock_pin == PAGECACHE_PIN ||
unlock_pin == PAGECACHE_PIN_LEFT_PINNED)));
DBUG_ASSERT(pageno < ((1ULL) << 40));
-#endif
if (!page_link)
page_link= &fake_link;
@@ -4375,8 +4376,9 @@ my_bool pagecache_write_part(PAGECACHE *pagecache,
my_bool error= 0;
int need_lock_change= write_lock_change_table[lock].need_lock_change;
my_bool reg_request;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
char llbuf[22];
+#endif
DBUG_ENTER("pagecache_write_part");
DBUG_PRINT("enter", ("fd: %u page: %s level: %u type: %s lock: %s "
"pin: %s mode: %s offset: %u size %u",
@@ -4392,7 +4394,6 @@ my_bool pagecache_write_part(PAGECACHE *pagecache,
DBUG_ASSERT(offset + size <= pagecache->block_size);
DBUG_ASSERT(pageno < ((1ULL) << 40));
DBUG_ASSERT(pagecache->big_block_read == 0);
-#endif
if (!page_link)
page_link= &fake_link;
diff --git a/storage/maria/unittest/ma_pagecache_single.c b/storage/maria/unittest/ma_pagecache_single.c
index c4e2c53d235..de2ecaecfc4 100644
--- a/storage/maria/unittest/ma_pagecache_single.c
+++ b/storage/maria/unittest/ma_pagecache_single.c
@@ -661,14 +661,10 @@ err:
static void *test_thread(void *arg)
{
-#ifndef DBUG_OFF
- int param= *((int*) arg);
-#endif
-
my_thread_init();
{
DBUG_ENTER("test_thread");
- DBUG_PRINT("enter", ("param: %d", param));
+ DBUG_PRINT("enter", ("param: %d", *(int*) arg));
if (!simple_read_write_test() ||
!simple_read_change_write_read_test() ||
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 2a49971f6db..f89f5d4ab5b 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -33,6 +33,7 @@
#include "sql_table.h" // tablename_to_filename
#include "sql_class.h" // THD
#include "debug_sync.h"
+#include "sql_debug.h"
ulonglong myisam_recover_options;
static ulong opt_myisam_block_size;
@@ -121,6 +122,28 @@ static void debug_wait_for_kill(const char *info)
thd_proc_info(thd, prev_info);
DBUG_VOID_RETURN;
}
+
+
+class Debug_key_myisam: public Debug_key
+{
+public:
+ Debug_key_myisam() { }
+
+ static void print_keys_myisam(THD *thd, const char *where,
+ const TABLE *table,
+ const MI_KEYDEF *keydef, uint count)
+ {
+ for (uint i= 0; i < count; i++)
+ {
+ Debug_key_myisam tmp;
+ if (!tmp.append(where, strlen(where)) &&
+ !tmp.append_key(table->s->key_info[i].name, keydef[i].flag))
+ tmp.print(thd);
+ print_keysegs(thd, keydef[i].seg, keydef[i].keysegs);
+ }
+ }
+};
+
#endif
/*****************************************************************************
@@ -2234,6 +2257,15 @@ int ha_myisam::create(const char *name, TABLE *table_arg,
if ((error= table2myisam(table_arg, &keydef, &recinfo, &record_count)))
DBUG_RETURN(error); /* purecov: inspected */
+
+#ifndef DBUG_OFF
+ DBUG_EXECUTE_IF("key",
+ Debug_key_myisam::print_keys_myisam(table_arg->in_use,
+ "ha_myisam::create: ",
+ table_arg, keydef, share->keys);
+ );
+#endif
+
bzero((char*) &create_info, sizeof(create_info));
create_info.max_rows= share->max_rows;
create_info.reloc_rows= share->min_rows;
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 16184a1b166..b4187ffc7dc 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -858,7 +858,7 @@ static int chk_index(HA_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo,
}
if (record >= info->state->data_file_length)
{
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
char llbuff2[22], llbuff3[22];
#endif
mi_check_print_error(param,"Found key at page %s that points to record outside datafile",llstr(page,llbuff));
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c
index c006cc0b9a7..63950a3fc1d 100644
--- a/storage/myisam/mi_create.c
+++ b/storage/myisam/mi_create.c
@@ -704,7 +704,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
if (mi_state_info_write(file, &share.state, 2) ||
mi_base_info_write(file, &share.base))
goto err;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
if ((uint) mysql_file_tell(file, MYF(0)) != base_pos + MI_BASE_INFO_SIZE)
{
uint pos=(uint) mysql_file_tell(file, MYF(0));
@@ -804,12 +804,12 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
if (mi_recinfo_write(file, &recinfo[i]))
goto err;
-#ifndef DBUG_OFF
- if ((uint) mysql_file_tell(file, MYF(0)) != info_length)
+#ifdef DBUG_TRACE
{
uint pos= (uint) mysql_file_tell(file, MYF(0));
- DBUG_PRINT("warning",("info_length: %d != used_length: %d",
- info_length, pos));
+ if (pos != info_length)
+ DBUG_PRINT("warning",("info_length: %d != used_length: %d",
+ info_length, pos));
}
#endif
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
index f76f91c66bf..0478a7dd01a 100644
--- a/storage/rocksdb/CMakeLists.txt
+++ b/storage/rocksdb/CMakeLists.txt
@@ -4,6 +4,8 @@ SET(CPACK_RPM_rocksdb-engine_PACKAGE_SUMMARY "RocksDB storage engine for MariaDB
SET(CPACK_RPM_rocksdb-engine_PACKAGE_DESCRIPTION "The RocksDB storage engine is a high performance storage engine, aimed
at maximising storage efficiency while maintaining InnoDB-like performance." PARENT_SCOPE)
+MY_CHECK_AND_SET_COMPILER_FLAG(-Wno-range-loop-construct)
+
MACRO(SKIP_ROCKSDB_PLUGIN msg)
MESSAGE_ONCE(SKIP_ROCKSDB_PLUGIN "Can't build rocksdb engine - ${msg}")
ADD_FEATURE_INFO(ROCKSDB "OFF" "Storage Engine")
diff --git a/storage/spider/mysql-test/spider/bugfix/include/restart_spider.inc b/storage/spider/mysql-test/spider/bugfix/include/restart_spider.inc
new file mode 100644
index 00000000000..a5446a6188d
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/include/restart_spider.inc
@@ -0,0 +1,8 @@
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.1.1.expect
+
+--exec echo "wait" > $_expect_file_name
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--exec echo "restart" > $_expect_file_name
+--enable_reconnect
+--source include/wait_until_connected_again.inc
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_29352.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_29352.result
new file mode 100644
index 00000000000..5715edf2bd6
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_29352.result
@@ -0,0 +1,12 @@
+CREATE TABLE t (c INT);
+SHOW CREATE TABLE t;
+Table Create Table
+t CREATE TABLE `t` (
+ `c` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+FLUSH TABLES WITH READ LOCK;
+CREATE FUNCTION spider_bg_direct_sql RETURNS INT SONAME 'ha_spider.so';
+ERROR HY000: Can't execute the query because you have a conflicting read lock
+SELECT * FROM t;
+c
+DROP TABLE t;
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_29352.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_29352.test
new file mode 100644
index 00000000000..00d8ee73ebc
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29352.test
@@ -0,0 +1,11 @@
+CREATE TABLE t (c INT);
+SHOW CREATE TABLE t;
+FLUSH TABLES WITH READ LOCK;
+
+--error ER_CANT_UPDATE_WITH_READLOCK
+CREATE FUNCTION spider_bg_direct_sql RETURNS INT SONAME 'ha_spider.so';
+SELECT * FROM t;
+
+--source include/restart_spider.inc
+
+DROP TABLE t;
diff --git a/storage/spider/spd_group_by_handler.cc b/storage/spider/spd_group_by_handler.cc
index 7f26f91cc70..f2722c85ccc 100644
--- a/storage/spider/spd_group_by_handler.cc
+++ b/storage/spider/spd_group_by_handler.cc
@@ -1858,6 +1858,8 @@ group_by_handler *spider_create_group_by_handler(
{
for (order = query->order_by; order; order = order->next)
{
+ if ((*order->item)->type() == Item::SUM_FUNC_ITEM)
+ continue;
if (spider_db_print_item_type((*order->item), NULL, spider, NULL, NULL, 0,
roop_count, TRUE, fields_arg))
{
diff --git a/storage/spider/spd_ping_table.cc b/storage/spider/spd_ping_table.cc
index f220a9d97c2..8c2c8d2ce9e 100644
--- a/storage/spider/spd_ping_table.cc
+++ b/storage/spider/spd_ping_table.cc
@@ -1005,12 +1005,13 @@ int spider_ping_table_cache_compare(
char *db_name, *table_name, *link_id;
DBUG_ENTER("spider_ping_table_cache_compare");
- if (
- !(db_name = get_field(mem_root, table->field[0])) ||
- !(table_name = get_field(mem_root, table->field[1])) ||
- !(link_id = get_field(mem_root, table->field[2]))
- )
+ if (!(db_name = get_field(mem_root, table->field[0])))
+ DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+ if (!(table_name = get_field(mem_root, table->field[1])))
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+ if (!(link_id = get_field(mem_root, table->field[2])))
+ DBUG_RETURN(HA_ERR_OUT_OF_MEM);
+
DBUG_PRINT("info", ("spider db_name=%s", db_name));
DBUG_PRINT("info", ("spider table_name=%s", table_name));
DBUG_PRINT("info", ("spider link_id=%s", link_id));