mariadb/mysql-test/std_data
Daniel Black ff8ffef3e1 MDEV-23201: mysql_upgrade order mysql.user for 5.7 cross-upgrade
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
2020-10-15 20:11:29 +11:00
..
crldir
ctype_upgrade
frm
funcs_1
ldml
loaddata
mysql5613mysql
mysql_upgrade
old_decimal
parts
temporal_upgrade
vcol_upgrade
zoneinfo
14897.frm
bad2_master.info
bad3_master.info
bad4_master.info
bad5_master.info
bad6_master.info
bad_gis_data.dat
bad_master.info
bad_row_type.frm
bad_row_type.MYD
bad_row_type.MYI
binlog_before_20574.bin
binlog_savepoint.000001
binlog_transaction.000001
bug15328.cnf
bug16266.000001
bug19371.frm
bug19371.MYD
bug19371.MYI
bug30435_5k.txt
bug30435_10k_items.txt
bug33029-slave-relay-bin.000001
bug35469.dat
bug36055.frm
bug36055.MYD
bug36055.MYI
bug37631.frm
bug37631.MYD
bug37631.MYI
bug40482-bin.000001
bug46565.ARZ
bug46565.frm
bug47012.ARM
bug47012.ARZ
bug47012.frm
bug47142_master-bin.000001
bug47205.frm
bug48265.frm
bug48449.frm
bug48633.ARM
bug48633.ARZ
bug48633.frm
bug49823.CSM
bug49823.CSV
bug49823.frm
bug887051.txt
bug11747416_32228_binlog.000001
bug16171518_1.dat
bug16171518_2.dat
cacert.pem
cakey.pem
charset_utf8.txt
checkDBI_DBD-mysql.pl
client-cert.crl
client-cert.pem
client-key.pem
cluster_7022_table.frm
cluster_7022_table.MYD
cluster_7022_table.MYI
corrupt-relay-bin.000624
corrupt_t1#P#p1.MYI
corrupt_t1.MYI
des_key_file
empty_file
galera-cert.pem
galera-key.pem
galera-upgrade-ca-cert.pem
galera-upgrade-server-cert.pem
galera-upgrade-server-key.pem
host_old.frm
host_old.MYD
host_old.MYI
init_file.dat
init_file_longline_3816.sql
intersect-bug50389.tsv
keys.txt
keys2.txt
keys3.txt
loaddata1.dat
loaddata2.dat
loaddata3.dat
loaddata4.dat
loaddata5.dat
loaddata6.dat
loaddata7.dat
loaddata_dq.dat
loaddata_pair.dat
loaddata_utf8.dat
loadxml.dat
loadxml2.dat
logkey.txt
long_table_name.frm
long_table_name.MYD
long_table_name.MYI
mariadb-5.5-binlog.000001
master-bin.000001
mdev-4645-binlog_checksum.binlog
mdev-4645-binlog_group_id.binlog
mdev-4645-binlog_group_id_checksum.binlog
mdev-4645-binlog_none.binlog
mdev5029_1.frm
mdev5029_2.frm
mdev5029_2.MAD
mdev5029_2.MAI
mdev6020-mysql-bin.000001
mdev17909#P#p20181029.MYD
mdev17909#P#p20181029.MYI
mdev17909#P#p20181128.MYD
mdev17909#P#p20181128.MYI
mdev17909.frm
mdev17909.par
Moscow_leap
mysql56datetime.frm
mysql56datetime.MYD
mysql56datetime.MYI
mysql56time.frm
mysql56time.MYD
mysql56time.MYI
mysql56timestamp.frm
mysql56timestamp.MYD
mysql56timestamp.MYI
mysql57_virtual.frm
mysql57_virtual.MYD
mysql57_virtual.MYI
mysql57user.frm MDEV-23201: mysql_upgrade order mysql.user for 5.7 cross-upgrade 2020-10-15 20:11:29 +11:00
mysql57user.MYD MDEV-23201: mysql_upgrade order mysql.user for 5.7 cross-upgrade 2020-10-15 20:11:29 +11:00
mysql57user.MYI MDEV-23201: mysql_upgrade order mysql.user for 5.7 cross-upgrade 2020-10-15 20:11:29 +11:00
new-format-relay-log-win.info
new-format-relay-log.info
numbers.txt
old-format-relay-log-win.info
old-format-relay-log.info
old_table-323.frm
onerow.xml
rpl_bug28618.dat
rpl_loaddata.dat
rpl_loaddata2.dat
rpl_mixed.dat
rpl_timezone.dat
rpl_timezone2.dat
server-cert.crl
server-cert.pem
server-key.pem
server-new-cert.pem
server-new-key.pem
server8k-cert.pem
server8k-key.pem
serversan-cert.pem
serversan-key.pem
t917689.ARZ
trunc_binlog.000001
untrusted-cacert.pem
vchar.frm
vcol_autoinc.frm
vcol_autoinc.MYD
vcol_autoinc.MYI
warnings_loaddata.dat
words.dat
words2.dat
words3.dat
wsrep_notify.sh