database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-30498 Rename mysql_upgrade state file to mariadb_upgrade

Browse Source 
Renames the upgrade state file, and ensures the old
file is properly removed when `mariadb-upgrade` tool is executed.

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer
Amazon Web Services, Inc.
This commit is contained in:
Christian Gonzalez
2023-01-31 21:13:41 +00:00
committed by Andrew Hutchings
parent d6e3d89c80
commit 3622644836
34 changed files with 120 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/mysql_upgrade.c
View File

@ -700,7 +700,7 @@ static int get_upgrade_info_file_name(char* name)
dynstr_free(&ds_datadir); dynstr_free(&ds_datadir);
fn_format(name, "mysql_upgrade_info", name, "", MYF(0)); fn_format(name, "mariadb_upgrade_info", name, "", MYF(0));
DBUG_PRINT("exit", ("name: %s", name)); DBUG_PRINT("exit", ("name: %s", name));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
@ -709,7 +709,7 @@ static char upgrade_info_file[FN_REFLEN]= {0};
/* /*
Open or create mysql_upgrade_info file in servers data dir. Open or create mariadb_upgrade_info file in servers data dir.
Take a lock to ensure there cannot be any other mysql_upgrades Take a lock to ensure there cannot be any other mysql_upgrades
running concurrently running concurrently
@ -724,10 +724,19 @@ const char *create_error_message=
static void open_mysql_upgrade_file() static void open_mysql_upgrade_file()
{ {
char errbuff[80]; char errbuff[80];
char old_upgrade_info_file[FN_REFLEN]= {0};
size_t path_len;
if (get_upgrade_info_file_name(upgrade_info_file)) if (get_upgrade_info_file_name(upgrade_info_file))
{ {
die("Upgrade failed"); die("Upgrade failed");
} }
// Delete old mysql_upgrade_info file
dirname_part(old_upgrade_info_file, upgrade_info_file, &path_len);
fn_format(old_upgrade_info_file, "mysql_upgrade_info", old_upgrade_info_file, "", MYF(0));
my_delete(old_upgrade_info_file, MYF(MY_IGNORE_ENOENT));
if ((info_file= my_create(upgrade_info_file, 0, if ((info_file= my_create(upgrade_info_file, 0,
O_RDWR | O_NOFOLLOW, O_RDWR | O_NOFOLLOW,
MYF(0))) < 0) MYF(0))) < 0)
@ -784,7 +793,7 @@ static int faulty_server_versions(const char *version)
} }
/* /*
Read the content of mysql_upgrade_info file and Read the content of mariadb_upgrade_info file and
compare the version number form file against compare the version number form file against
version number which mysql_upgrade was compiled for version number which mysql_upgrade was compiled for
@ -861,16 +870,16 @@ static int upgrade_already_done(int silent)
if (!silent) if (!silent)
{ {
verbose("This installation of MariaDB is already upgraded to %s.\n" verbose("This installation of MariaDB is already upgraded to %s.\n"
"There is no need to run mysql_upgrade again for %s.", "There is no need to run mariadb-upgrade again for %s.",
upgrade_from_version, version); upgrade_from_version, version);
if (!opt_check_upgrade) if (!opt_check_upgrade)
verbose("You can use --force if you still want to run mysql_upgrade", verbose("You can use --force if you still want to run mariadb-upgrade",
upgrade_from_version, version); upgrade_from_version, version);
} }
return 0; return 0;
} }
static void finish_mysql_upgrade_info_file(void) static void finish_mariadb_upgrade_info_file(void)
{ {
if (info_file < 0) if (info_file < 0)
return; return;
@ -1463,7 +1472,7 @@ int main(int argc, char **argv)
printf("The --upgrade-system-tables option was used, user tables won't be touched.\n"); printf("The --upgrade-system-tables option was used, user tables won't be touched.\n");
/* /*
Read the mysql_upgrade_info file to check if mysql_upgrade Read the mariadb_upgrade_info file to check if mysql_upgrade
already has been run for this installation of MariaDB already has been run for this installation of MariaDB
*/ */
if (!opt_force && !upgrade_already_done(0)) if (!opt_force && !upgrade_already_done(0))
@ -1495,7 +1504,7 @@ int main(int argc, char **argv)
verbose("OK"); verbose("OK");
/* Finish writing indicating upgrade has been performed */ /* Finish writing indicating upgrade has been performed */
finish_mysql_upgrade_info_file(); finish_mariadb_upgrade_info_file();
DBUG_ASSERT(phase == phases_total); DBUG_ASSERT(phase == phases_total);

2
debian/additions/mariadb.conf.d/50-mysql-clients.cnf vendored
View File

@ -5,7 +5,7 @@
[mysql] [mysql]
[mysql_upgrade] [mariadb-upgrade]
[mysqladmin] [mysqladmin]

2
debian/mariadb-server.README.Debian vendored
View File

@ -102,7 +102,7 @@ The privilege tables are automatically updated so all there is left is read
the release notes on https://mariadb.com/kb/en/release-notes/ to see if any the release notes on https://mariadb.com/kb/en/release-notes/ to see if any
changes affect custom apps. changes affect custom apps.
There should not be any need to run 'mysql_upgrade' manually, as the upgrade There should not be any need to run 'mariadb-upgrade' manually, as the upgrade
scripts do that automatically. scripts do that automatically.

2
mysql-test/include/check-testcase.test
View File

@ -97,7 +97,7 @@ select count(*) from mysql.proc;
call mtr.check_testcase(); call mtr.check_testcase();
let $datadir=`select @@datadir`; let $datadir=`select @@datadir`;
list_files $datadir mysql_upgrade_info; list_files $datadir mariadb_upgrade_info;
list_files $datadir/test #sql*; list_files $datadir/test #sql*;
list_files $datadir/mysql #sql*; list_files $datadir/mysql #sql*;

2
mysql-test/include/load_dump_and_upgrade.inc
View File

@ -46,4 +46,4 @@ SELECT COUNT(*) > 0 AS `mysql.user has data` FROM mysql.user;
# It will fail if the file doesn't exist, which is good, # It will fail if the file doesn't exist, which is good,
# which is an extra check that it was written # which is an extra check that it was written
--remove_file $ddir/mysql_upgrade_info --remove_file $ddir/mariadb_upgrade_info

2
mysql-test/main/ctype_upgrade.test
View File

@ -197,7 +197,7 @@ SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria100004_xxx_croatian_ci GROUP
SHOW CREATE TABLE mysql050614_xxx_croatian_ci; SHOW CREATE TABLE mysql050614_xxx_croatian_ci;
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a; SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a;
remove_file $MYSQLD_DATADIR/mysql_upgrade_info; remove_file $MYSQLD_DATADIR/mariadb_upgrade_info;
DROP TABLE maria050313_ucs2_croatian_ci_def; DROP TABLE maria050313_ucs2_croatian_ci_def;
DROP TABLE maria050313_utf8_croatian_ci; DROP TABLE maria050313_utf8_croatian_ci;
DROP TABLE maria050533_xxx_croatian_ci; DROP TABLE maria050533_xxx_croatian_ci;

2
mysql-test/main/log_tables_upgrade.test
View File

@ -24,5 +24,5 @@ RENAME TABLE test.bug49823 TO general_log;
DROP TABLE general_log; DROP TABLE general_log;
RENAME TABLE renamed_general_log TO general_log; RENAME TABLE renamed_general_log TO general_log;
SET GLOBAL general_log = @saved_general_log; SET GLOBAL general_log = @saved_general_log;
remove_file $MYSQLD_DATADIR/mysql_upgrade_info; remove_file $MYSQLD_DATADIR/mariadb_upgrade_info;
USE test; USE test;

2
mysql-test/main/lowercase_fs_off.test
View File

@ -128,7 +128,7 @@ show triggers like '%T1%';
drop table t1; drop table t1;
let $datadir= `select @@datadir`; let $datadir= `select @@datadir`;
remove_file $datadir/mysql_upgrade_info; remove_file $datadir/mariadb_upgrade_info;
set GLOBAL sql_mode=default; set GLOBAL sql_mode=default;

2
mysql-test/main/mysql_json_mysql_upgrade.test
View File

@ -26,7 +26,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
show create table mysql_json_test; show create table mysql_json_test;
--exec $MYSQL_UPGRADE --force 2>&1 --exec $MYSQL_UPGRADE --force 2>&1
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
show create table mysql_json_test; show create table mysql_json_test;
select * from mysql_json_test; select * from mysql_json_test;

2
mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.test
View File

@ -26,7 +26,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
show create table mysql_json_test; show create table mysql_json_test;
--exec $MYSQL_UPGRADE --force 2>&1 --exec $MYSQL_UPGRADE --force 2>&1
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
show create table mysql_json_test; show create table mysql_json_test;
show create table mysql_json_test_big; show create table mysql_json_test_big;

4
mysql-test/main/mysql_upgrade-20228.test
View File

@ -40,8 +40,8 @@ WHERE TABLE_SCHEMA='mysql' AND TABLE_NAME='user';
--echo # Running mysql_upgrade --echo # Running mysql_upgrade
--exec $MYSQL_UPGRADE --default-character-set=utf8mb4 --force 2>&1 --exec $MYSQL_UPGRADE --default-character-set=utf8mb4 --force 2>&1
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # --echo #
--echo # Restoring character_set_client and collation_connection back --echo # Restoring character_set_client and collation_connection back

4
mysql-test/main/mysql_upgrade-6984.test
View File

@ -14,7 +14,7 @@
update mysql.global_priv set priv=json_set(priv, '$.plugin', 'mysql_native_password', '$.authentication_string', password('foo')) where user='root'; update mysql.global_priv set priv=json_set(priv, '$.plugin', 'mysql_native_password', '$.authentication_string', password('foo')) where user='root';
--replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/ --replace_regex /[^ ]*mariadb_upgrade_info/...mariadb_upgrade_info/
--exec $MYSQL_UPGRADE --exec $MYSQL_UPGRADE
connect(con1,localhost,root,foo,,,); connect(con1,localhost,root,foo,,,);
@ -25,7 +25,7 @@ flush privileges;
set global event_scheduler=OFF; set global event_scheduler=OFF;
let MYSQLD_DATADIR= `select @@datadir`; let MYSQLD_DATADIR= `select @@datadir`;
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
# --skip-grant-tables state may changed during the test. Need to restart the server # --skip-grant-tables state may changed during the test. Need to restart the server
# to restore the --skip-grant-tables state. Otherwise MTR's internal check will fail # to restore the --skip-grant-tables state. Otherwise MTR's internal check will fail

20
mysql-test/main/mysql_upgrade.result
View File

@ -150,8 +150,8 @@ test
Phase 7/7: 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 MariaDB is already upgraded to VERSION.There is no need to run mysql_upgrade again for VERSION. This installation of MariaDB is already upgraded to VERSION.There is no need to run mariadb-upgrade again for VERSION.
You can use --force if you still want to run mysql_upgrade You can use --force if you still want to run mariadb-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/7: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
@ -975,7 +975,7 @@ OK
# Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION # Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION
# SKIP-WRITE-BINLOG # SKIP-WRITE-BINLOG
# #
# Droping the previously created mysql_upgrade_info file.. # Droping the previously created mariadb_upgrade_info file..
# Running mysql_upgrade with --skip-write-binlog.. # Running mysql_upgrade with --skip-write-binlog..
Phase 1/7: Checking and upgrading mysql database Phase 1/7: Checking and upgrading mysql database
Processing databases Processing databases
@ -1323,7 +1323,7 @@ length(table_name)
drop table extralongname_extralongname_extralongname_extralongname_ext; drop table extralongname_extralongname_extralongname_extralongname_ext;
# End of 10.0 tests # End of 10.0 tests
set sql_mode=default; set sql_mode=default;
# Droping the previously created mysql_upgrade_info file.. # Droping the previously created mariadb_upgrade_info file..
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;
@ -1896,24 +1896,24 @@ FLUSH PRIVILEGES;
# MDEV-27279: mariadb_upgrade add --check-if-upgrade-is-needed # MDEV-27279: mariadb_upgrade add --check-if-upgrade-is-needed
# #
This installation of MariaDB is already upgraded to MariaDB . This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mysql_upgrade again for MariaDB . There is no need to run mariadb-upgrade again for MariaDB .
Looking for 'mariadb' as: mariadb Looking for 'mariadb' as: mariadb
This installation of MariaDB is already upgraded to MariaDB . This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mysql_upgrade again for MariaDB . There is no need to run mariadb-upgrade again for MariaDB .
# #
# MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it # MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it
# #
Looking for 'mariadb' as: mariadb Looking for 'mariadb' as: mariadb
Empty or non existent ...mysql_upgrade_info. Assuming mysql_upgrade has to be run! Empty or non existent ...mariadb_upgrade_info. Assuming mysql_upgrade has to be run!
# #
# MDEV-27279: mariadb_upgrade check-if-upgrade with minor version change # MDEV-27279: mariadb_upgrade check-if-upgrade with minor version change
# #
Looking for 'mariadb' as: mariadb Looking for 'mariadb' as: mariadb
This installation of MariaDB is already upgraded to MariaDB . This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mysql_upgrade again for MariaDB . There is no need to run mariadb-upgrade again for MariaDB .
This installation of MariaDB is already upgraded to MariaDB . This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mysql_upgrade again for MariaDB . There is no need to run mariadb-upgrade again for MariaDB .
You can use --force if you still want to run mysql_upgrade You can use --force if you still want to run mariadb-upgrade
# #
# MDEV-27279: mariadb_upgrade check-if-upgrade with major version change # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
# #

65
mysql-test/main/mysql_upgrade.test
View File

@ -7,6 +7,19 @@
set sql_mode=""; set sql_mode="";
call mtr.add_suppression("Incorrect definition of table mysql.column_stats:.*"); call mtr.add_suppression("Incorrect definition of table mysql.column_stats:.*");
# It should create a file in the MySQL Servers datadir
let $MYSQLD_DATADIR= `select @@datadir`;
#
# MDEV-30498 Rename mysql_upgrade state file to mariadb_upgrade.
#
# Ensure that old $MYSQLD_DATADIR/mysql_upgrade_info file is deleted.
#
write_file $MYSQLD_DATADIR/mysql_upgrade_info;
EOF
# #
# Basic test that we can run mysql_upgrde and that it finds the # Basic test that we can run mysql_upgrde and that it finds the
# expected binaries it uses. # expected binaries it uses.
@ -14,22 +27,22 @@ call mtr.add_suppression("Incorrect definition of table mysql.column_stats:.*");
--echo Run mysql_upgrade once --echo Run mysql_upgrade once
--exec $MYSQL_UPGRADE --force 2>&1 --exec $MYSQL_UPGRADE --force 2>&1
# It should have created a file in the MySQL Servers datadir --error 1
let $MYSQLD_DATADIR= `select @@datadir`;
file_exists $MYSQLD_DATADIR/mysql_upgrade_info; file_exists $MYSQLD_DATADIR/mysql_upgrade_info;
file_exists $MYSQLD_DATADIR/mariadb_upgrade_info;
--echo Run it again - should say already completed --echo Run it again - should say already completed
--replace_regex /upgraded to [^\n].*/upgraded to VERSION./ /again for [^\n]*/again for VERSION./ --replace_regex /upgraded to [^\n].*/upgraded to VERSION./ /again for [^\n]*/again for VERSION./
--exec $MYSQL_UPGRADE 2>&1 --exec $MYSQL_UPGRADE 2>&1
# It should have created a file in the MySQL Servers datadir # It should have created a file in the MySQL Servers datadir
file_exists $MYSQLD_DATADIR/mysql_upgrade_info; file_exists $MYSQLD_DATADIR/mariadb_upgrade_info;
--echo Force should run it regardless of whether it has been run before --echo Force should run it regardless of whether it has been run before
--exec $MYSQL_UPGRADE --force 2>&1 --exec $MYSQL_UPGRADE --force 2>&1
# It should have created a file in the MySQL Servers datadir # It should have created a file in the MySQL Servers datadir
file_exists $MYSQLD_DATADIR/mysql_upgrade_info; file_exists $MYSQLD_DATADIR/mariadb_upgrade_info;
# #
@ -123,16 +136,16 @@ DROP USER 'user3'@'%';
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
--echo # Droping the previously created mysql_upgrade_info file.. --echo # Droping the previously created mariadb_upgrade_info file..
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # Running mysql_upgrade with --skip-write-binlog.. --echo # Running mysql_upgrade with --skip-write-binlog..
--replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/ --replace_regex /[^ ]*mariadb_upgrade_info/...mariadb_upgrade_info/
--exec $MYSQL_UPGRADE --skip-write-binlog --exec $MYSQL_UPGRADE --skip-write-binlog
# mysql_upgrade must have created mysql_upgrade_info file, # mysql_upgrade must have created mariadb_upgrade_info file,
# so the following command should never fail. # so the following command should never fail.
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # --echo #
--echo # Bug #21489398: MYSQL_UPGRADE: FATAL ERROR: UPGRADE FAILED - IMPROVE ERROR --echo # Bug #21489398: MYSQL_UPGRADE: FATAL ERROR: UPGRADE FAILED - IMPROVE ERROR
@ -201,8 +214,8 @@ set sql_mode=default;
# #
# Enforce storage engine option should not effect mysql_upgrade # Enforce storage engine option should not effect mysql_upgrade
# #
--echo # Droping the previously created mysql_upgrade_info file.. --echo # Droping the previously created mariadb_upgrade_info file..
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
create table test.t1(a int) engine=MyISAM; create table test.t1(a int) engine=MyISAM;
--echo # Trying to enforce InnoDB for all tables --echo # Trying to enforce InnoDB for all tables
@ -215,9 +228,9 @@ SET GLOBAL enforce_storage_engine=InnoDB;
SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB"; SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB";
SHOW CREATE TABLE test.t1; SHOW CREATE TABLE test.t1;
DROP TABLE test.t1; DROP TABLE test.t1;
# mysql_upgrade must have created mysql_upgrade_info file, # mysql_upgrade must have created mariadb_upgrade_info file,
# so the following command should never fail. # so the following command should never fail.
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
SET GLOBAL enforce_storage_engine=NULL; SET GLOBAL enforce_storage_engine=NULL;
--echo # End of 10.1 tests --echo # End of 10.1 tests
@ -300,11 +313,11 @@ FLUSH PRIVILEGES;
--echo # MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it --echo # MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it
--echo # --echo #
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--replace_regex /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/ --replace_regex /[^ ]*mariadb_upgrade_info/...mariadb_upgrade_info/
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --exec $MYSQL_UPGRADE --check-if-upgrade-is-needed
--replace_regex /'mariadb.* as:[^\n]*/'mariadb' as: mariadb/ /open .* Assuming/open XXX. Assuming/ /[^ ]*mysql_upgrade_info/...mysql_upgrade_info/ --replace_regex /'mariadb.* as:[^\n]*/'mariadb' as: mariadb/ /open .* Assuming/open XXX. Assuming/ /[^ ]*mariadb_upgrade_info/...mariadb_upgrade_info/
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose --exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
--echo # --echo #
@ -319,7 +332,7 @@ perl;
my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set"; my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set";
my $file= $ENV{'DATADIR'} or die "MYSQLD_DATADIR not set"; my $file= $ENV{'DATADIR'} or die "MYSQLD_DATADIR not set";
$ver =~ s/^(\d*)\.(\d*).(\d*)(.*)/$1.$2.0$4/; $ver =~ s/^(\d*)\.(\d*).(\d*)(.*)/$1.$2.0$4/;
open(FILE, ">$file/mysql_upgrade_info") or die "Failed to open $file"; open(FILE, ">$file/mariadb_upgrade_info") or die "Failed to open $file";
print FILE "$ver\n"; print FILE "$ver\n";
close(FILE); close(FILE);
EOF EOF
@ -331,7 +344,7 @@ EOF
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose --exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / --replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
--exec $MYSQL_UPGRADE --exec $MYSQL_UPGRADE
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # --echo #
--echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change --echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
@ -343,7 +356,7 @@ perl;
my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set"; my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set";
my $file= $ENV{'DATADIR'} or die "MYSQLD_DATADIR not set"; my $file= $ENV{'DATADIR'} or die "MYSQLD_DATADIR not set";
$ver =~ s/^(\d*)\.(\d*).(\d*)(.*)/10.11.2$4/; $ver =~ s/^(\d*)\.(\d*).(\d*)(.*)/10.11.2$4/;
open(FILE, ">$file/mysql_upgrade_info") or die "Failed to open $file"; open(FILE, ">$file/mariadb_upgrade_info") or die "Failed to open $file";
print FILE "$ver\n"; print FILE "$ver\n";
close(FILE); close(FILE);
EOF EOF
@ -353,7 +366,7 @@ EOF
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --exec $MYSQL_UPGRADE --check-if-upgrade-is-needed
--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mariadb.* as:[^\n]*/'mysql' as: mysql/ --replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / /'mariadb.* as:[^\n]*/'mysql' as: mysql/
--exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose --exec $MYSQL_UPGRADE --check-if-upgrade-is-needed --verbose
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
drop table mysql.global_priv; drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv; rename table mysql.global_priv_bak to mysql.global_priv;
@ -374,7 +387,7 @@ alter table mysql.db drop column Delete_history_priv;
--source include/restart_mysqld.inc --source include/restart_mysqld.inc
--echo Run mysql_upgrade with all privileges on a user --echo Run mysql_upgrade with all privileges on a user
--exec $MYSQL_UPGRADE --force --silent 2>&1 --exec $MYSQL_UPGRADE --force --silent 2>&1
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
flush privileges; flush privileges;
SHOW GRANTS FOR 'user3'@'%'; SHOW GRANTS FOR 'user3'@'%';
DROP USER 'user3'@'%'; DROP USER 'user3'@'%';
@ -393,7 +406,7 @@ SHOW GLOBAL VARIABLES LIKE 'alter_algorithm';
--exec $MYSQL_UPGRADE --force 2>&1 --exec $MYSQL_UPGRADE --force 2>&1
SET GLOBAL alter_algorithm=DEFAULT; SET GLOBAL alter_algorithm=DEFAULT;
SHOW GLOBAL VARIABLES LIKE 'alter_algorithm'; SHOW GLOBAL VARIABLES LIKE 'alter_algorithm';
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo End of 10.3 tests --echo End of 10.3 tests
@ -411,7 +424,7 @@ disconnect con1;
connection default; connection default;
--echo # mysql_upgrade --force --silent 2>&1 --echo # mysql_upgrade --force --silent 2>&1
--exec $MYSQL_UPGRADE --force --silent 2>&1 --exec $MYSQL_UPGRADE --force --silent 2>&1
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
show create user user3@localhost; show create user user3@localhost;
connect con1,localhost,user3,a_password; connect con1,localhost,user3,a_password;
select current_user(); select current_user();
@ -429,7 +442,7 @@ drop view mysql.user_bak;
drop table mysql.innodb_index_stats, mysql.innodb_table_stats; drop table mysql.innodb_index_stats, mysql.innodb_table_stats;
--echo # mysql_upgrade --force --silent 2>&1 --echo # mysql_upgrade --force --silent 2>&1
--exec $MYSQL_UPGRADE --force --silent 2>&1 --exec $MYSQL_UPGRADE --force --silent 2>&1
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
drop table mysql.global_priv; drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv; rename table mysql.global_priv_bak to mysql.global_priv;
@ -441,7 +454,7 @@ drop view mysql.user_bak;
alter table mysql.user change authentication_string auth_string text collate utf8_bin not null; alter table mysql.user change authentication_string auth_string text collate utf8_bin not null;
--echo # mysql_upgrade --force --silent 2>&1 --echo # mysql_upgrade --force --silent 2>&1
--exec $MYSQL_UPGRADE --force --silent 2>&1 --exec $MYSQL_UPGRADE --force --silent 2>&1
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
select count(*) from mysql.global_priv; select count(*) from mysql.global_priv;
drop table mysql.global_priv; drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv; rename table mysql.global_priv_bak to mysql.global_priv;
@ -482,7 +495,7 @@ connection default;
drop table mysql.global_priv; drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv; rename table mysql.global_priv_bak to mysql.global_priv;
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # End of 10.4 tests --echo # End of 10.4 tests

2
mysql-test/main/mysql_upgrade_mysql_json_datatype.test
View File

@ -58,4 +58,4 @@ drop table tempty;
drop table mysql_json_test; drop table mysql_json_test;
drop table mysql_json_test_big; drop table mysql_json_test_big;
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info

2
mysql-test/main/mysql_upgrade_no_innodb.test
View File

@ -3,4 +3,4 @@
--exec $MYSQL_UPGRADE --force --upgrade-system-tables 2>&1 --exec $MYSQL_UPGRADE --force --upgrade-system-tables 2>&1
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info

10
mysql-test/main/mysql_upgrade_noengine.test
View File

@ -46,9 +46,9 @@ drop view mysql.user_bak;
# pretend it's an upgrade from 10.0 # pretend it's an upgrade from 10.0
alter table mysql.user drop column default_role, drop column max_statement_time; alter table mysql.user drop column default_role, drop column max_statement_time;
# but mysql_upgrade_info tells otherwise # but mariadb_upgrade_info tells otherwise
remove_file $datadir/mysql_upgrade_info; remove_file $datadir/mariadb_upgrade_info;
write_file $datadir/mysql_upgrade_info; write_file $datadir/mariadb_upgrade_info;
10.1.10-MariaDB 10.1.10-MariaDB
EOF EOF
@ -64,7 +64,7 @@ source include/switch_to_mysql_user.inc;
drop view mysql.user_bak; drop view mysql.user_bak;
alter table mysql.user drop column default_role, drop column max_statement_time; alter table mysql.user drop column default_role, drop column max_statement_time;
remove_file $datadir/mysql_upgrade_info; remove_file $datadir/mariadb_upgrade_info;
--echo # upgrade from 10.0 - engines are enabled --echo # upgrade from 10.0 - engines are enabled
--replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB / --replace_regex /\d\d\.\d*\.\d*[^ .\n]*/MariaDB /
@ -74,7 +74,7 @@ select table_catalog, table_schema, table_name, table_type, engine, row_format,
drop table t1, t2; drop table t1, t2;
remove_file $datadir/mysql_upgrade_info; remove_file $datadir/mariadb_upgrade_info;
uninstall plugin blackhole; uninstall plugin blackhole;
uninstall plugin archive; uninstall plugin archive;

2
mysql-test/main/mysql_upgrade_ssl.test
View File

@ -9,4 +9,4 @@
--echo # --echo #
--exec $MYSQL_UPGRADE --skip-verbose --skip-silent --ssl --force 2>&1 --exec $MYSQL_UPGRADE --skip-verbose --skip-silent --ssl --force 2>&1
--let $datadir= `select @@datadir` --let $datadir= `select @@datadir`
--remove_file $datadir/mysql_upgrade_info --remove_file $datadir/mariadb_upgrade_info

2
mysql-test/main/mysql_upgrade_to_100502.test
View File

@ -55,7 +55,7 @@ SHOW GRANTS FOR user_replslave@localhost;
--echo # mysql_upgrade --force --silent 2>&1 --echo # mysql_upgrade --force --silent 2>&1
--exec $MYSQL_UPGRADE --force --silent 2>&1 --exec $MYSQL_UPGRADE --force --silent 2>&1
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
--echo # --echo #

2
mysql-test/main/mysql_upgrade_view.test
View File

@ -185,6 +185,6 @@ flush tables;
# back to mariadb default # back to mariadb default
drop table mysql.event; drop table mysql.event;
rename table mysql.ev_bk to mysql.event; rename table mysql.ev_bk to mysql.event;
remove_file $MYSQLD_DATADIR/mysql_upgrade_info; remove_file $MYSQLD_DATADIR/mariadb_upgrade_info;
drop view v1,v2,v3; drop view v1,v2,v3;
drop table t1; drop table t1;

2
mysql-test/main/plugin_auth.test
View File

@ -506,7 +506,7 @@ SELECT IS_NULLABLE, COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
COLUMN_NAME IN ('plugin', 'authentication_string') COLUMN_NAME IN ('plugin', 'authentication_string')
ORDER BY COLUMN_NAME; ORDER BY COLUMN_NAME;
let $datadir= `select @@datadir`; let $datadir= `select @@datadir`;
remove_file $datadir/mysql_upgrade_info; remove_file $datadir/mariadb_upgrade_info;
drop table mysql.global_priv; drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv; rename table mysql.global_priv_bak to mysql.global_priv;

4
mysql-test/main/rpl_mysql_upgrade_slave_repo_check.test
View File

@ -96,7 +96,7 @@ EOF
--connection master --connection master
let $datadir= `select @@datadir`; let $datadir= `select @@datadir`;
remove_file $datadir/mysql_upgrade_info; remove_file $datadir/mariadb_upgrade_info;
TRUNCATE TABLE `mysql`.`slave_master_info`; TRUNCATE TABLE `mysql`.`slave_master_info`;
TRUNCATE TABLE `mysql`.`slave_relay_log_info`; TRUNCATE TABLE `mysql`.`slave_relay_log_info`;
--remove_file $MYSQLTEST_VARDIR/log/mysql_upgrade_master.log --remove_file $MYSQLTEST_VARDIR/log/mysql_upgrade_master.log
@ -117,7 +117,7 @@ TRUNCATE TABLE `mysql`.`slave_relay_log_info`;
--echo "====== Clean up ======" --echo "====== Clean up ======"
--connection master --connection master
let $datadir= `select @@datadir`; let $datadir= `select @@datadir`;
remove_file $datadir/mysql_upgrade_info; remove_file $datadir/mariadb_upgrade_info;
DROP TABLE `mysql`.`slave_master_info`, `mysql`.`slave_relay_log_info`; DROP TABLE `mysql`.`slave_master_info`, `mysql`.`slave_relay_log_info`;
--remove_file $MYSQLTEST_VARDIR/tmp/slave_table_repo_init.sql --remove_file $MYSQLTEST_VARDIR/tmp/slave_table_repo_init.sql

4
mysql-test/main/statistics_upgrade.test
View File

@ -44,8 +44,8 @@ alter table t3 rename mysql.column_stats;
--exec $MYSQL_UPGRADE --upgrade-system-tables --force --silent 2>&1 --exec $MYSQL_UPGRADE --upgrade-system-tables --force --silent 2>&1
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # --echo #
--echo # Table definition after upgrade: --echo # Table definition after upgrade:

4
mysql-test/main/statistics_upgrade_not_done.test
View File

@ -50,8 +50,8 @@ select * from mysql.column_stats where table_name='t2' and db_name='test';
--exec $MYSQL_UPGRADE --upgrade-system-tables --force --silent 2>&1 --exec $MYSQL_UPGRADE --upgrade-system-tables --force --silent 2>&1
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
analyze select * from t0 where a<3; analyze select * from t0 where a<3;
drop table t0, t1, t2; drop table t0, t1, t2;

4
mysql-test/main/upgrade_MDEV-19650.test
View File

@ -101,8 +101,8 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--echo # Run mysql_upgrade --echo # Run mysql_upgrade
--exec $MYSQL_UPGRADE 2>&1 --exec $MYSQL_UPGRADE 2>&1
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # check new definitions mysql_upgrade --echo # check new definitions mysql_upgrade

8
mysql-test/main/upgrade_MDEV-23102-1.test
View File

@ -115,8 +115,8 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--echo # Run mysql_upgrade --echo # Run mysql_upgrade
--exec $MYSQL_UPGRADE 2>&1 --exec $MYSQL_UPGRADE 2>&1
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # check new definitions mysql_upgrade --echo # check new definitions mysql_upgrade
@ -138,8 +138,8 @@ DROP VIEW mysql.user;
DROP PROCEDURE AddGeometryColumn; DROP PROCEDURE AddGeometryColumn;
DROP PROCEDURE DropGeometryColumn; DROP PROCEDURE DropGeometryColumn;
--exec $MYSQL_UPGRADE 2>&1 --exec $MYSQL_UPGRADE 2>&1
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
delete from global_priv; delete from global_priv;
delete from tables_priv; delete from tables_priv;

8
mysql-test/main/upgrade_MDEV-23102-2.test
View File

@ -96,8 +96,8 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--echo # Run mysql_upgrade --echo # Run mysql_upgrade
--exec $MYSQL_UPGRADE 2>&1 --exec $MYSQL_UPGRADE 2>&1
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # check new definitions mysql_upgrade --echo # check new definitions mysql_upgrade
@ -116,8 +116,8 @@ select count(*) from global_priv where user='mariadb.sys' and host='localhost';
DROP USER 'superuser'@'localhost'; DROP USER 'superuser'@'localhost';
DROP VIEW mysql.user; DROP VIEW mysql.user;
--exec $MYSQL_UPGRADE 2>&1 --exec $MYSQL_UPGRADE 2>&1
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
delete from global_priv; delete from global_priv;
delete from tables_priv; delete from tables_priv;

4
mysql-test/main/upgrade_geometrycolumn_procedure_definer.test
View File

@ -43,8 +43,8 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--echo # Run mysql_upgrade --echo # Run mysql_upgrade
--echo # --echo #
--exec $MYSQL_UPGRADE 2>&1 --exec $MYSQL_UPGRADE 2>&1
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
--echo # --echo #
--echo # check new definers of Add/DropGeometryColumn --echo # check new definers of Add/DropGeometryColumn

4
mysql-test/main/upgrade_mdev_24363.test
View File

@ -55,8 +55,8 @@ drop user gigi@localhost;
--echo # Run mysql_upgrade --echo # Run mysql_upgrade
--exec $MYSQL_UPGRADE 2>&1 --exec $MYSQL_UPGRADE 2>&1
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
--file_exists $MYSQLD_DATADIR/mysql_upgrade_info --file_exists $MYSQLD_DATADIR/mariadb_upgrade_info
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info
create user gigi@localhost; create user gigi@localhost;
show create user gigi@localhost; show create user gigi@localhost;

2
mysql-test/suite/perfschema/include/upgrade_check.inc
View File

@ -12,4 +12,4 @@
--cat_file $MYSQLTEST_VARDIR/tmp/err_file --cat_file $MYSQLTEST_VARDIR/tmp/err_file
--remove_file $MYSQLTEST_VARDIR/tmp/out_file --remove_file $MYSQLTEST_VARDIR/tmp/out_file
--remove_file $MYSQLTEST_VARDIR/tmp/err_file --remove_file $MYSQLTEST_VARDIR/tmp/err_file
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info

2
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
View File

@ -55,7 +55,7 @@ connection master;
--exec $MYSQL_UPGRADE --skip-verbose --write-binlog --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1 --exec $MYSQL_UPGRADE --skip-verbose --write-binlog --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1
let $datadir= `select @@datadir`; let $datadir= `select @@datadir`;
remove_file $datadir/mysql_upgrade_info; remove_file $datadir/mariadb_upgrade_info;
connection master; connection master;
let $after_file= query_get_value(SHOW MASTER STATUS, File, 1); let $after_file= query_get_value(SHOW MASTER STATUS, File, 1);

2
mysql-test/suite/sysschema/t/mysqldump.test
View File

@ -32,4 +32,4 @@ DROP TEMPORARY TABLE tmp_tables_priv;
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
--let $MYSQLD_DATADIR= `select @@datadir` --let $MYSQLD_DATADIR= `select @@datadir`
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info --remove_file $MYSQLD_DATADIR/mariadb_upgrade_info

2
scripts/mysql_install_db.sh
View File

@ -597,7 +597,7 @@ cat_sql()
s_echo "Installing MariaDB/MySQL system tables in '$ldata' ..." s_echo "Installing MariaDB/MySQL system tables in '$ldata' ..."
if cat_sql | eval "$filter_cmd_line" | mysqld_install_cmd_line > /dev/null if cat_sql | eval "$filter_cmd_line" | mysqld_install_cmd_line > /dev/null
then then
printf "@VERSION@-MariaDB" > "$ldata/mysql_upgrade_info" printf "@VERSION@-MariaDB" > "$ldata/mariadb_upgrade_info"
s_echo "OK" s_echo "OK"
else else
log_file_place=$ldata log_file_place=$ldata

12
sql/winservice.c
View File

@ -305,19 +305,19 @@ int get_mysql_service_properties(const wchar_t *bin_path,
} }
/* /*
If version could not be determined so far, try mysql_upgrade_info in If version could not be determined so far, try mariadb_upgrade_info in
database directory. database directory.
*/ */
if(props->version_major == 0) if(props->version_major == 0)
{ {
char buf[MAX_PATH]; char buf[MAX_PATH];
FILE *mysql_upgrade_info; FILE *mariadb_upgrade_info;
sprintf_s(buf, MAX_PATH, "%s\\mysql_upgrade_info", props->datadir); sprintf_s(buf, MAX_PATH, "%s\\mariadb_upgrade_info", props->datadir);
mysql_upgrade_info= fopen(buf, "r"); mariadb_upgrade_info= fopen(buf, "r");
if(mysql_upgrade_info) if(mariadb_upgrade_info)
{ {
if (fgets(buf, MAX_PATH, mysql_upgrade_info)) if (fgets(buf, MAX_PATH, mariadb_upgrade_info))
{ {
int major,minor,patch; int major,minor,patch;
if (sscanf(buf, "%d.%d.%d", &major, &minor, &patch) == 3) if (sscanf(buf, "%d.%d.%d", &major, &minor, &patch) == 3)