mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
53c8b22116
it couldn't parse the --ssl option. client/mysql_upgrade.c: mysql_upgrade parses its options and passes some of them to the underlying tools (mysqlcheck etc). To do this passdown, it reconstructs a command-line-suitable text from the my_option object (which contains the option's name and option's value). For options which expect no parameter, it just had to use the option's name; for other options, it had to concatenate the option's name, a "=" symbol, and the option's value; it had code to handle this latter case, but only for GET_STR options (options taking a string as value). But since the work on WL 4738, the --ssl option, a GET_BOOL, which used to have no parameter (NO_ARG), can now have one (OPT_ARG), so with --ssl we came to the "default" label, error. Fixed by constructing the command-line-suitable representation for GET_BOOL too. For --ssl it will produce --ssl=1 ; for --ssl=0, it will produce --ssl=0. mysql-test/include/mysql_upgrade_preparation.inc: handles requirements of tests which use mysql_upgrade mysql-test/r/mysql_upgrade_ssl.result: result; without the code fix we would get "internal error". mysql-test/t/mysql_upgrade.test: This test has requirements before running; moved them to an include file in order to share with mysql_upgrade_ssl. mysql-test/t/mysql_upgrade_ssl.test: test for bug. Couldn't go into mysql_upgrade.test as this new test requires SSL support. --force is needed, in case mysql_upgrade.test run before (in which case mysql_upgrade_ssl would say that upgrade has already been done); --force forces the upgrade in all cases.
106 lines
3.3 KiB
Text
106 lines
3.3 KiB
Text
-- source include/mysql_upgrade_preparation.inc
|
|
|
|
#
|
|
# Basic test that we can run mysql_upgrde and that it finds the
|
|
# expected binaries it uses.
|
|
#
|
|
--echo Run mysql_upgrade once
|
|
--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
|
|
|
|
# It should have created a file in the MySQL Servers datadir
|
|
let $MYSQLD_DATADIR= `select @@datadir`;
|
|
file_exists $MYSQLD_DATADIR/mysql_upgrade_info;
|
|
|
|
--echo Run it again - should say already completed
|
|
--replace_result $MYSQL_SERVER_VERSION VERSION
|
|
--error 1
|
|
--exec $MYSQL_UPGRADE --skip-verbose 2>&1
|
|
|
|
# It should have created a file in the MySQL Servers datadir
|
|
file_exists $MYSQLD_DATADIR/mysql_upgrade_info;
|
|
|
|
--echo Force should run it regardless of wether it's been run before
|
|
--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
|
|
|
|
# It should have created a file in the MySQL Servers datadir
|
|
file_exists $MYSQLD_DATADIR/mysql_upgrade_info;
|
|
|
|
|
|
#
|
|
# Bug #25452 mysql_upgrade access denied.
|
|
#
|
|
|
|
# Password protect a root account and run mysql_upgrade
|
|
|
|
CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
|
|
GRANT ALL ON *.* TO mysqltest1@'%';
|
|
--echo Run mysql_upgrade with password protected account
|
|
--exec $MYSQL_UPGRADE --skip-verbose --force --user=mysqltest1 --password=sakila 2>&1
|
|
|
|
DROP USER mysqltest1@'%';
|
|
|
|
|
|
#
|
|
# Bug #26639 mysql_upgrade exits successfully even if external command failed
|
|
#
|
|
|
|
--echo Run mysql_upgrade with a non existing server socket
|
|
--replace_result $MYSQLTEST_VARDIR var
|
|
--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/
|
|
--error 1
|
|
--exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host 2>&1
|
|
|
|
#
|
|
# Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE
|
|
#
|
|
|
|
# The SQL commands used by mysql_upgrade are written to be run
|
|
# with sql_mode set to '' - thus the scripts should change sql_mode
|
|
# for the session to make sure the SQL is legal.
|
|
|
|
# Test by setting sql_mode before running mysql_upgrade
|
|
set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
|
|
--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
|
|
eval set GLOBAL sql_mode=default;
|
|
|
|
--echo #
|
|
--echo # Bug #41569 mysql_upgrade (ver 5.1) add 3 fields to mysql.proc table
|
|
--echo # but does not set values.
|
|
--echo #
|
|
|
|
# Create a stored procedure and set the fields in question to null.
|
|
# When running mysql_upgrade, a warning should be written.
|
|
|
|
CREATE PROCEDURE testproc() BEGIN END;
|
|
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 db_collation = NULL WHERE name LIKE 'testproc';
|
|
--exec $MYSQL_UPGRADE --skip-verbose --force 2> $MYSQLTEST_VARDIR/tmp/41569.txt
|
|
CALL testproc();
|
|
DROP PROCEDURE testproc;
|
|
--cat_file $MYSQLTEST_VARDIR/tmp/41569.txt
|
|
--remove_file $MYSQLTEST_VARDIR/tmp/41569.txt
|
|
|
|
|
|
--echo #
|
|
--echo # Bug #53613: mysql_upgrade incorrectly revokes
|
|
--echo # TRIGGER privilege on given table
|
|
--echo #
|
|
|
|
GRANT USAGE ON *.* TO 'user3'@'%';
|
|
GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%';
|
|
--echo Run mysql_upgrade with all privileges on a user
|
|
--exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
|
|
SHOW GRANTS FOR 'user3'@'%';
|
|
|
|
DROP USER 'user3'@'%';
|
|
|
|
--echo End of 5.1 tests
|
|
|
|
|
|
#
|
|
# Test the --upgrade-system-tables option
|
|
#
|
|
--replace_result $MYSQLTEST_VARDIR var
|
|
--exec $MYSQL_UPGRADE --skip-verbose --upgrade-system-tables
|
|
|