Skip to content

M
MariaDB
Commit 3d06f0f7 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not... 

MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation

fix the patch. add tests
parent c372388e
Hide whitespace changes
Inline Side-by-side
Showing with 546 additions and 146 deletions
client/mysql_upgrade.c
View file @ 3d06f0f7
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#endif #endif
static int phase = 0; static int phase = 0;
static int phases_total = 6; static const int phases_total = 7;
static char mysql_path[FN_REFLEN]; static char mysql_path[FN_REFLEN];
static char mysqlcheck_path[FN_REFLEN]; static char mysqlcheck_path[FN_REFLEN];
...@@ -69,6 +69,8 @@ static char **defaults_argv; ...@@ -69,6 +69,8 @@ static char **defaults_argv;
static my_bool not_used; /* Can't use GET_BOOL without a value pointer */ static my_bool not_used; /* Can't use GET_BOOL without a value pointer */
char upgrade_from_version[sizeof("10.20.456-MariaDB")+1];
static my_bool opt_write_binlog; static my_bool opt_write_binlog;
#define OPT_SILENT OPT_MAX_CLIENT_OPTION #define OPT_SILENT OPT_MAX_CLIENT_OPTION
...@@ -675,7 +677,6 @@ static int upgrade_already_done(void) ...@@ -675,7 +677,6 @@ static int upgrade_already_done(void)
{ {
FILE *in; FILE *in;
char upgrade_info_file[FN_REFLEN]= {0}; char upgrade_info_file[FN_REFLEN]= {0};
char buf[sizeof(MYSQL_SERVER_VERSION)+1];
if (get_upgrade_info_file_name(upgrade_info_file)) if (get_upgrade_info_file_name(upgrade_info_file))
return 0; /* Could not get filename => not sure */ return 0; /* Could not get filename => not sure */
...@@ -683,15 +684,15 @@ static int upgrade_already_done(void) ...@@ -683,15 +684,15 @@ static int upgrade_already_done(void)
if (!(in= my_fopen(upgrade_info_file, O_RDONLY, MYF(0)))) if (!(in= my_fopen(upgrade_info_file, O_RDONLY, MYF(0))))
return 0; /* Could not open file => not sure */ return 0; /* Could not open file => not sure */
bzero(buf, sizeof(buf)); bzero(upgrade_from_version, sizeof(upgrade_from_version));
if (!fgets(buf, sizeof(buf), in)) if (!fgets(upgrade_from_version, sizeof(upgrade_from_version), in))
{ {
/* Ignore, will be detected by strncmp() below */ /* Ignore, will be detected by strncmp() below */
} }
my_fclose(in, MYF(0)); my_fclose(in, MYF(0));
return (strncmp(buf, MYSQL_SERVER_VERSION, return (strncmp(upgrade_from_version, MYSQL_SERVER_VERSION,
sizeof(MYSQL_SERVER_VERSION)-1)==0); sizeof(MYSQL_SERVER_VERSION)-1)==0);
} }
...@@ -924,24 +925,48 @@ static void print_line(char* line) ...@@ -924,24 +925,48 @@ static void print_line(char* line)
fputc('\n', stderr); fputc('\n', stderr);
} }
static my_bool from_before_10_1()
{
my_bool ret= TRUE;
DYNAMIC_STRING ds_events_struct;
if (upgrade_from_version[0])
{
return upgrade_from_version[1] == '.' ||
strncmp(upgrade_from_version, "10.1.", 5) < 0;
}
if (init_dynamic_string(&ds_events_struct, NULL, 2048, 2048))
die("Out of memory");
if (run_query("show create table mysql.user", &ds_events_struct, FALSE) ||
strstr(ds_events_struct.str, "default_role") != NULL)
ret= FALSE;
else
verbose("Upgrading from a version before MariaDB-10.1");
dynstr_free(&ds_events_struct);
return ret;
}
/* /*
Check for entries with "Unknown storage engine" in I_S.TABLES, Check for entries with "Unknown storage engine" in I_S.TABLES,
try to load plugins for these tables if available (MDEV-11942) try to load plugins for these tables if available (MDEV-11942)
*/ */
static int run_mysqlcheck_engines(void) static int install_used_engines(void)
{ {
DYNAMIC_STRING ds_query; char buf[512];
DYNAMIC_STRING ds_result; DYNAMIC_STRING ds_result;
const char *query = "SELECT DISTINCT LOWER(engine) FROM information_schema.tables"
" WHERE table_comment LIKE 'Unknown storage engine%'";
/* Trying to identify existing tables with unknown storage engine if (opt_systables_only || !from_before_10_1())
Does not work with all engine types yet, and doesn't produce {
results for BLACKHOLE without the dummy "WHERE row_format IS NULL" verbose("Phase %d/%d: Installing used storage engines... Skipped", ++phase, phases_total);
condition yet. See MDEV-11943 */ return 0;
const char *query = "SELECT DISTINCT LOWER(REPLACE(REPLACE(table_comment, 'Unknown storage engine ', ''), '\\'', '')) AS engine FROM information_schema.tables WHERE row_format IS NULL AND table_comment LIKE 'Unknown storage engine%'"; }
verbose("Phase %d/%d: Installing used storage engines", ++phase, phases_total);
if (init_dynamic_string(&ds_query, "", 512, 512))
die("Out of memory");
if (init_dynamic_string(&ds_result, "", 512, 512)) if (init_dynamic_string(&ds_result, "", 512, 512))
die("Out of memory"); die("Out of memory");
...@@ -950,24 +975,28 @@ static int run_mysqlcheck_engines(void) ...@@ -950,24 +975,28 @@ static int run_mysqlcheck_engines(void)
run_query(query, &ds_result, TRUE); run_query(query, &ds_result, TRUE);
if (ds_result.length)
{ {
char *line= ds_result.str; char *line= ds_result.str, *next=get_line(line);
if (line && *line) { do
do {
{ if (next[-1] == '\n')
line[strlen(line)-1]='\0'; next[-1]=0;
verbose("installing missing plugin for '%s' storage engine", line);
dynstr_set(&ds_query, "INSTALL SONAME 'ha_"); verbose("installing plugin for '%s' storage engine", line);
dynstr_append(&ds_query, line); // we simply assume SONAME=ha_ENGINENAME
dynstr_append(&ds_query, "'");
if (run_query(ds_query.str, NULL, TRUE)) { // we simply assume soname=ha_enginename
fprintf(stderr, "... can't install plugin 'ha_%s'\n", line); strxnmov(buf, sizeof(buf)-1, "install soname 'ha_", line, "'", NULL);
}
} while ((line= get_line(line)) && *line);
} if (run_query(buf, NULL, TRUE))
fprintf(stderr, "... can't %s\n", buf);
line=next;
next=get_line(line);
} while (*line);
} }
dynstr_free(&ds_result);
return 0;
} }
...@@ -1176,8 +1205,8 @@ int main(int argc, char **argv) ...@@ -1176,8 +1205,8 @@ int main(int argc, char **argv)
/* /*
Run "mysqlcheck" and "mysql_fix_privilege_tables.sql" Run "mysqlcheck" and "mysql_fix_privilege_tables.sql"
*/ */
if (run_mysqlcheck_engines() || if (run_mysqlcheck_upgrade(TRUE) ||
run_mysqlcheck_upgrade(TRUE) || install_used_engines() ||
run_mysqlcheck_views() || run_mysqlcheck_views() ||
run_sql_fix_privilege_tables() || run_sql_fix_privilege_tables() ||
run_mysqlcheck_fixnames() || run_mysqlcheck_fixnames() ||
...@@ -1200,4 +1229,3 @@ int main(int argc, char **argv) ...@@ -1200,4 +1229,3 @@ int main(int argc, char **argv)
my_end(my_end_arg); my_end(my_end_arg);
exit(0); exit(0);
} }
mysql-test/r/ctype_upgrade.result
View file @ 3d06f0f7
...@@ -227,7 +227,7 @@ DROP TABLE mysql050614_xxx_croatian_ci; ...@@ -227,7 +227,7 @@ DROP TABLE mysql050614_xxx_croatian_ci;
# Checking mysql_upgrade # Checking mysql_upgrade
# #
# Running mysql_upgrade # Running mysql_upgrade
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -258,10 +258,11 @@ mysql.time_zone_name OK ...@@ -258,10 +258,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -280,11 +281,11 @@ test.maria050313_ucs2_croatian_ci_def OK ...@@ -280,11 +281,11 @@ test.maria050313_ucs2_croatian_ci_def OK
test.maria050313_utf8_croatian_ci OK test.maria050313_utf8_croatian_ci OK
test.maria050533_xxx_croatian_ci OK test.maria050533_xxx_croatian_ci OK
test.maria100004_xxx_croatian_ci OK test.maria100004_xxx_croatian_ci OK
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
# Running mysql_upgrade for the second time # Running mysql_upgrade for the second time
# This should report OK for all tables # This should report OK for all tables
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -315,10 +316,11 @@ mysql.time_zone_name OK ...@@ -315,10 +316,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -331,7 +333,7 @@ test.maria050313_utf8_croatian_ci OK ...@@ -331,7 +333,7 @@ test.maria050313_utf8_croatian_ci OK
test.maria050533_xxx_croatian_ci OK test.maria050533_xxx_croatian_ci OK
test.maria100004_xxx_croatian_ci OK test.maria100004_xxx_croatian_ci OK
test.mysql050614_xxx_croatian_ci OK test.mysql050614_xxx_croatian_ci OK
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
SHOW CREATE TABLE maria050313_ucs2_croatian_ci_def; SHOW CREATE TABLE maria050313_ucs2_croatian_ci_def;
Table Create Table Table Create Table
......
mysql-test/r/log_tables_upgrade.result
View file @ 3d06f0f7
...@@ -11,7 +11,7 @@ Table Op Msg_type Msg_text ...@@ -11,7 +11,7 @@ Table Op Msg_type Msg_text
test.bug49823 repair status OK test.bug49823 repair status OK
RENAME TABLE general_log TO renamed_general_log; RENAME TABLE general_log TO renamed_general_log;
RENAME TABLE test.bug49823 TO general_log; RENAME TABLE test.bug49823 TO general_log;
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -43,10 +43,11 @@ mysql.time_zone_name OK ...@@ -43,10 +43,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -54,7 +55,7 @@ mtr.global_suppressions OK ...@@ -54,7 +55,7 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
DROP TABLE general_log; DROP TABLE general_log;
RENAME TABLE renamed_general_log TO general_log; RENAME TABLE renamed_general_log TO general_log;
......
mysql-test/r/mysql_upgrade-6984.result
View file @ 3d06f0f7
update mysql.user set password=password("foo") where user='root'; update mysql.user set password=password("foo") where user='root';
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -42,10 +42,11 @@ error : Corrupt ...@@ -42,10 +42,11 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -53,7 +54,7 @@ mtr.global_suppressions OK ...@@ -53,7 +54,7 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
update mysql.user set password='' where user='root'; update mysql.user set password='' where user='root';
flush privileges; flush privileges;
......
mysql-test/r/mysql_upgrade.result
View file @ 3d06f0f7
set sql_mode=""; set sql_mode="";
Run mysql_upgrade once Run mysql_upgrade once
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -31,10 +31,11 @@ mysql.time_zone_name OK ...@@ -31,10 +31,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -42,12 +43,12 @@ mtr.global_suppressions OK ...@@ -42,12 +43,12 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
Run it again - should say already completed Run it again - should say already completed
This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
Force should run it regardless of whether it has been run before Force should run it regardless of whether it has been run before
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -78,10 +79,11 @@ mysql.time_zone_name OK ...@@ -78,10 +79,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -89,12 +91,12 @@ mtr.global_suppressions OK ...@@ -89,12 +91,12 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila'; CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
GRANT ALL ON *.* TO mysqltest1@'%'; GRANT ALL ON *.* TO mysqltest1@'%';
Run mysql_upgrade with password protected account Run mysql_upgrade with password protected account
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -125,10 +127,11 @@ mysql.time_zone_name OK ...@@ -125,10 +127,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -136,7 +139,7 @@ mtr.global_suppressions OK ...@@ -136,7 +139,7 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
DROP USER mysqltest1@'%'; DROP USER mysqltest1@'%';
Version check failed. Got the following error when calling the 'mysql' command line client Version check failed. Got the following error when calling the 'mysql' command line client
...@@ -146,7 +149,7 @@ Run mysql_upgrade with a non existing server socket ...@@ -146,7 +149,7 @@ Run mysql_upgrade with a non existing server socket
mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
FATAL ERROR: Upgrade failed FATAL ERROR: Upgrade failed
set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -177,10 +180,11 @@ mysql.time_zone_name OK ...@@ -177,10 +180,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -188,7 +192,7 @@ mtr.global_suppressions OK ...@@ -188,7 +192,7 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
set GLOBAL sql_mode=default; set GLOBAL sql_mode=default;
# #
...@@ -199,7 +203,7 @@ CREATE PROCEDURE testproc() BEGIN END; ...@@ -199,7 +203,7 @@ CREATE PROCEDURE testproc() BEGIN END;
UPDATE mysql.proc SET character_set_client = NULL WHERE name LIKE 'testproc'; UPDATE mysql.proc SET character_set_client = NULL WHERE name LIKE 'testproc';
UPDATE mysql.proc SET collation_connection = NULL WHERE name LIKE 'testproc'; UPDATE mysql.proc SET collation_connection = NULL WHERE name LIKE 'testproc';
UPDATE mysql.proc SET db_collation = NULL WHERE name LIKE 'testproc'; UPDATE mysql.proc SET db_collation = NULL WHERE name LIKE 'testproc';
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -230,10 +234,11 @@ mysql.time_zone_name OK ...@@ -230,10 +234,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -241,7 +246,7 @@ mtr.global_suppressions OK ...@@ -241,7 +246,7 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
CALL testproc(); CALL testproc();
DROP PROCEDURE testproc; DROP PROCEDURE testproc;
...@@ -255,7 +260,7 @@ WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been ...@@ -255,7 +260,7 @@ WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been
GRANT USAGE ON *.* TO 'user3'@'%'; GRANT USAGE ON *.* TO 'user3'@'%';
GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%'; GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%';
Run mysql_upgrade with all privileges on a user Run mysql_upgrade with all privileges on a user
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -286,10 +291,11 @@ mysql.time_zone_name OK ...@@ -286,10 +291,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -297,7 +303,7 @@ mtr.global_suppressions OK ...@@ -297,7 +303,7 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
SHOW GRANTS FOR 'user3'@'%'; SHOW GRANTS FOR 'user3'@'%';
Grants for user3@% Grants for user3@%
...@@ -306,7 +312,7 @@ GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%' ...@@ -306,7 +312,7 @@ GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%'
DROP USER 'user3'@'%'; DROP USER 'user3'@'%';
End of 5.1 tests End of 5.1 tests
The --upgrade-system-tables option was used, user tables won't be touched. The --upgrade-system-tables option was used, user tables won't be touched.
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -337,11 +343,12 @@ mysql.time_zone_name OK ...@@ -337,11 +343,12 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views... Skipped
Phase 4/6: Fixing table and database names ... Skipped Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables... Skipped Phase 5/7: Fixing table and database names ... Skipped
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 6/7: Checking and upgrading tables... Skipped
Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
# #
# Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION # Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION
...@@ -349,7 +356,7 @@ OK ...@@ -349,7 +356,7 @@ OK
# #
# Droping the previously created mysql_upgrade_info file.. # Droping the previously created mysql_upgrade_info file..
# Running mysql_upgrade with --skip-write-binlog.. # Running mysql_upgrade with --skip-write-binlog..
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -380,10 +387,11 @@ mysql.time_zone_name OK ...@@ -380,10 +387,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -391,7 +399,7 @@ mtr.global_suppressions OK ...@@ -391,7 +399,7 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
# #
# Bug #21489398: MYSQL_UPGRADE: FATAL ERROR: UPGRADE FAILED - IMPROVE ERROR # Bug #21489398: MYSQL_UPGRADE: FATAL ERROR: UPGRADE FAILED - IMPROVE ERROR
...@@ -412,7 +420,7 @@ GRANT INSERT ON mysql.user TO very_long_user_name_number_2; ...@@ -412,7 +420,7 @@ GRANT INSERT ON mysql.user TO very_long_user_name_number_2;
GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_1; GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_1;
GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_2; GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_2;
CREATE PROCEDURE test.pr() BEGIN END; CREATE PROCEDURE test.pr() BEGIN END;
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -443,10 +451,11 @@ mysql.time_zone_name OK ...@@ -443,10 +451,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -454,7 +463,7 @@ mtr.global_suppressions OK ...@@ -454,7 +463,7 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
SELECT definer FROM mysql.proc WHERE db = 'test' AND name = 'pr'; SELECT definer FROM mysql.proc WHERE db = 'test' AND name = 'pr';
definer definer
...@@ -470,7 +479,7 @@ set sql_mode=default; ...@@ -470,7 +479,7 @@ set sql_mode=default;
create table test.t1(a int) engine=MyISAM; create table test.t1(a int) engine=MyISAM;
# Trying to enforce InnoDB for all tables # Trying to enforce InnoDB for all tables
SET GLOBAL enforce_storage_engine=InnoDB; SET GLOBAL enforce_storage_engine=InnoDB;
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -501,10 +510,11 @@ mysql.time_zone_name OK ...@@ -501,10 +510,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -513,7 +523,7 @@ mtr.test_suppressions OK ...@@ -513,7 +523,7 @@ mtr.test_suppressions OK
performance_schema performance_schema
test test
test.t1 OK test.t1 OK
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
# Should return 2 # Should return 2
SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB"; SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB";
......
mysql-test/r/mysql_upgrade_no_innodb.result
View file @ 3d06f0f7
The --upgrade-system-tables option was used, user tables won't be touched. The --upgrade-system-tables option was used, user tables won't be touched.
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -42,9 +42,10 @@ error : Corrupt ...@@ -42,9 +42,10 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
Phase 2/6: Fixing views... Skipped Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views... Skipped
Phase 4/6: Fixing table and database names ... Skipped Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables... Skipped Phase 5/7: Fixing table and database names ... Skipped
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 6/7: Checking and upgrading tables... Skipped
Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
mysql-test/r/mysql_upgrade_noengine.result 0 → 100644
View file @ 3d06f0f7
install soname 'ha_blackhole';
install soname 'ha_archive';
create table t1 (a int) engine=blackhole;
create table t2 (a int) engine=archive;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
table_catalog def
table_schema test
table_name t1
table_type BASE TABLE
engine BLACKHOLE
row_format Fixed
table_rows 0
data_length 0
table_comment
table_catalog def
table_schema test
table_name t2
table_type BASE TABLE
engine ARCHIVE
row_format Compressed
table_rows 0
data_length 521
table_comment
flush tables;
uninstall plugin blackhole;
uninstall plugin archive;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
table_catalog def
table_schema test
table_name t1
table_type BASE TABLE
engine BLACKHOLE
row_format NULL
table_rows NULL
data_length NULL
table_comment Unknown storage engine 'BLACKHOLE'
table_catalog def
table_schema test
table_name t2
table_type BASE TABLE
engine ARCHIVE
row_format NULL
table_rows NULL
data_length NULL
table_comment Unknown storage engine 'ARCHIVE'
Warnings:
Level Warning
Code 1286
Message Unknown storage engine 'BLACKHOLE'
Level Warning
Code 1286
Message Unknown storage engine 'ARCHIVE'
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.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
mysql.help_topic OK
mysql.host OK
mysql.index_stats OK
mysql.innodb_index_stats OK
mysql.innodb_table_stats OK
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.user OK
Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases
information_schema
mtr
mtr.global_suppressions OK
mtr.test_suppressions OK
performance_schema
test
test.t1
Error : Unknown storage engine 'BLACKHOLE'
error : Corrupt
test.t2
Error : Unknown storage engine 'ARCHIVE'
error : Corrupt
Repairing tables
test.t1
Error : Unknown storage engine 'BLACKHOLE'
error : Corrupt
test.t2
Error : Unknown storage engine 'ARCHIVE'
error : Corrupt
Phase 7/7: Running 'FLUSH PRIVILEGES'
OK
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
table_catalog def
table_schema test
table_name t1
table_type BASE TABLE
engine BLACKHOLE
row_format NULL
table_rows NULL
data_length NULL
table_comment Unknown storage engine 'BLACKHOLE'
table_catalog def
table_schema test
table_name t2
table_type BASE TABLE
engine ARCHIVE
row_format NULL
table_rows NULL
data_length NULL
table_comment Unknown storage engine 'ARCHIVE'
Warnings:
Level Warning
Code 1286
Message Unknown storage engine 'BLACKHOLE'
Level Warning
Code 1286
Message Unknown storage engine 'ARCHIVE'
alter table mysql.user drop column default_role, drop column max_statement_time;
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.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
mysql.help_topic OK
mysql.host OK
mysql.index_stats OK
mysql.innodb_index_stats OK
mysql.innodb_table_stats OK
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.user OK
Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases
information_schema
mtr
mtr.global_suppressions OK
mtr.test_suppressions OK
performance_schema
test
test.t1
Error : Unknown storage engine 'BLACKHOLE'
error : Corrupt
test.t2
Error : Unknown storage engine 'ARCHIVE'
error : Corrupt
Repairing tables
test.t1
Error : Unknown storage engine 'BLACKHOLE'
error : Corrupt
test.t2
Error : Unknown storage engine 'ARCHIVE'
error : Corrupt
Phase 7/7: Running 'FLUSH PRIVILEGES'
OK
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
table_catalog def
table_schema test
table_name t1
table_type BASE TABLE
engine BLACKHOLE
row_format NULL
table_rows NULL
data_length NULL
table_comment Unknown storage engine 'BLACKHOLE'
table_catalog def
table_schema test
table_name t2
table_type BASE TABLE
engine ARCHIVE
row_format NULL
table_rows NULL
data_length NULL
table_comment Unknown storage engine 'ARCHIVE'
Warnings:
Level Warning
Code 1286
Message Unknown storage engine 'BLACKHOLE'
Level Warning
Code 1286
Message Unknown storage engine 'ARCHIVE'
alter table mysql.user drop column default_role, drop column max_statement_time;
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.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
mysql.help_topic OK
mysql.host OK
mysql.index_stats OK
mysql.innodb_index_stats OK
mysql.innodb_table_stats OK
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.user OK
Upgrading from a version before MariaDB-10.1
Phase 2/7: Installing used storage engines
Checking for tables with unknown storage engine
installing plugin for 'blackhole' storage engine
installing plugin for 'archive' storage engine
Phase 3/7: Fixing views
Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases
information_schema
mtr
mtr.global_suppressions OK
mtr.test_suppressions OK
performance_schema
test
test.t1 OK
test.t2 OK
Phase 7/7: Running 'FLUSH PRIVILEGES'
OK
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
table_catalog def
table_schema test
table_name t1
table_type BASE TABLE
engine BLACKHOLE
row_format Fixed
table_rows 0
data_length 0
table_comment
table_catalog def
table_schema test
table_name t2
table_type BASE TABLE
engine ARCHIVE
row_format Compressed
table_rows 0
data_length 521
table_comment
drop table t1, t2;
uninstall plugin blackhole;
uninstall plugin archive;
mysql-test/r/mysql_upgrade_ssl.result
View file @ 3d06f0f7
# #
# Bug#55672 mysql_upgrade dies with internal error # Bug#55672 mysql_upgrade dies with internal error
# #
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -32,10 +32,11 @@ mysql.time_zone_name OK ...@@ -32,10 +32,11 @@ mysql.time_zone_name OK
mysql.time_zone_transition OK mysql.time_zone_transition OK
mysql.time_zone_transition_type OK mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 3/7: Fixing views
Phase 4/6: Fixing table and database names Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 5/6: Checking and upgrading tables Phase 5/7: Fixing table and database names
Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -43,5 +44,5 @@ mtr.global_suppressions OK ...@@ -43,5 +44,5 @@ mtr.global_suppressions OK
mtr.test_suppressions OK mtr.test_suppressions OK
performance_schema performance_schema
test test
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
mysql-test/r/mysql_upgrade_view.result
View file @ 3d06f0f7
...@@ -63,7 +63,7 @@ test.v2 check error Upgrade required. Please do "REPAIR VIEW `v2`" or dump/reloa ...@@ -63,7 +63,7 @@ test.v2 check error Upgrade required. Please do "REPAIR VIEW `v2`" or dump/reloa
check view v3 for upgrade; check view v3 for upgrade;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.v3 check error Upgrade required. Please do "REPAIR VIEW `v3`" or dump/reload to fix it! test.v3 check error Upgrade required. Please do "REPAIR VIEW `v3`" or dump/reload to fix it!
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -106,14 +106,15 @@ error : Corrupt ...@@ -106,14 +106,15 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
Phase 2/6: Fixing views Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views
test.v1 OK test.v1 OK
test.v1badcheck OK test.v1badcheck OK
test.v2 OK test.v2 OK
test.v3 OK test.v3 OK
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 4/6: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 5/6: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -123,7 +124,7 @@ performance_schema ...@@ -123,7 +124,7 @@ performance_schema
test test
test.kv OK test.kv OK
test.t1 OK test.t1 OK
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
show create view v1; show create view v1;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
...@@ -205,7 +206,7 @@ show create view v4; ...@@ -205,7 +206,7 @@ show create view v4;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v4 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `t1`.`a` AS `a` from `t1` latin1 latin1_swedish_ci v4 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `t1`.`a` AS `a` from `t1` latin1 latin1_swedish_ci
MySQL upgrade detected MySQL upgrade detected
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -249,14 +250,15 @@ error : Corrupt ...@@ -249,14 +250,15 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
Phase 2/6: Fixing views from mysql Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views from mysql
test.v1 OK test.v1 OK
test.v2 OK test.v2 OK
test.v3 OK test.v3 OK
test.v4 OK test.v4 OK
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 4/6: Fixing table and database names Phase 5/7: Fixing table and database names
Phase 5/6: Checking and upgrading tables Phase 6/7: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -266,7 +268,7 @@ performance_schema ...@@ -266,7 +268,7 @@ performance_schema
test test
test.kv OK test.kv OK
test.t1 OK test.t1 OK
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
flush tables; flush tables;
show create view v1; show create view v1;
...@@ -323,7 +325,7 @@ rename table mysql.event to mysql.ev_bk; ...@@ -323,7 +325,7 @@ rename table mysql.event to mysql.ev_bk;
flush tables; flush tables;
The --upgrade-system-tables option was used, user tables won't be touched. The --upgrade-system-tables option was used, user tables won't be touched.
MySQL upgrade detected MySQL upgrade detected
Phase 1/6: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
mysql mysql
mysql.column_stats OK mysql.column_stats OK
...@@ -367,14 +369,15 @@ error : Corrupt ...@@ -367,14 +369,15 @@ error : Corrupt
mysql.innodb_table_stats mysql.innodb_table_stats
Error : Unknown storage engine 'InnoDB' Error : Unknown storage engine 'InnoDB'
error : Corrupt error : Corrupt
Phase 2/6: Fixing views from mysql Phase 2/7: Installing used storage engines... Skipped
Phase 3/7: Fixing views from mysql
test.v1 OK test.v1 OK
test.v2 OK test.v2 OK
test.v3 OK test.v3 OK
Phase 3/6: Running 'mysql_fix_privilege_tables' Phase 4/7: Running 'mysql_fix_privilege_tables'
Phase 4/6: Fixing table and database names ... Skipped Phase 5/7: Fixing table and database names ... Skipped
Phase 5/6: Checking and upgrading tables... Skipped Phase 6/7: Checking and upgrading tables... Skipped
Phase 6/6: Running 'FLUSH PRIVILEGES' Phase 7/7: Running 'FLUSH PRIVILEGES'
OK OK
drop table mysql.event; drop table mysql.event;
rename table mysql.ev_bk to mysql.event; rename table mysql.ev_bk to mysql.event;
......
mysql-test/t/mysql_upgrade_noengine.test 0 → 100644
View file @ 3d06f0f7
#
# MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation
#
source include/have_innodb.inc;
source include/not_embedded.inc;
if (!$HA_BLACKHOLE_SO) {
skip Need blackhole plugin;
}
if (!$HA_ARCHIVE_SO) {
skip Need Archive plugin;
}
let $datadir= `select @@datadir`;
install soname 'ha_blackhole';
install soname 'ha_archive';
vertical_results;
create table t1 (a int) engine=blackhole;
create table t2 (a int) engine=archive;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
flush tables;
uninstall plugin blackhole;
uninstall plugin archive;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
# upgrade from 10.1 - engines aren't enabled
exec $MYSQL_UPGRADE 2>&1;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
# pretend it's an upgrade from 10.0
alter table mysql.user drop column default_role, drop column max_statement_time;
# but mysql_upgrade_info tells otherwise
remove_file $datadir/mysql_upgrade_info;
write_file $datadir/mysql_upgrade_info;
10.1.10-MariaDB
EOF
# still upgrade from 10.1
exec $MYSQL_UPGRADE 2>&1;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
alter table mysql.user drop column default_role, drop column max_statement_time;
remove_file $datadir/mysql_upgrade_info;
# upgrade from 10.0 - engines are enabled
exec $MYSQL_UPGRADE 2>&1;
select table_catalog, table_schema, table_name, table_type, engine, row_format, table_rows, data_length, table_comment from information_schema.tables where table_schema='test';
drop table t1, t2;
uninstall plugin blackhole;
uninstall plugin archive;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7