mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
MDEV-32462: mysql_upgrade -s still checks for non system tables
- Rename files as requested by Vicentiu: ``` mysql_json_mysql_upgrade.test -> mysql_upgrade_mysql_json.test mysql_json_mysql_upgrade_with_plugin_loaded.test -> mysql_upgrade_mysql_json_with_plugin_loaded.test mysql_json_mysql_upgrade_system_tables.test -> mysql_upgrade_mysql_json_system_tables.test ``` - Related to PR #2790 - Reviewer: <daniel@mariadb.org>, <vicentiu@mariadb.org>
This commit is contained in:
@ -0,0 +1,93 @@
|
||||
#
|
||||
# MDEV-32462: mysql_upgrade -s still checks for non system tables
|
||||
#
|
||||
call mtr.add_suppression("Table rebuild required");
|
||||
SET NAMES utf8;
|
||||
# mariadb_upgrade on system and user table
|
||||
show tables from mysql like '%json%';
|
||||
Tables_in_mysql (%json%)
|
||||
mysql_json_test
|
||||
use mysql;
|
||||
show create table mysql.mysql_json_test;
|
||||
ERROR HY000: Unknown data type: 'MYSQL_JSON'
|
||||
show create table test.mysql_json_test;
|
||||
ERROR HY000: Unknown data type: 'MYSQL_JSON'
|
||||
SET @old_general_log= @@global.general_log;
|
||||
SET @old_log_output= @@global.log_output;
|
||||
SET @@global.general_log = ON;
|
||||
SET @@global.log_output = "TABLE";
|
||||
The --upgrade-system-tables option was used, user tables won't be touched.
|
||||
Phase 1/7: Checking and upgrading mysql database
|
||||
Processing databases
|
||||
mysql
|
||||
mysql.column_stats OK
|
||||
mysql.columns_priv OK
|
||||
mysql.db OK
|
||||
mysql.event OK
|
||||
mysql.func OK
|
||||
mysql.global_priv OK
|
||||
mysql.gtid_slave_pos OK
|
||||
mysql.help_category OK
|
||||
mysql.help_keyword OK
|
||||
mysql.help_relation OK
|
||||
mysql.help_topic OK
|
||||
mysql.index_stats OK
|
||||
mysql.innodb_index_stats
|
||||
Error : Unknown storage engine 'InnoDB'
|
||||
error : Corrupt
|
||||
mysql.innodb_table_stats
|
||||
Error : Unknown storage engine 'InnoDB'
|
||||
error : Corrupt
|
||||
mysql.mysql_json_test
|
||||
Error : Unknown data type: 'MYSQL_JSON'
|
||||
error : Corrupt
|
||||
mysql.plugin OK
|
||||
mysql.proc OK
|
||||
mysql.procs_priv OK
|
||||
mysql.proxies_priv OK
|
||||
mysql.roles_mapping OK
|
||||
mysql.servers OK
|
||||
mysql.table_stats OK
|
||||
mysql.tables_priv OK
|
||||
mysql.time_zone OK
|
||||
mysql.time_zone_leap_second OK
|
||||
mysql.time_zone_name OK
|
||||
mysql.time_zone_transition OK
|
||||
mysql.time_zone_transition_type OK
|
||||
mysql.transaction_registry
|
||||
Error : Unknown storage engine 'InnoDB'
|
||||
error : Corrupt
|
||||
|
||||
Repairing tables
|
||||
mysql.innodb_index_stats
|
||||
Error : Unknown storage engine 'InnoDB'
|
||||
error : Corrupt
|
||||
mysql.innodb_table_stats
|
||||
Error : Unknown storage engine 'InnoDB'
|
||||
error : Corrupt
|
||||
mysql.mysql_json_test
|
||||
Error : Unknown data type: 'MYSQL_JSON'
|
||||
error : Corrupt
|
||||
mysql.transaction_registry
|
||||
Error : Unknown storage engine 'InnoDB'
|
||||
error : Corrupt
|
||||
Phase 2/7: Installing used storage engines... Skipped
|
||||
Phase 3/7: Fixing views... Skipped
|
||||
Phase 4/7: Running 'mysql_fix_privilege_tables'
|
||||
Phase 5/7: Fixing table and database names ... Skipped
|
||||
Phase 6/7: Checking and upgrading tables... Skipped
|
||||
Phase 7/7: Running 'FLUSH PRIVILEGES'
|
||||
OK
|
||||
SET @@global.general_log = @old_general_log;
|
||||
SET @@global.log_output = @old_log_output;
|
||||
select command_type, argument from mysql.general_log where argument like "%SELECT table_comment FROM information_schema.tables%";
|
||||
command_type argument
|
||||
show create table mysql.mysql_json_test;
|
||||
ERROR HY000: Unknown data type: 'MYSQL_JSON'
|
||||
show create table test.mysql_json_test;
|
||||
ERROR HY000: Unknown data type: 'MYSQL_JSON'
|
||||
drop table mysql.mysql_json_test;
|
||||
drop table test.mysql_json_test;
|
||||
#
|
||||
# End of 10.5 tests
|
||||
#
|
Reference in New Issue
Block a user