From 1a9f6b1d89a170571d617c001b3a056c9bcf9939 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 7 Aug 2013 10:57:45 +0400 Subject: [PATCH] MDEV-4819 Upgrade from MySQL 5.6 does not work --- mysql-test/r/mysql5613mysql.result | 302 ++++++++++++++++++ mysql-test/std_data/mysql5613mysql/README | 2 + .../std_data/mysql5613mysql/columns_priv.MYD | 0 .../std_data/mysql5613mysql/columns_priv.MYI | Bin 0 -> 4096 bytes .../std_data/mysql5613mysql/columns_priv.frm | Bin 0 -> 8820 bytes mysql-test/std_data/mysql5613mysql/db.MYD | 1 + mysql-test/std_data/mysql5613mysql/db.MYI | Bin 0 -> 5120 bytes mysql-test/std_data/mysql5613mysql/db.frm | Bin 0 -> 9582 bytes mysql-test/std_data/mysql5613mysql/event.MYD | 0 mysql-test/std_data/mysql5613mysql/event.MYI | Bin 0 -> 2048 bytes mysql-test/std_data/mysql5613mysql/event.frm | Bin 0 -> 10223 bytes mysql-test/std_data/mysql5613mysql/func.MYD | 0 mysql-test/std_data/mysql5613mysql/func.MYI | Bin 0 -> 1024 bytes mysql-test/std_data/mysql5613mysql/func.frm | Bin 0 -> 8665 bytes mysql-test/std_data/mysql5613mysql/plugin.MYD | 0 mysql-test/std_data/mysql5613mysql/plugin.MYI | Bin 0 -> 1024 bytes mysql-test/std_data/mysql5613mysql/plugin.frm | Bin 0 -> 8586 bytes mysql-test/std_data/mysql5613mysql/proc.MYD | 0 mysql-test/std_data/mysql5613mysql/proc.MYI | Bin 0 -> 2048 bytes mysql-test/std_data/mysql5613mysql/proc.frm | Bin 0 -> 9996 bytes .../std_data/mysql5613mysql/procs_priv.MYD | 0 .../std_data/mysql5613mysql/procs_priv.MYI | Bin 0 -> 4096 bytes .../std_data/mysql5613mysql/procs_priv.frm | Bin 0 -> 8875 bytes .../std_data/mysql5613mysql/proxies_priv.MYD | 1 + .../std_data/mysql5613mysql/proxies_priv.MYI | Bin 0 -> 5120 bytes .../std_data/mysql5613mysql/proxies_priv.frm | Bin 0 -> 8800 bytes .../std_data/mysql5613mysql/servers.MYD | 0 .../std_data/mysql5613mysql/servers.MYI | Bin 0 -> 1024 bytes .../std_data/mysql5613mysql/servers.frm | Bin 0 -> 8838 bytes .../std_data/mysql5613mysql/tables_priv.MYD | 0 .../std_data/mysql5613mysql/tables_priv.MYI | Bin 0 -> 4096 bytes .../std_data/mysql5613mysql/tables_priv.frm | Bin 0 -> 8955 bytes .../std_data/mysql5613mysql/time_zone.MYD | 0 .../std_data/mysql5613mysql/time_zone.MYI | Bin 0 -> 1024 bytes .../std_data/mysql5613mysql/time_zone.frm | Bin 0 -> 8636 bytes .../mysql5613mysql/time_zone_leap_second.MYD | 0 .../mysql5613mysql/time_zone_leap_second.MYI | Bin 0 -> 1024 bytes .../mysql5613mysql/time_zone_leap_second.frm | Bin 0 -> 8624 bytes .../mysql5613mysql/time_zone_name.MYD | 0 .../mysql5613mysql/time_zone_name.MYI | Bin 0 -> 1024 bytes .../mysql5613mysql/time_zone_name.frm | Bin 0 -> 8606 bytes .../mysql5613mysql/time_zone_transition.MYD | 0 .../mysql5613mysql/time_zone_transition.MYI | Bin 0 -> 1024 bytes .../mysql5613mysql/time_zone_transition.frm | Bin 0 -> 8686 bytes .../time_zone_transition_type.MYD | 0 .../time_zone_transition_type.MYI | Bin 0 -> 1024 bytes .../time_zone_transition_type.frm | Bin 0 -> 8748 bytes mysql-test/std_data/mysql5613mysql/user.MYD | Bin 0 -> 312 bytes mysql-test/std_data/mysql5613mysql/user.MYI | Bin 0 -> 2048 bytes mysql-test/std_data/mysql5613mysql/user.frm | Bin 0 -> 10684 bytes mysql-test/t/mysql5613mysql.test | 120 +++++++ storage/myisam/ha_myisam.cc | 13 +- 52 files changed, 438 insertions(+), 1 deletion(-) create mode 100644 mysql-test/r/mysql5613mysql.result create mode 100644 mysql-test/std_data/mysql5613mysql/README create mode 100644 mysql-test/std_data/mysql5613mysql/columns_priv.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/columns_priv.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/columns_priv.frm create mode 100644 mysql-test/std_data/mysql5613mysql/db.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/db.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/db.frm create mode 100644 mysql-test/std_data/mysql5613mysql/event.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/event.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/event.frm create mode 100644 mysql-test/std_data/mysql5613mysql/func.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/func.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/func.frm create mode 100644 mysql-test/std_data/mysql5613mysql/plugin.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/plugin.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/plugin.frm create mode 100644 mysql-test/std_data/mysql5613mysql/proc.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/proc.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/proc.frm create mode 100644 mysql-test/std_data/mysql5613mysql/procs_priv.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/procs_priv.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/procs_priv.frm create mode 100644 mysql-test/std_data/mysql5613mysql/proxies_priv.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/proxies_priv.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/proxies_priv.frm create mode 100644 mysql-test/std_data/mysql5613mysql/servers.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/servers.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/servers.frm create mode 100644 mysql-test/std_data/mysql5613mysql/tables_priv.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/tables_priv.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/tables_priv.frm create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone.frm create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_leap_second.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_leap_second.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_leap_second.frm create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_name.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_name.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_name.frm create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_transition.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_transition.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_transition.frm create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_transition_type.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_transition_type.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/time_zone_transition_type.frm create mode 100644 mysql-test/std_data/mysql5613mysql/user.MYD create mode 100644 mysql-test/std_data/mysql5613mysql/user.MYI create mode 100644 mysql-test/std_data/mysql5613mysql/user.frm create mode 100644 mysql-test/t/mysql5613mysql.test diff --git a/mysql-test/r/mysql5613mysql.result b/mysql-test/r/mysql5613mysql.result new file mode 100644 index 00000000000..501c723f711 --- /dev/null +++ b/mysql-test/r/mysql5613mysql.result @@ -0,0 +1,302 @@ +# +# MDEV-4819 Upgrade from MySQL 5.6 does not work +# Testing that we can open system tables created in MySQL-5.6 (5.6.13) +# +SHOW CREATE TABLE columns_priv; +Table Create Table +columns_priv CREATE TABLE `columns_priv` ( + `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `Column_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '', + PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Column privileges' +SELECT * FROM columns_priv LIMIT 0; +Host Db User Table_name Column_name Timestamp Column_priv +DROP TABLE columns_priv; +SHOW CREATE TABLE db; +Table Create Table +db CREATE TABLE `db` ( + `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + PRIMARY KEY (`Host`,`Db`,`User`), + KEY `User` (`User`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges' +SELECT * FROM db LIMIT 0; +Host Db User Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Grant_priv References_priv Index_priv Alter_priv Create_tmp_table_priv Lock_tables_priv Create_view_priv Show_view_priv Create_routine_priv Alter_routine_priv Execute_priv Event_priv Trigger_priv +DROP TABLE db; +SHOW CREATE TABLE event; +Table Create Table +event CREATE TABLE `event` ( + `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `name` char(64) NOT NULL DEFAULT '', + `body` longblob NOT NULL, + `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `execute_at` datetime DEFAULT NULL, + `interval_value` int(11) DEFAULT NULL, + `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') DEFAULT NULL, + `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `last_executed` datetime DEFAULT NULL, + `starts` datetime DEFAULT NULL, + `ends` datetime DEFAULT NULL, + `status` enum('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL DEFAULT 'ENABLED', + `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP', + `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') NOT NULL DEFAULT '', + `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `originator` int(10) unsigned NOT NULL, + `time_zone` char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', + `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `body_utf8` longblob, + PRIMARY KEY (`db`,`name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events' +SELECT * FROM event LIMIT 0; +db name body definer execute_at interval_value interval_field created modified last_executed starts ends status on_completion sql_mode comment originator time_zone character_set_client collation_connection db_collation body_utf8 +DROP TABLE event; +SHOW CREATE TABLE func; +Table Create Table +func CREATE TABLE `func` ( + `name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `ret` tinyint(1) NOT NULL DEFAULT '0', + `dl` char(128) COLLATE utf8_bin NOT NULL DEFAULT '', + `type` enum('function','aggregate') CHARACTER SET utf8 NOT NULL, + PRIMARY KEY (`name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User defined functions' +SELECT * FROM func LIMIT 0; +name ret dl type +DROP TABLE func; +SHOW CREATE TABLE plugin; +Table Create Table +plugin CREATE TABLE `plugin` ( + `name` varchar(64) NOT NULL DEFAULT '', + `dl` varchar(128) NOT NULL DEFAULT '', + PRIMARY KEY (`name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='MySQL plugins' +SELECT * FROM plugin LIMIT 0; +name dl +DROP TABLE plugin; +SHOW CREATE TABLE proc; +Table Create Table +proc CREATE TABLE `proc` ( + `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `name` char(64) NOT NULL DEFAULT '', + `type` enum('FUNCTION','PROCEDURE') NOT NULL, + `specific_name` char(64) NOT NULL DEFAULT '', + `language` enum('SQL') NOT NULL DEFAULT 'SQL', + `sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL DEFAULT 'CONTAINS_SQL', + `is_deterministic` enum('YES','NO') NOT NULL DEFAULT 'NO', + `security_type` enum('INVOKER','DEFINER') NOT NULL DEFAULT 'DEFINER', + `param_list` blob NOT NULL, + `returns` longblob NOT NULL, + `body` longblob NOT NULL, + `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') NOT NULL DEFAULT '', + `comment` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `body_utf8` longblob, + PRIMARY KEY (`db`,`name`,`type`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures' +SELECT * FROM proc LIMIT 0; +db name type specific_name language sql_data_access is_deterministic security_type param_list returns body definer created modified sql_mode comment character_set_client collation_connection db_collation body_utf8 +DROP TABLE proc; +SHOW CREATE TABLE procs_priv; +Table Create Table +procs_priv CREATE TABLE `procs_priv` ( + `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Routine_name` char(64) CHARACTER SET utf8 NOT NULL DEFAULT '', + `Routine_type` enum('FUNCTION','PROCEDURE') COLLATE utf8_bin NOT NULL, + `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '', + `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8 NOT NULL DEFAULT '', + `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`), + KEY `Grantor` (`Grantor`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges' +SELECT * FROM procs_priv LIMIT 0; +Host Db User Routine_name Routine_type Grantor Proc_priv Timestamp +DROP TABLE procs_priv; +SHOW CREATE TABLE proxies_priv; +Table Create Table +proxies_priv CREATE TABLE `proxies_priv` ( + `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Proxied_host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Proxied_user` char(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `With_grant` tinyint(1) NOT NULL DEFAULT '0', + `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '', + `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`Host`,`User`,`Proxied_host`,`Proxied_user`), + KEY `Grantor` (`Grantor`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User proxy privileges' +SELECT * FROM proxies_priv LIMIT 0; +Host User Proxied_host Proxied_user With_grant Grantor Timestamp +DROP TABLE proxies_priv; +SHOW CREATE TABLE servers; +Table Create Table +servers CREATE TABLE `servers` ( + `Server_name` char(64) NOT NULL DEFAULT '', + `Host` char(64) NOT NULL DEFAULT '', + `Db` char(64) NOT NULL DEFAULT '', + `Username` char(64) NOT NULL DEFAULT '', + `Password` char(64) NOT NULL DEFAULT '', + `Port` int(4) NOT NULL DEFAULT '0', + `Socket` char(64) NOT NULL DEFAULT '', + `Wrapper` char(64) NOT NULL DEFAULT '', + `Owner` char(64) NOT NULL DEFAULT '', + PRIMARY KEY (`Server_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='MySQL Foreign Servers table' +SELECT * FROM servers LIMIT 0; +Server_name Host Db Username Password Port Socket Wrapper Owner +DROP TABLE servers; +SHOW CREATE TABLE tables_priv; +Table Create Table +tables_priv CREATE TABLE `tables_priv` ( + `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Table_name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `Grantor` char(77) COLLATE utf8_bin NOT NULL DEFAULT '', + `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') CHARACTER SET utf8 NOT NULL DEFAULT '', + `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '', + PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`), + KEY `Grantor` (`Grantor`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Table privileges' +SELECT * FROM tables_priv LIMIT 0; +Host Db User Table_name Grantor Timestamp Table_priv Column_priv +DROP TABLE tables_priv; +SHOW CREATE TABLE time_zone_leap_second; +Table Create Table +time_zone_leap_second CREATE TABLE `time_zone_leap_second` ( + `Transition_time` bigint(20) NOT NULL, + `Correction` int(11) NOT NULL, + PRIMARY KEY (`Transition_time`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Leap seconds information for time zones' +SELECT * FROM time_zone_leap_second LIMIT 0; +Transition_time Correction +DROP TABLE time_zone_leap_second; +SHOW CREATE TABLE time_zone; +Table Create Table +time_zone CREATE TABLE `time_zone` ( + `Time_zone_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `Use_leap_seconds` enum('Y','N') NOT NULL DEFAULT 'N', + PRIMARY KEY (`Time_zone_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zones' +SELECT * FROM time_zone LIMIT 0; +Time_zone_id Use_leap_seconds +DROP TABLE time_zone; +SHOW CREATE TABLE time_zone_name; +Table Create Table +time_zone_name CREATE TABLE `time_zone_name` ( + `Name` char(64) NOT NULL, + `Time_zone_id` int(10) unsigned NOT NULL, + PRIMARY KEY (`Name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone names' +SELECT * FROM time_zone_name LIMIT 0; +Name Time_zone_id +DROP TABLE time_zone_name; +SHOW CREATE TABLE time_zone_transition; +Table Create Table +time_zone_transition CREATE TABLE `time_zone_transition` ( + `Time_zone_id` int(10) unsigned NOT NULL, + `Transition_time` bigint(20) NOT NULL, + `Transition_type_id` int(10) unsigned NOT NULL, + PRIMARY KEY (`Time_zone_id`,`Transition_time`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone transitions' +SELECT * FROM time_zone_transition LIMIT 0; +Time_zone_id Transition_time Transition_type_id +DROP TABLE time_zone_transition; +SHOW CREATE TABLE time_zone_transition_type; +Table Create Table +time_zone_transition_type CREATE TABLE `time_zone_transition_type` ( + `Time_zone_id` int(10) unsigned NOT NULL, + `Transition_type_id` int(10) unsigned NOT NULL, + `Offset` int(11) NOT NULL DEFAULT '0', + `Is_DST` tinyint(3) unsigned NOT NULL DEFAULT '0', + `Abbreviation` char(8) NOT NULL DEFAULT '', + PRIMARY KEY (`Time_zone_id`,`Transition_type_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Time zone transition types' +SELECT * FROM time_zone_transition_type LIMIT 0; +Time_zone_id Transition_type_id Offset Is_DST Abbreviation +DROP TABLE time_zone_transition_type; +SHOW CREATE TABLE user; +Table Create Table +user CREATE TABLE `user` ( + `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Password` char(41) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '', + `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Reload_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Shutdown_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Process_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `File_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Show_db_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Super_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Repl_client_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_user_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '', + `ssl_cipher` blob NOT NULL, + `x509_issuer` blob NOT NULL, + `x509_subject` blob NOT NULL, + `max_questions` int(11) unsigned NOT NULL DEFAULT '0', + `max_updates` int(11) unsigned NOT NULL DEFAULT '0', + `max_connections` int(11) unsigned NOT NULL DEFAULT '0', + `max_user_connections` int(11) unsigned NOT NULL DEFAULT '0', + `plugin` char(64) COLLATE utf8_bin DEFAULT '', + `authentication_string` text COLLATE utf8_bin, + `password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + PRIMARY KEY (`Host`,`User`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges' +SELECT * FROM user LIMIT 0; +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 ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections max_user_connections plugin authentication_string password_expired +DROP TABLE user; diff --git a/mysql-test/std_data/mysql5613mysql/README b/mysql-test/std_data/mysql5613mysql/README new file mode 100644 index 00000000000..44be93c231e --- /dev/null +++ b/mysql-test/std_data/mysql5613mysql/README @@ -0,0 +1,2 @@ + +Tables created by mysql_install_db from MySQL-5.6.13 diff --git a/mysql-test/std_data/mysql5613mysql/columns_priv.MYD b/mysql-test/std_data/mysql5613mysql/columns_priv.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/columns_priv.MYI b/mysql-test/std_data/mysql5613mysql/columns_priv.MYI new file mode 100644 index 0000000000000000000000000000000000000000..59cc88e9c2ebfec45b8972732e0d010992c9fd1c GIT binary patch literal 4096 zcmeH^y%EAN427R!0^CuMf+^BK$uS0A0Y+d2Hle40-lH%8mk|;q|8OQ3etM+4NX~nf zoP2KE38A0{XY6oC2@vcE5}nTjsf!V;YGB7Z$!>Bd&G}YS&z5e-xF)IDd)o4;`X1od z?=>}$KUnbasT?pa!>9^o-9M16IqNlMW=Yn&1{bcrB`O5R%2nK_vf}mOMRBa0`bx1E vg(LorjOK7YgNH~spHm69nHqwnSqUfsC7=Y9fD%vwN)^MrgiV1 zKp_g0N^4FOA)WGhrZZmdglgG+`i- zuKEaSHDMr`srU$LHetX@M?D^?Oy!pHM^ev0`#J=q%0X6pQmL1}(&d_N k`6D`tD#a4AC5EE!%G#Kob!BII-*ts-ih-DkabGwR-xm+sfB*mh literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/db.MYD b/mysql-test/std_data/mysql5613mysql/db.MYD new file mode 100644 index 00000000000..75caf717074 --- /dev/null +++ b/mysql-test/std_data/mysql5613mysql/db.MYD @@ -0,0 +1 @@ +˙% test ˙% test\_%  \ No newline at end of file diff --git a/mysql-test/std_data/mysql5613mysql/db.MYI b/mysql-test/std_data/mysql5613mysql/db.MYI new file mode 100644 index 0000000000000000000000000000000000000000..9df866be2bffea7ff73e8781a24cfbb99ab6e3e4 GIT binary patch literal 5120 zcmeHIu?_)I5S+ck(V!4|iC%^1{eWvF8hVM-t2F*ZB2kbieTpx^?t6QeyF!#gc9Xl^ znc3UhH_dxIB0>;MaKZw2lz;$n0FKd9-W(43(&MLw=UOU-t6a~UG9I(gR*`(JDr_R1 zn`RX-rTb3nP;w4Cn(?_$WBOcg97CwH^#ep0W)m`1K9MfCp`30~1Kc2?+IN#*#op$CIbaT$ z13%+H7t|{y%XOj~ZxIQa&3m5EYvpIoV~d&t=72e14wwVxz-I@Vg%-Q*3w9VV2mafE E7oajV@Bjb+ literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/db.frm b/mysql-test/std_data/mysql5613mysql/db.frm new file mode 100644 index 0000000000000000000000000000000000000000..81f810253b9409b3239c6b1074fe24be2874d0ff GIT binary patch literal 9582 zcmeI2%TC)s6o&t?<3M7kaY%^NRq3)T@(QRyZ7Qe`DGOAoD1<4EnkJEB0^RX2Rqyu# zr8|Vw$LMo($Mg)glL_6>RU>gmisJcvG9G{VH$L*2$YgB57eEC#wT|f^9##$0fTL&i zgq>Qz;ZI;b0rPY;mrVGZ4X^<=zy{a=8(;%$fDNz#Hoykh02`P{16B&i!@>(eT>yxE zdcGGpfVF?54^Ck34+I@lVADtU28KYbtk#wnR@c>9Uj}L-Z;m&01q`S;9usds{5^m) zmY>(^3(HYRZ(M<_@-4CfHoykh02^QfY=8~0f&XiuDFZ*u#kdtx7!ctwF$erNozT} zJAx^Ab=j89a6@~e*DAbPhj={Az+3BWH9{Gk&BCivaWZw`-45jNtcPqh==P%09NarW zqZ6-l4gRWpECbnT%6?Rkhg<7x$-QXi!(C{HGKgjcl;efNXT1&jU)%8pW>8q_HlIc) zUZ{vdTs&yW-DrUl^7SX(-Hj2MMJcWdx;tU36E9dsF}m&;eT0<#Z)$Ukd$PHch;iU9 z4rFrkY2+RRt?ljP?o!S@YGdgp7L7A{fyJ?xPH^7Uib2|`RB+ziiouj;+juE3EqsXI zH-TvlUKt>x!D|C#HF#qHSA(|(@UjHn86f8pcyEAfK7kJg$m@!a2JkibWPn1Mz-I%@ z6bO7VKv9FQ1}NnTd^5moiNJvY%0&W)21w-y92vmT`}l5vw6366hK9zJ4!^2yMomE@ z^U4UkGSaS$s4FAqY8Y}gO1QcZZ(20Twi*RHS!O)d>SCmmvSE7Fc$ky(W@h87j3G0V QY7|IircpuNSL+IY0DVq=`v3p{ literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/event.MYD b/mysql-test/std_data/mysql5613mysql/event.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/event.MYI b/mysql-test/std_data/mysql5613mysql/event.MYI new file mode 100644 index 0000000000000000000000000000000000000000..9be2dfaeb5c1bcf60d9aad8260f0098c07e6bf5b GIT binary patch literal 2048 zcmeH@O%4G;5QSfLH)bIrBC$2suyO`2VBsFDuyhnh5NiuZuyYH%s@8rcBeB<&bbnn{ zZz?tKdTj~3YhZ^tPH=#rVLRm3U>d#8?-Xs~J# z&{ha83Xg{F?h&H-5|}xPUZ6z(i|9rS2_5hPKaZuo;+cU>yvGD7&~5-v?(HAi+J MJCGg74*ZJ)cRQ^(`v3p{ literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/event.frm b/mysql-test/std_data/mysql5613mysql/event.frm new file mode 100644 index 0000000000000000000000000000000000000000..870ccb6f57918052bf63e72363c2bbf71088c6f9 GIT binary patch literal 10223 zcmeHNO>g5w7=G;}jgxHC@1+X|7H)9a)h=2g1fotnP0TuW>ahz!LbGn-LZo~^;#Mpi z2x29W5CU=GL*l@X;9i8d?f=*V2aX^ib$G{d;#6=b7q*pVq$KbAc;2sPoZBdUjF8LrAxP8HKx|X1E-=unDiaeb@ zkd|aXG9Vd{3`hnf1CjyBz{O_Z_dKkgzr!VR91f!K`2#NeP8F`gr^?GEfQQ*fkcC&^ zH@paGB3g`le^%MtP&c1D?;qxvA=5d)mnL$9pdZ2#!O_9TH*y}(EwDu?rqOb#3pwJ(7x`=mR8Opt29I+%@ z2g;BiN5Ke>X9aTMpfkpk6-ab6hBYV;2dq8pzuOC=?r;F>P#C}0W0)<34JhoO7682i0`NbfbXX)%*WGpKHC7S}d<;pz>7J#K9QuuQgu02R7Q?C+k zJ09~XRt#ddwmVl~(Co2=5pXUxaAnoSHw{fg)6RnK&6fg7gFOq*4)DpK5Zs8_>Q z_AKt;CX4U}6^>E4#T)t?Mn#0&B`xMOMFJ{ZPt3Lm?3%bYjsW7xD!r^V)&jzh-f<3>aZF^eH4 z!BnvyJEo0wOe20mIdNUbWxMz>%zcyM9LUkM0W4yeVlv&Dw>YInaO?8AS*tU_G@e(L m7{rc=XT+|VHXejup`PjaF}F?KVAVP*6Q_(%!@^ytYWN!=dAl+I literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/func.MYD b/mysql-test/std_data/mysql5613mysql/func.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/func.MYI b/mysql-test/std_data/mysql5613mysql/func.MYI new file mode 100644 index 0000000000000000000000000000000000000000..f56c6da600adfb6372eb18d00f9bf7e122d077bc GIT binary patch literal 1024 zcmezOkDZZ$i7}I5149bK5e7yEAPNSOK=2<-Vj=!R0Yr)giwayq!B)sJFmqruOfHD= zK^v3}b_o(6rUaRWxR!xfcQ83KFd$S loG}QKtvfEz#O<52yc`e4S_)u0s!gIC!qiU literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/func.frm b/mysql-test/std_data/mysql5613mysql/func.frm new file mode 100644 index 0000000000000000000000000000000000000000..bb64f83542b2bbccec7f8b7a768c956e1bb90244 GIT binary patch literal 8665 zcmeI2ze)o^5XQf`yUia(2&id-a4D_gD}+=L4?=>4U~_nza1c*P&LUl2%04JQgim6Z z&768*na&)1+w9IT%zpfqDQ4KMG@Cxq65t9*W#FM)UKb6(6y~J#r5gA80bG=hUJnRM zgF6Y3011!)36KB@kN^pg011!)36Q`+5)f_ZkKkbgJwVpl{)-xJG#*C%@tr$J(Nz@X z!iq0cTz}=|Yk}4ft%j3+^iu#QRjdPQCIJ#40TLhq5+DH*AORBiHv*r6*8Z2bZPfZ}X_xOcp;{ z{WcLSY_1KPpUhE*$yd)7fw|u3tmS*uf~|h4Fo6i(faBseQAf?cSrP3Q(Ys0z!Y#`)K0^J%Kozrw-IC9!JA?sS0^$9*P2gDNsU`jTgh{efi2? z8t~E-pa2CZKmiI+fC3btz^?)qfqMS6)hJucr@3@$o zL-RB5!;!Ml333j&@b;_SMz>8k>lCgxdH+~3yVXM7P2o(>;{Ms&B$TOE>r~+d&|V~D literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/proc.MYD b/mysql-test/std_data/mysql5613mysql/proc.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/proc.MYI b/mysql-test/std_data/mysql5613mysql/proc.MYI new file mode 100644 index 0000000000000000000000000000000000000000..7c6682bcbc70f4c44dd8bf7d5276fbb7cbe68d30 GIT binary patch literal 2048 zcmeHE!41MN3_K^L6a+#@FhJK}47vah_CUNUey|B6v^y{WKelMGokX;#Nc|$kl5_F- z;zXCGnG&p7;*KL8umB-9kZ5%sSXv*hl?^CL-tQl^%@ag6rqtlgkh z5ud9ZO9K7MEBlaOF3JRp4iH{a8KysAUF8oD4sr#9d^3YcdCFM7SREre5FLmPLhuv6Ghi6 z0Cff69zd!*uEKn%Tc88f#PrR%mZIHHzW}^57w+B#*ql$~RT7W{Bmqf45|9KW0ZBj- zkOU+FNk9^i1g<3k1%Lc6feK%V8&FPE{DM&@(Im!H@ct&~ zA~enuSVxn|Xq1d|MAD4DK-Uq*XVWBS(J&Qy6ZOe(ILOn=+TR6R?*uC1>_uL9r0YXA)mKROD55O4_L zrr!Rc_Mifo5Z_eAaJ#-fV?` z(P@0vX8c7xh7X@_FiiifyNW19t8n1$&@lqbb#QmmHK-YS6h(j6#&5%Q0%AEn6H~`6 zE*>RjAuy8!gm+!jYFqT20=!Rsw8r(8v*+$mkDIh@Id}z*t8GSn*0x;|@SfGfl{m#f z2F{7&TWmLU19V_@9M_}F?-7Hdw}6E{HM#59ebx?bn{_-l?6Fo~xQ4J;rno1Pc2 zR@;0kbo=OF>;4umZr;0BR3O%oFmTx(u|r(!uurMy3bjRy9p5JYHlw~luy*bTo@E3K zlSax#u%{ZqB4-LN6)r?A2wmVP=fwme6WcP2CqAd1=X$J-AJf{ie5?Z*l?h-F(-M`D z;$;>omS_Z9k8fL@Z6-+fJc^A#odP_gP6uC}K2hAK1xO+XXS W1T+CnKoigeGyzRO6VL?yErBPmr%8zb literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/procs_priv.frm b/mysql-test/std_data/mysql5613mysql/procs_priv.frm new file mode 100644 index 0000000000000000000000000000000000000000..8fd024887d24583f7cf8a8deb1204abcb1a7e46f GIT binary patch literal 8875 zcmeI2%}(1u5Xb+!j*V>;DJh5^xP)U*MB)hoaUm7?s3C`5iUKSs68VthAh`L?d-T$4 z+jE4}OJ5|9(4N@N8prA}msB~-T)Z>uo!$9Kmb`z>i|{-PC<&knJj;-r%;aadfNi|9 zMeJDu-+uyoi@^RqP+2(qWCBcp2`~XBzyz286JP>NfC(@GCcp&Nl7Mu8H;_=$T=Ydk z_j`eFkjW1-n88Z!1r4ewBwt7)popE^NO&~?3v-$Qoa9#0U=H008_inyNgqeOVLXa7 zO|mh8)e_JZHYTuQ0%FDa*Cl=SsXAyrHqL6zSGT;{516wv0Vco%m;e)C0!)Aj{6_*` zB}&V0x7~?GSL%8ismeI&-}mp-t(q*qd=1|e)Z_4kU)1#wS^?=G8#tg-cCeG3^$DIU zx8E)Me~tp|lhGumwh60#2?us}q9V##3`f(rKU5dP-ayfwxgS4{6+F0^W&$6+fqY^3 zViW#(f1oCDZ!ku|{y@Tvk!8qUs3pU;PG?AUnk?Yh)hbfGCJSs74`)bq8xzWn{oo^77F=0|{6kAN{jDvuEu!=mC{ss>HU;YXr8cGMf9uK} wQ&g@3<>lzS77hKr+d4XLv|A(^wU2^&Hw-8kJgBQ_taR-zR#7EO{hCPQFQ=yYO#lD@ literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/proxies_priv.MYD b/mysql-test/std_data/mysql5613mysql/proxies_priv.MYD new file mode 100644 index 00000000000..c645be421b2 --- /dev/null +++ b/mysql-test/std_data/mysql5613mysql/proxies_priv.MYD @@ -0,0 +1 @@ +˙localhost root  Rŕ‹˙noter root  Rŕ‹ \ No newline at end of file diff --git a/mysql-test/std_data/mysql5613mysql/proxies_priv.MYI b/mysql-test/std_data/mysql5613mysql/proxies_priv.MYI new file mode 100644 index 0000000000000000000000000000000000000000..875f80da139cfd3df263ae2ef77fbcfc213e136e GIT binary patch literal 5120 zcmeH|J5Iwu5QhKpBQ_KeMN}LDr9>PfJ^=!xD6+Cr@GUq2x1b=GprD|lqzIydf&)0r z?2fICrO<#>9wVYk#(GyV6&%U04f(Xr**zg$51ODkd#;mzA5oK_8=NAHY&5 z?R(U>a5`gtbSLdf!ktBudoqN3J{XuBX35g&1dwAu37GR4M>u#32B4|38ESL+diDVn zLZMjPC_<6$M1Tko0U|&IhyW2F0z`la5CI}U1c<;+5#aLwejgm4EGhe9p8UUOn1Xw6 z>Y;>$_v0%`?}hma7V-|Hyl*8eAnJ{3t=za4l~L#39gM_I8Kh=nPCyiB#DV}~;bOZ9 ze?6v98&{jW~O;rPSe^RVSuqrz}BcpA&A{b=7= zUCY@KEB|VPLB|B|>R1Cmi@s3DQSdy0q4R^2?Ynw^29nUu2aYR`O=yZ0QpnaNF59|o z_mr-$>j(ATK<3JJd+n~uPLPHXgeWj!UfO-jaXbAXlG=sLWK<9%$5Nig(6mwstB58L zQrXifR#8nL=vg^q71;!Wkzov93>jI2$#0~M$^xqlCzxTH`8-}Zo^cH9$+I6qSrN*I S*fbFp%7Iw79|b^B;{v}rTg#RJ literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/servers.MYD b/mysql-test/std_data/mysql5613mysql/servers.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/servers.MYI b/mysql-test/std_data/mysql5613mysql/servers.MYI new file mode 100644 index 0000000000000000000000000000000000000000..22aa14ba1e75d6c476543c675d3c82f68a371682 GIT binary patch literal 1024 zcmezOkDZZ$iLr-a149bK5e7yEAW{U9K=2<-Vj=!R0Yr)giwayq!B)sJFmqruOfHD= zK^v3}b_o(6rUaRWxR!xfcd)TCFd$S noKX=h%gk^9Bmri_X^;>Q8~~HpDX2rSDuHMlB}YSmP9XpQpvEgc literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/servers.frm b/mysql-test/std_data/mysql5613mysql/servers.frm new file mode 100644 index 0000000000000000000000000000000000000000..3ae10fedd8a6281915ade19041d0f79e3bbe9c6c GIT binary patch literal 8838 zcmeI2Jx{_w9LAr%(n1Gfj0;O~bHc9x5)?yYr7_0I6m1MqDQO!Cn{i;_^SEC~^kZ?} zQEC_&Y4ZOsy?gGid7j_Um&>gc+tz@(0-OV5#V}En+JprdvfC`Qv6%P$1DqB@s|C14 zhpt3`2oM1xKm>>Y5g-CYfCvx)B0vO)z(EpF#1DNHDi}lq%BLz_GH`#`_u9h;evqci zXo|a3M1TmCmVkWdl-4{MKL`SV32)vH+Ft$&J1XOwj64$oB0vO)01+SpB`2^@QQtp8 z!plsm(?4c)n5Vy7mrbyGMtt{GN4f~gG{zT`%ZC^@5I_ZT|cHBzvopo#+@ zvZP=ex{j5Gh7>d*R4Z2uzdJK()+NJ2m*e>o$LuroHs?Zef$t>dGA{3qcoCErDY=Zu N^L%_8j&G82`~lvGETaGb literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/tables_priv.MYD b/mysql-test/std_data/mysql5613mysql/tables_priv.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/tables_priv.MYI b/mysql-test/std_data/mysql5613mysql/tables_priv.MYI new file mode 100644 index 0000000000000000000000000000000000000000..678910275c89cda27f02b13703cc2927b44d5549 GIT binary patch literal 4096 zcmeHEu?@m75WII1A`k)!2BBsQvH~;|bVy9VCiE20dz5rEzz7NNj~$GZ2x{~v`Rv@k zFP}?Q1uI-fyi#BL08kV8Z%VaoazBeNrRU?jLO%LHB_SXQpQ&?*Z)?>`jF%1IQ$ zBn2MG@oYVB{HHdq%J5(3Uc<1$U_%Eh3~qN|8;558aIevnH33aP6VL=S0Zl*?&;&FA MO+XXS1pYaJ7vj7~;Q#;t literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/tables_priv.frm b/mysql-test/std_data/mysql5613mysql/tables_priv.frm new file mode 100644 index 0000000000000000000000000000000000000000..64684d412962c8e654c785c0582eaedb1af77c39 GIT binary patch literal 8955 zcmeI2!EV|>5QcxRF|lzDP^$LoULy4rUIBrWQWYu1P^pJ1GGRk485`LyNpHSYQQsp^ zkoJrs^+9^#6)IKAc5DpIr4ol8Xf=D;+28BkneTw`uesMOO9$#2&;ss+ON(-d5lq0y zSMEl;6Tp{mz_X2Td<;071NfC(@GCcp%kz+Ms%^nL#b0uxc8 z{Ira|?={>)WMA`O2|ZhA6tqyuZt{Q>tY{`NfC(@GCcp&#aRNUD>bsXvA9~|J zI`i0H_<@|tWcOG1bf-o=4%hfj=7+0y$OmcS6J>geCuP3ZuuSpz`L2JiQGxLyN>XZ@ z(7R()VT=+P;{bL+?kx0Xl5R9hs{|HmLw_cd)SJyw+w98u!p31I3O>xjvtn5>UXm@7 zn=&-+sUgGAUoBC%G^J2AS}hcAO(`7M-6aawrW8!`WQD@DDFv(6Y@)B@GoAts>h`GF zM@QOg9d*%w_Jg`S?8DAGLIaZokqas>Pj$yCFHHTeYU}=N>nR`R*{cVYC@5D3@;p_& zkd8>zXg={$sk$W6)QM%Wilh1ZNHvfbGM3@FOz4e?yi)BTrK{H)oj1O`RPOue(pluu PF!rZYdisY;9-M_=(?A}& literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/time_zone.MYD b/mysql-test/std_data/mysql5613mysql/time_zone.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/time_zone.MYI b/mysql-test/std_data/mysql5613mysql/time_zone.MYI new file mode 100644 index 0000000000000000000000000000000000000000..25955801d005044586edb8fdd02731885c39e3f1 GIT binary patch literal 1024 zcmezOkDZZ$fiaq4149bK5e5*OK@ms-!GAD`h4>Ez5GfWcDsTw}TOrH9%z@D`xgf>| z?NBz@B}jaj5@Z_US_Y!s!3NaK4#XfDghhau8HgF!SQ)`)0ZkGB@sR;gMi3~@1%jOR dU>OInl~CJ3AqN6bSHMIef}`YU2n^B?007=*B4_{r literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/time_zone.frm b/mysql-test/std_data/mysql5613mysql/time_zone.frm new file mode 100644 index 0000000000000000000000000000000000000000..f62d93408a4aed3ca7132a47342448ad428d1381 GIT binary patch literal 8636 zcmeI&u};G<6a~=x>=Ly>5vhb2U`fVKrP3Q&LoofHr~(1)6A0R4cx8{k?SezBZqv*pTnGISq99VAsZK(?FT z&$8b=ocD1n%uE3aP=Epypa2CZKmiI+fCBv!_!PwLQ-^u^;*z)R##QZq>hwr~L5@f> z2KtUcV6_GoxcW<-!y0orNm>@YI*DqdqBbhZwLYI1KUA)Gc8{+`<({^ib%j9`hPtd? fv|Io-)i)MndsufUG2}}-{P7(AbOH~*@^>CTs>wFx literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_leap_second.MYD b/mysql-test/std_data/mysql5613mysql/time_zone_leap_second.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_leap_second.MYI b/mysql-test/std_data/mysql5613mysql/time_zone_leap_second.MYI new file mode 100644 index 0000000000000000000000000000000000000000..334ad10e304c880c46848523a2c7e0c1170566f0 GIT binary patch literal 1024 zcmezOkDZZ$fiaq4149bK5e5*OK@ms-!GAD`h4>Ez5GfWcDsTw}TOrH9%z@D`xgf>| z?NBz@B}jaj5@Z_US_Y!s!3)%kj75NaW{`nwtPrDsCP{$!$bgZNfe|Rq2ZCJoU>OGn a4j>J+9Y%wMfPiSnK$MS?qaiRbApihbej<_p literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_leap_second.frm b/mysql-test/std_data/mysql5613mysql/time_zone_leap_second.frm new file mode 100644 index 0000000000000000000000000000000000000000..a2e7f133b6da42c3bfd426480c78c5965a751236 GIT binary patch literal 8624 zcmeI&u}Z^090u_3k}9d8kRiAf@iK{1eFRIVf`PWWI7z4{+|ZmPU3Bu1Tzmvy%lJPu z6*^_Jf$x^w{khzI_uF#hOAUu1kSO2^uxf-|3o=B&ksoJm(aOA!Phi{@CKEun13oE0 z0SZun0u-PC1t>rP3Q&Lo6gWr$B_H%Bk}QIBpxy#tb{(NvtmgT2b>AFh=st$plRQTL zGQXYXKSzoCcp_$|00k&O0SZun0u-PC1t>s)9tpfFB;Dg)+?e87*Jka?$6DL+$yJ+T zYh9_Or?+-v^s6gP-F?OXo~aOEiF1iD!r3m&0;j+ICBh&`FLlR;0g}6_C~NCg9=wSB rK@rbfRhhLfVUVP$>?yY_vO|=~4;FD8`zx5SFN9KP_7-UV-fr*>Rh~SU literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_name.MYD b/mysql-test/std_data/mysql5613mysql/time_zone_name.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_name.MYI b/mysql-test/std_data/mysql5613mysql/time_zone_name.MYI new file mode 100644 index 0000000000000000000000000000000000000000..ca893298f47418caaf56dabf2d1e508c5fe8e9df GIT binary patch literal 1024 zcmezOkDZZ$i7}dC149bK5e7yEAW{U9K=2<-Vj=!R0Yr)giwayq!B)sJFmqruOfHD= zK|7QUb_o(6rUaRWxR!xvcN_(3M#dsQJ~PNbHdcsHK$9+j_{e~fk%1p5evE;g;W(or eScaM50FZ{-4x>RrKtQx(Aj(I{(GVDz5C8xpH7KwE literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_name.frm b/mysql-test/std_data/mysql5613mysql/time_zone_name.frm new file mode 100644 index 0000000000000000000000000000000000000000..7f3ac662b9bf61a3d2a89532311e47bff648be3b GIT binary patch literal 8606 zcmeI&v8uu_6b9fwsTJ)-bPxw!+R@4T2)e0I5p{7A!44hN!AYn4B=;@ci{Roz8BfrP zW5*W%K-=VyLr=d>3Aw9k)d3m`_yuBh#k=VM6~MLQAPvSc?<{jVX`t5w{B*!41t>rP z3Q&Lo6rcbFC_n)UP=Ert6i~9D_n?tLI#7RF?)?O2Iva(9+0x{)=pq(n{DQY9dKuwy zG#`Y|(N7Wo1Z$=M1t>rP3Q&Lo6rcbFDDag6{|b%lA6{R?+sHrdcagtaZ=*x@%)HK2 zviC8>P0G8X`7Uyb)~i2+qjj^Jb?uH4+=0ImzeuD2 literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_transition.MYD b/mysql-test/std_data/mysql5613mysql/time_zone_transition.MYD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_transition.MYI b/mysql-test/std_data/mysql5613mysql/time_zone_transition.MYI new file mode 100644 index 0000000000000000000000000000000000000000..a5953d502d76e5355e085a8a2e6b97ce7d992a9e GIT binary patch literal 1024 zcmezOkDZZ$fw6*N149bK2?i!0n?VsM0tElTBo^X76hNd{u&BT#6l{eo12YFk!{mY( zAGAZ+V3#2AVM@?xh>IDBc8eg;0AwrzIDBc8eO&0AwrzO*xG)Ok<}Du-bWvX!Ik(GZ|%2mk;ADkIMT literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/time_zone_transition_type.frm b/mysql-test/std_data/mysql5613mysql/time_zone_transition_type.frm new file mode 100644 index 0000000000000000000000000000000000000000..2c392e786b74fa33075e050e88aa4991735ee775 GIT binary patch literal 8748 zcmeI&&1%9x6b0auL=%5VD_DwHDCtIMDcE(PpwNvAsi>Q-g3<`Hs1_3ny6Q{y5&BwA z?=&hF5nM(%vq)wx!*J%?<&u?EEIL5N0v-TmHLxA_9ST6+tZz0&CHuaAfa^`6*#v^k zf^P~?fC3bt00k&O0SZun0u-PC1u`jM*+5B>6(AE>U-GQCa)2qX+RA{73)rI#mnZ!{74_+q@p9e$f!1(R)cpiPKkx@m?FO^JFrrwe$j{Jd< zuS(&sEwe7TUb$?VH&-UB+2MJP18EtUh7K$#6#QBZ=Vm2iB?Y}3PVXnvX)K*)(z}5) FegRKMSA+ln literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/user.MYD b/mysql-test/std_data/mysql5613mysql/user.MYD new file mode 100644 index 0000000000000000000000000000000000000000..78a2112b37bf6c94044a3fe07c9c0b2fdec6bdc1 GIT binary patch literal 312 zcmZQ(FlPME|A#XtKRGccBfq$Wr6@nYgn0`~yFG(#TS`Wl7LnCuN q10XacQXeCOF3>7wD=Q*3K-~5Z;U@+LM!W#*A8nw2{z3dhgn9t5(j+7R literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/user.MYI b/mysql-test/std_data/mysql5613mysql/user.MYI new file mode 100644 index 0000000000000000000000000000000000000000..c4746cb7a02e4def4247f25e9ec861a02b7ff8d5 GIT binary patch literal 2048 zcmezOkDZZ$nP~#U28I-d6AVlY42%rHj0`|v`5#0A0ULyZlWhN?03yNxm0+}htH8+! zwgO5?z%)Q;76w%F7#M;WAG9H>LE=M&F(|N$85meFB(MuGsWLEtFoPNc3zIgG76D=% zAZB7?0~*D|zydVs1CWmbm>3!Of#R7^F6bl0v$YZD!GbB#1Qj81-K%NI`046&ifQAH^Jxb6i1d5wl?Dccas~$0y!?{XBCuXY4rD1J TN(DOkbkv&B5Eu;sv=9IQ<~cRs literal 0 HcmV?d00001 diff --git a/mysql-test/std_data/mysql5613mysql/user.frm b/mysql-test/std_data/mysql5613mysql/user.frm new file mode 100644 index 0000000000000000000000000000000000000000..de49c945b31799f62d1b7f7f69e141b7f9dcab7c GIT binary patch literal 10684 zcmeI2-*4Mg6vvN~I*DT^wVNM>bwD;K&<(UcfDjTAs@9H$t)pr-!Qdfs6O$S|+xSP@ zz3qWV!~=f|@WcZz{3nQiffv-vxxRLMQcb88FP(HPwY%rz=kP2K%1r+?g--HVMi9Z0!GyJW<&ro^xD<5nE+uI-RZtXv2m$Lg8sHxL|JW2(W z|2!`CSj(y}=BS)4Zm!i}_vvu7wJYFzol1A(yx%Ng3DmnmoZxE{D%T3X&uM#h93KbK6zX7%9M72~W3C$B${6~X zlZP4@kHV>)IO1#*jBQLVLLH3TkuyJQKyy0^LXp}6W8d)tdn&>0hXb) z7X=e1jzw%j^A0{U5m=yq64`#<#0r@E&eu-l_?RvdI-n2zsdFNtF6dic;zT0qL2Gmv z9FM05BJP7eO2gvp4;R+1pU*LQ5{?u5py*Kr>wYl#R-nAC8nkv!oJm>;ROg+C-Z=K` zqkL)&urf69T&I|z23CHLBiA_=T{mGln?*@<=;m2bkS4C57c`(FCci*i^O7k(O;NH9 z`p(h(ruYCJM(%7@oHb#!m?)oQ9NLrl)6nAB8z)ag2UbAmd~!1u9yR#Ams zR*_GV@*31bFP*tQF7UpcCWkn0cVhF4#&Ht4{tTD873O~hW9KAvBWDUr>ZiER$afj> zIK?-NRCRL`vTes4)U=Ha_^Zgk7meyhwF=7$G!zq*zpnu_IKX$8=0M}XBB05^3IRF? z9RiFdf-V6qp3x(q-A2$SV7Y~0l>n31c!>Z@NANNMD<*;~1ax@D8UbAnt`gAWcX@?? zKF@fSfTccy*9cH81OozUyv8*G>b#HZ1T^?1uM?ng@CE_RWd!R4=v@SF5@2)?yhT8Z z*La(NHgA1{fK0+01emLsagzW`TUGgP+by`nc7@U8;Zb{F8Ej{!Ocf)5Djwh(L) z&}-{D+*9BRUt?8VV|@d`X9O&n2u1{`Jp`Wo7+1py&bPz zFm~*saCKH%I#wdAP=1w$4wapR)s+<3*^%kViSocBr{xF|EX zUsifAqsCh#W*;r3>$1Xfvw`qiM$A@>bEjnsHk(Dc$7W+io8oi#}Y d>;c37dtq$r!DIFX`ac`(?c5&T8SZQ|_!l`Mr*!}T literal 0 HcmV?d00001 diff --git a/mysql-test/t/mysql5613mysql.test b/mysql-test/t/mysql5613mysql.test new file mode 100644 index 00000000000..c4baf6ca166 --- /dev/null +++ b/mysql-test/t/mysql5613mysql.test @@ -0,0 +1,120 @@ +let $MYSQLD_DATADIR= `select @@datadir`; + +--echo # +--echo # MDEV-4819 Upgrade from MySQL 5.6 does not work +--echo # Testing that we can open system tables created in MySQL-5.6 (5.6.13) +--echo # + + +--copy_file std_data/mysql5613mysql/columns_priv.frm $MYSQLD_DATADIR/test/columns_priv.frm +--copy_file std_data/mysql5613mysql/columns_priv.MYD $MYSQLD_DATADIR/test/columns_priv.MYD +--copy_file std_data/mysql5613mysql/columns_priv.MYI $MYSQLD_DATADIR/test/columns_priv.MYI +SHOW CREATE TABLE columns_priv; +SELECT * FROM columns_priv LIMIT 0; +DROP TABLE columns_priv; + +--copy_file std_data/mysql5613mysql/db.frm $MYSQLD_DATADIR/test/db.frm +--copy_file std_data/mysql5613mysql/db.MYD $MYSQLD_DATADIR/test/db.MYD +--copy_file std_data/mysql5613mysql/db.MYI $MYSQLD_DATADIR/test/db.MYI +SHOW CREATE TABLE db; +SELECT * FROM db LIMIT 0; +DROP TABLE db; + + +--copy_file std_data/mysql5613mysql/event.frm $MYSQLD_DATADIR/test/event.frm +--copy_file std_data/mysql5613mysql/event.MYD $MYSQLD_DATADIR/test/event.MYD +--copy_file std_data/mysql5613mysql/event.MYI $MYSQLD_DATADIR/test/event.MYI +SHOW CREATE TABLE event; +SELECT * FROM event LIMIT 0; +DROP TABLE event; + +--copy_file std_data/mysql5613mysql/func.frm $MYSQLD_DATADIR/test/func.frm +--copy_file std_data/mysql5613mysql/func.MYD $MYSQLD_DATADIR/test/func.MYD +--copy_file std_data/mysql5613mysql/func.MYI $MYSQLD_DATADIR/test/func.MYI +SHOW CREATE TABLE func; +SELECT * FROM func LIMIT 0; +DROP TABLE func; + +--copy_file std_data/mysql5613mysql/plugin.frm $MYSQLD_DATADIR/test/plugin.frm +--copy_file std_data/mysql5613mysql/plugin.MYD $MYSQLD_DATADIR/test/plugin.MYD +--copy_file std_data/mysql5613mysql/plugin.MYI $MYSQLD_DATADIR/test/plugin.MYI +SHOW CREATE TABLE plugin; +SELECT * FROM plugin LIMIT 0; +DROP TABLE plugin; + +--copy_file std_data/mysql5613mysql/proc.frm $MYSQLD_DATADIR/test/proc.frm +--copy_file std_data/mysql5613mysql/proc.MYD $MYSQLD_DATADIR/test/proc.MYD +--copy_file std_data/mysql5613mysql/proc.MYI $MYSQLD_DATADIR/test/proc.MYI +SHOW CREATE TABLE proc; +SELECT * FROM proc LIMIT 0; +DROP TABLE proc; + +--copy_file std_data/mysql5613mysql/procs_priv.frm $MYSQLD_DATADIR/test/procs_priv.frm +--copy_file std_data/mysql5613mysql/procs_priv.MYD $MYSQLD_DATADIR/test/procs_priv.MYD +--copy_file std_data/mysql5613mysql/procs_priv.MYI $MYSQLD_DATADIR/test/procs_priv.MYI +SHOW CREATE TABLE procs_priv; +SELECT * FROM procs_priv LIMIT 0; +DROP TABLE procs_priv; + +--copy_file std_data/mysql5613mysql/proxies_priv.frm $MYSQLD_DATADIR/test/proxies_priv.frm +--copy_file std_data/mysql5613mysql/proxies_priv.MYD $MYSQLD_DATADIR/test/proxies_priv.MYD +--copy_file std_data/mysql5613mysql/proxies_priv.MYI $MYSQLD_DATADIR/test/proxies_priv.MYI +SHOW CREATE TABLE proxies_priv; +SELECT * FROM proxies_priv LIMIT 0; +DROP TABLE proxies_priv; + +--copy_file std_data/mysql5613mysql/servers.frm $MYSQLD_DATADIR/test/servers.frm +--copy_file std_data/mysql5613mysql/servers.MYD $MYSQLD_DATADIR/test/servers.MYD +--copy_file std_data/mysql5613mysql/servers.MYI $MYSQLD_DATADIR/test/servers.MYI +SHOW CREATE TABLE servers; +SELECT * FROM servers LIMIT 0; +DROP TABLE servers; + +--copy_file std_data/mysql5613mysql/tables_priv.frm $MYSQLD_DATADIR/test/tables_priv.frm +--copy_file std_data/mysql5613mysql/tables_priv.MYD $MYSQLD_DATADIR/test/tables_priv.MYD +--copy_file std_data/mysql5613mysql/tables_priv.MYI $MYSQLD_DATADIR/test/tables_priv.MYI +SHOW CREATE TABLE tables_priv; +SELECT * FROM tables_priv LIMIT 0; +DROP TABLE tables_priv; + +--copy_file std_data/mysql5613mysql/time_zone_leap_second.frm $MYSQLD_DATADIR/test/time_zone_leap_second.frm +--copy_file std_data/mysql5613mysql/time_zone_leap_second.MYD $MYSQLD_DATADIR/test/time_zone_leap_second.MYD +--copy_file std_data/mysql5613mysql/time_zone_leap_second.MYI $MYSQLD_DATADIR/test/time_zone_leap_second.MYI +SHOW CREATE TABLE time_zone_leap_second; +SELECT * FROM time_zone_leap_second LIMIT 0; +DROP TABLE time_zone_leap_second; + +--copy_file std_data/mysql5613mysql/time_zone.frm $MYSQLD_DATADIR/test/time_zone.frm +--copy_file std_data/mysql5613mysql/time_zone.MYD $MYSQLD_DATADIR/test/time_zone.MYD +--copy_file std_data/mysql5613mysql/time_zone.MYI $MYSQLD_DATADIR/test/time_zone.MYI +SHOW CREATE TABLE time_zone; +SELECT * FROM time_zone LIMIT 0; +DROP TABLE time_zone; + +--copy_file std_data/mysql5613mysql/time_zone_name.frm $MYSQLD_DATADIR/test/time_zone_name.frm +--copy_file std_data/mysql5613mysql/time_zone_name.MYD $MYSQLD_DATADIR/test/time_zone_name.MYD +--copy_file std_data/mysql5613mysql/time_zone_name.MYI $MYSQLD_DATADIR/test/time_zone_name.MYI +SHOW CREATE TABLE time_zone_name; +SELECT * FROM time_zone_name LIMIT 0; +DROP TABLE time_zone_name; + +--copy_file std_data/mysql5613mysql/time_zone_transition.frm $MYSQLD_DATADIR/test/time_zone_transition.frm +--copy_file std_data/mysql5613mysql/time_zone_transition.MYD $MYSQLD_DATADIR/test/time_zone_transition.MYD +--copy_file std_data/mysql5613mysql/time_zone_transition.MYI $MYSQLD_DATADIR/test/time_zone_transition.MYI +SHOW CREATE TABLE time_zone_transition; +SELECT * FROM time_zone_transition LIMIT 0; +DROP TABLE time_zone_transition; + +--copy_file std_data/mysql5613mysql/time_zone_transition_type.frm $MYSQLD_DATADIR/test/time_zone_transition_type.frm +--copy_file std_data/mysql5613mysql/time_zone_transition_type.MYD $MYSQLD_DATADIR/test/time_zone_transition_type.MYD +--copy_file std_data/mysql5613mysql/time_zone_transition_type.MYI $MYSQLD_DATADIR/test/time_zone_transition_type.MYI +SHOW CREATE TABLE time_zone_transition_type; +SELECT * FROM time_zone_transition_type LIMIT 0; +DROP TABLE time_zone_transition_type; + +--copy_file std_data/mysql5613mysql/user.frm $MYSQLD_DATADIR/test/user.frm +--copy_file std_data/mysql5613mysql/user.MYD $MYSQLD_DATADIR/test/user.MYD +--copy_file std_data/mysql5613mysql/user.MYI $MYSQLD_DATADIR/test/user.MYI +SHOW CREATE TABLE user; +SELECT * FROM user LIMIT 0; +DROP TABLE user; diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 3d1dca2d9e5..0445abd8d99 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -355,12 +355,23 @@ int table2myisam(TABLE *table_arg, MI_KEYDEF **keydef_out, if (found->flags & BLOB_FLAG) recinfo_pos->type= FIELD_BLOB; - else if (found->type() == MYSQL_TYPE_TIMESTAMP) + else if (found->real_type() == MYSQL_TYPE_TIMESTAMP) + { + /* pre-MySQL-5.6.4 TIMESTAMP, or MariaDB-5.3+ TIMESTAMP */ recinfo_pos->type= FIELD_NORMAL; + } else if (found->type() == MYSQL_TYPE_VARCHAR) recinfo_pos->type= FIELD_VARCHAR; else if (!(options & HA_OPTION_PACK_RECORD)) recinfo_pos->type= FIELD_NORMAL; + else if (found->real_type() == MYSQL_TYPE_TIMESTAMP2) + { + /* + MySQL-5.6.4+ erroneously marks Field_timestampf as FIELD_SKIP_PRESPACE, + but only if HA_OPTION_PACK_RECORD is set. + */ + recinfo_pos->type= FIELD_SKIP_PRESPACE; + } else if (found->zero_pack()) recinfo_pos->type= FIELD_SKIP_ZERO; else