mirror of
https://github.com/MariaDB/server.git
synced 2025-05-29 21:42:28 +03:00
04bee0af2e
mysql_upgrade --help now also prints out --default options and variable values. mysql_upgrade now prints permission errors. mysql_upgrade doesn't print some non essential info if --silent is used. Added handler error message about incompatible versions Fixed that mysqlbug and mysql_install_db have the executable flag set. Removed executable flag for some non executable files. Changed in mysql_install_db askmonty.org to mariadb.com. Ensured that all client executables prints --default options the same way. Allow REPAIR ... USE_FRM for old .frm files if the are still compatible. Extended shown error for storage engine messages. client/mysql.cc: print_defaults() should be first (as in all other programs) client/mysql_upgrade.c: --help now also prints out --default options and variable values Print out error if wrong permissions Don't print info if --silent client/mysqladmin.cc: print_defaults() should be first (as in all other programs) client/mysqlbinlog.cc: Added print_defaults() to --help client/mysqlcheck.c: Added empty line in --help client/mysqlimport.c: Added empty line in --help client/mysqlshow.c: Made --help compatible client/mysqlslap.c: Made --help compatible client/mysqltest.cc: Added print_defaults() to --help include/handler_ername.h: Added handler error message include/my_base.h: Added handler error message mysql-test/r/mysql_upgrade.result: Updated results mysql-test/r/repair.result: Added test case for better error messages mysql-test/std_data/host_old.MYD: Added test case for better error messages mysql-test/std_data/host_old.MYI: Added test case for better error messages mysql-test/std_data/host_old.frm: Added test case for better error messages mysql-test/t/repair.test: Added test case for better error messages mysys/my_handler_errors.h: Added handler error message scripts/CMakeLists.txt: Fixed that mysqlbug and mysql_install_db have the executable flag set scripts/mysql_install_db.sh: askmonty.org -> mariadb.com sql/ha_partition.cc: Sometimes table_type() can be called for errors even if partition didn't manage to open any files sql/handler.cc: Write clear text for not handled, but defined error messages. sql/share/errmsg-utf8.txt: Extended shown error for storage engine messages sql/sql_admin.cc: Allow REPAIR ... USE_FRM for old .frm files if the are still compatible storage/myisam/ha_myisam.cc: Use new error message
134 lines
4.0 KiB
Plaintext
134 lines
4.0 KiB
Plaintext
-- source include/mysql_upgrade_preparation.inc
|
|
-- source include/have_working_dns.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 --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 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 --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 --force --user=mysqltest1 --password=sakila 2>&1
|
|
|
|
DROP USER mysqltest1@'%';
|
|
|
|
#
|
|
# check that we get proper error messages if wrong user
|
|
|
|
--error 1
|
|
--exec $MYSQL_UPGRADE --force --user=mysqltest1 --password=sakila 2>&1
|
|
|
|
#
|
|
# 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
|
|
# NC: Added --skip-version-check, as the version check would fail when
|
|
# mysql_upgrade tries to get the server version.
|
|
--exec $MYSQL_UPGRADE --verbose --force --host=not_existing_host --skip-version-check 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 --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 --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 --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 --force --upgrade-system-tables
|
|
|
|
--echo #
|
|
--echo # Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION
|
|
--echo # SKIP-WRITE-BINLOG
|
|
--echo #
|
|
|
|
let $MYSQLD_DATADIR= `select @@datadir`;
|
|
|
|
--echo # Droping the previously created mysql_upgrade_info file..
|
|
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
|
|
|
|
--echo # Running mysql_upgrade with --skip-write-binlog..
|
|
--replace_result $MYSQLTEST_VARDIR var
|
|
--exec $MYSQL_UPGRADE --skip-write-binlog
|
|
|
|
# mysql_upgrade must have created mysql_upgrade_info file,
|
|
# so the following command should never fail.
|
|
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
|
|
|
|
--echo End of tests
|