mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
56ea8e9c05
- Added suppression of warnings - Fixed some test cases BUILD/FINISH.sh: Added AM_EXTRA_MAKEFLAGS BUILD/SETUP.sh: Added option --extra-makeflags client/mysqldump.c: Added suppression mysql-test/r/mysql.result: Updated results mysql-test/r/mysql_upgrade.result: Updated results mysql-test/r/partition_innodb_plugin.result: Updated results mysql-test/r/partition_open_files_limit.result: Updated results mysql-test/r/symlink.result: Updated results mysql-test/suite/innodb/r/innodb-create-options.result: Updated results mysql-test/suite/innodb/t/innodb-create-options.test: Don't print error message (as it's varies on different system) mysql-test/t/mysql.test: Don't print error message (as it's varies on different system) mysql-test/t/mysql_upgrade.test: Fixed checking of error number mysql-test/t/partition_innodb_plugin.test: Don't print error message (as it's varies on different system) plugin/semisync/semisync_master.cc: Added suppression sql/ha_partition.cc: Added suppression sql/item_subselect.cc: Added suppression sql/multi_range_read.cc: Added suppression sql/sql_parse.cc: Added suppression sql/sql_select.cc: Added suppression storage/innobase/handler/ha_innodb.cc: Removed not used variable storage/maria/ma_delete.c: Added suppression storage/maria/ma_key_recover.c: Added suppression storage/maria/ma_write.c: Added suppression strings/ctype-ucs2.c: Added suppression support-files/compiler_warnings.supp: Added suppressions unittest/mysys/my_vsnprintf-t.c: Fixed test case with %M to also work on Solaris
126 lines
3.8 KiB
Text
126 lines
3.8 KiB
Text
-- 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@'%';
|
|
|
|
|
|
#
|
|
# 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 --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 --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
|