mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-28 17:15:19 +03:00 
			
		
		
		
	As MariaDB tables are expected in a fixed order, the cross upgrade
previously placed roles, default_role and max_statement_time after
now unused mysql-5.7 columns.
Test:
$ cp -a /usr/local/mysql-5.7.31/data/ /tmp/m57data
$ sql/mysqld --no-defaults --skip-networking --datadir=/tmp/m57data  --socket=/tmp/${PWD##*/}.sock   --verbose --lc-messages-dir=$PWD/sql/share
2020-10-02 11:02:05 140135193212864 [Note] sql/mysqld (mysqld 10.2.34-MariaDB) starting as process 1457667 ...
2020-10-02 11:02:05 140135193212864 [Note] InnoDB: Mutexes and rw_locks use GCC atomic built
$ client/mysql_upgrade --no-defaults -u root -pbob  -S /tmp/build-mariadb-server-10.2.sock
MySQL upgrade detected
Phase 1/7: Checking and upgrading mysql database
Processing databases
mysql
mysql.columns_priv                                 OK
mysql.db                                           OK
mysql.engine_cost                                  OK
mysql.event                                        OK
mysql.func                                         OK
mysql.gtid_executed                                OK
mysql.help_category                                OK
mysql.help_keyword                                 OK
mysql.help_relation                                OK
mysql.help_topic                                   OK
mysql.innodb_index_stats                           OK
mysql.innodb_table_stats                           OK
mysql.ndb_binlog_index                             OK
mysql.plugin                                       OK
mysql.proc                                         OK
mysql.procs_priv                                   OK
mysql.proxies_priv                                 OK
mysql.server_cost                                  OK
mysql.servers                                      OK
mysql.slave_master_info                            OK
mysql.slave_relay_log_info                         OK
mysql.slave_worker_info                            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
Result:
| user  | CREATE TABLE `user` (
  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
  `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '',
  `Password` char(41) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Insert_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Update_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Delete_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Create_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Drop_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Reload_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Process_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `File_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Grant_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `References_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Index_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Alter_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Show_db_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Super_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Execute_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Create_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Show_view_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Create_user_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
  `ssl_cipher` blob NOT NULL,
  `x509_issuer` blob NOT NULL,
  `x509_subject` blob NOT NULL,
  `max_questions` int(11) unsigned NOT NULL DEFAULT 0,
  `max_updates` int(11) unsigned NOT NULL DEFAULT 0,
  `max_connections` int(11) unsigned NOT NULL DEFAULT 0,
  `max_user_connections` int(11) NOT NULL DEFAULT 0,
  `plugin` char(64) CHARACTER SET latin1 NOT NULL DEFAULT '',
  `authentication_string` text COLLATE utf8_bin NOT NULL,
  `password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `is_role` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
  `default_role` char(80) COLLATE utf8_bin NOT NULL DEFAULT '',
  `max_statement_time` decimal(12,6) NOT NULL DEFAULT 0.000000,
  `password_last_changed` timestamp NULL DEFAULT NULL,
  `password_lifetime` smallint(5) unsigned DEFAULT NULL,
  `account_locked` enum('N','Y') COLLATE utf8_bin NOT NULL DEFAULT 'N',
  PRIMARY KEY (`Host`,`User`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges' |
MariaDB [(none)]>  CREATE ROLE `aRole`;
Query OK, 0 rows affected (0.00 sec)
MariaDB [(none)]> SET ROLE `aRole`;
Query OK, 0 rows affected (0.00 sec)
MariaDB [(none)]> FLUSH PRIVILEGES;
Query OK, 0 rows affected (0.00 sec)
MariaDB [(none)]> SET ROLE `aRole`;
Query OK, 0 rows affected (0.00 sec)
MariaDB [(none)]> SELECT `User`, `is_role` FROM `mysql`.`user`;
+---------------+---------+
| User          | is_role |
+---------------+---------+
| root          | N       |
| mysql.session | N       |
| mysql.sys     | N       |
| dan           | N       |
| aRole         | Y       |
+---------------+---------+
5 rows in set (0.00 sec)
Reviewer: Anel Husakovic
		
	
		
			
				
	
	
		
			257 lines
		
	
	
		
			8.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			257 lines
		
	
	
		
			8.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| -- source include/mysql_upgrade_preparation.inc
 | |
| -- source include/have_working_dns.inc
 | |
| -- source include/have_innodb.inc
 | |
| -- source include/have_partition.inc
 | |
| 
 | |
| set sql_mode="";
 | |
| 
 | |
| #
 | |
| # 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
 | |
| --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 whether it has 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 #
 | |
| --echo # Bug #21489398: MYSQL_UPGRADE: FATAL ERROR: UPGRADE FAILED - IMPROVE ERROR
 | |
| --echo #
 | |
| 
 | |
| --echo Run mysql_upgrade with unauthorized access
 | |
| --error 1
 | |
| --exec $MYSQL_UPGRADE --skip-verbose --user=root --password=wrong_password 2>&1
 | |
| 
 | |
| --echo #
 | |
| --echo # MDEV-4332 Increase username length from 16 characters
 | |
| --echo # MDEV-6068, MDEV-6178 mysql_upgrade breaks databases with long user names
 | |
| --echo #
 | |
| 
 | |
| connection default;
 | |
| GRANT SELECT ON mysql.* TO very_long_user_name_number_1;
 | |
| GRANT SELECT ON mysql.* TO very_long_user_name_number_2;
 | |
| GRANT ALL ON *.* TO even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@localhost WITH GRANT OPTION;
 | |
| --change_user even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length
 | |
| 
 | |
| GRANT INSERT ON mysql.user TO very_long_user_name_number_1;
 | |
| 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_2;
 | |
| 
 | |
| CREATE PROCEDURE test.pr() BEGIN END;
 | |
| 
 | |
| --change_user root
 | |
| 
 | |
| --replace_result $MYSQLTEST_VARDIR var
 | |
| --exec $MYSQL_UPGRADE --force 2>&1
 | |
| 
 | |
| SELECT definer FROM mysql.proc WHERE db = 'test' AND name = 'pr';
 | |
| SELECT grantor FROM mysql.tables_priv WHERE db = 'mysql' AND table_name = 'user';
 | |
| DROP USER very_long_user_name_number_1, very_long_user_name_number_2, even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@localhost;
 | |
| DROP PROCEDURE test.pr;
 | |
| 
 | |
| #
 | |
| # MDEV-13274 mysql_upgrade fails if dbname+tablename+partioname > 64 chars
 | |
| #
 | |
| use test;
 | |
| call mtr.add_suppression('Column last_update in table `mysql`.`innodb_table_stats` is INT NOT NULL but should be');
 | |
| alter table mysql.innodb_table_stats modify last_update int not null;
 | |
| 
 | |
| create table extralongname_extralongname_extralongname_extralongname_ext (
 | |
|   id int(10) unsigned not null,
 | |
|   created_date date not null,
 | |
|   created timestamp not null,
 | |
|   primary key (created,id,created_date)
 | |
| ) engine=innodb stats_persistent=1 default charset=latin1
 | |
|   partition by range (year(created_date))
 | |
|   subpartition by hash (month(created_date))
 | |
|   subpartitions 2 (
 | |
|     partition p2007 values less than (2008),
 | |
|     partition p2008 values less than (2009)
 | |
|   );
 | |
| --exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
 | |
| select length(table_name) from mysql.innodb_table_stats;
 | |
| drop table extralongname_extralongname_extralongname_extralongname_ext;
 | |
| 
 | |
| --echo End of 10.0 tests
 | |
| 
 | |
| set sql_mode=default;
 | |
| 
 | |
| #
 | |
| # Enforce storage engine option should not effect mysql_upgrade
 | |
| #
 | |
| --echo # Droping the previously created mysql_upgrade_info file..
 | |
| --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
 | |
| 
 | |
| create table test.t1(a int) engine=MyISAM;
 | |
| --echo # Trying to enforce InnoDB for all tables
 | |
| SET GLOBAL enforce_storage_engine=InnoDB;
 | |
| 
 | |
| --replace_result $MYSQLTEST_VARDIR var
 | |
| --exec $MYSQL_UPGRADE --force 2>&1
 | |
| 
 | |
| --echo # Should return 2
 | |
| SELECT count(*) FROM information_schema.tables where ENGINE="InnoDB";
 | |
| SHOW CREATE TABLE test.t1;
 | |
| DROP TABLE test.t1;
 | |
| # mysql_upgrade must have created mysql_upgrade_info file,
 | |
| # so the following command should never fail.
 | |
| --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
 | |
| SET GLOBAL enforce_storage_engine=NULL;
 | |
| 
 | |
| --echo End of 10.1 tests
 | |
| 
 | |
| --echo #
 | |
| --echo # MDEV-23201 'Roles' are created incorrectly on an install that was previously MySQL 5.7
 | |
| --echo #
 | |
| --echo #
 | |
| 
 | |
| --exec $MYSQL_DUMP --result-file $MYSQLTEST_VARDIR/tmp/user.sql mysql user
 | |
| --remove_file $MYSQLD_DATADIR/mysql/user.frm
 | |
| --remove_file $MYSQLD_DATADIR/mysql/user.MYI
 | |
| --remove_file $MYSQLD_DATADIR/mysql/user.MYD
 | |
| 
 | |
| --copy_file std_data/mysql57user.frm $MYSQLD_DATADIR/mysql/user.frm
 | |
| --copy_file std_data/mysql57user.MYI $MYSQLD_DATADIR/mysql/user.MYI
 | |
| --copy_file std_data/mysql57user.MYD $MYSQLD_DATADIR/mysql/user.MYD
 | |
| FLUSH TABLES mysql.user;
 | |
| FLUSH PRIVILEGES;
 | |
| SHOW CREATE TABLE mysql.user;
 | |
| 
 | |
| --exec $MYSQL_UPGRADE --force 2>&1
 | |
| SHOW CREATE TABLE mysql.user;
 | |
| 
 | |
| CREATE ROLE `aRole`;
 | |
| SET ROLE `aRole`;
 | |
| 
 | |
| FLUSH PRIVILEGES;
 | |
| 
 | |
| SET ROLE `aRole`;
 | |
| SELECT `User`, `is_role` FROM `mysql`.`user`;
 | |
| 
 | |
| DROP ROLE `aRole`;
 | |
| --exec $MYSQL mysql < $MYSQLTEST_VARDIR/tmp/user.sql
 | |
| FLUSH PRIVILEGES;
 | |
| --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
 | |
| 
 | |
| --echo End of 10.2 tests
 |