-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDEV-11170: MariaDB 10.2 cannot start on MySQL 5.7 datadir
PART 2 of the fix adds the logic of not using password column, unless it exists. If password column is missing we attempt to use plugin && authentication_string columns.
- Loading branch information
Showing
3 changed files
with
412 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| # | ||
| # MDEV-11170: MariaDB 10.2 cannot start on MySQL 5.7 datadir: | ||
| # Fatal error: mysql.user table is damaged or in | ||
| # unsupported 3.20 format | ||
| # | ||
| create table backup_user like mysql.user; | ||
| insert into backup_user select * from mysql.user; | ||
| # | ||
| # Original mysql.user table | ||
| # | ||
| describe mysql.user; | ||
| Field Type Null Key Default Extra | ||
| Host char(60) NO PRI | ||
| User char(80) NO PRI | ||
| Password char(41) NO | ||
| Select_priv enum('N','Y') NO N | ||
| Insert_priv enum('N','Y') NO N | ||
| Update_priv enum('N','Y') NO N | ||
| Delete_priv enum('N','Y') NO N | ||
| Create_priv enum('N','Y') NO N | ||
| Drop_priv enum('N','Y') NO N | ||
| Reload_priv enum('N','Y') NO N | ||
| Shutdown_priv enum('N','Y') NO N | ||
| Process_priv enum('N','Y') NO N | ||
| File_priv enum('N','Y') NO N | ||
| Grant_priv enum('N','Y') NO N | ||
| References_priv enum('N','Y') NO N | ||
| Index_priv enum('N','Y') NO N | ||
| Alter_priv enum('N','Y') NO N | ||
| Show_db_priv enum('N','Y') NO N | ||
| Super_priv enum('N','Y') NO N | ||
| Create_tmp_table_priv enum('N','Y') NO N | ||
| Lock_tables_priv enum('N','Y') NO N | ||
| Execute_priv enum('N','Y') NO N | ||
| Repl_slave_priv enum('N','Y') NO N | ||
| Repl_client_priv enum('N','Y') NO N | ||
| Create_view_priv enum('N','Y') NO N | ||
| Show_view_priv enum('N','Y') NO N | ||
| Create_routine_priv enum('N','Y') NO N | ||
| Alter_routine_priv enum('N','Y') NO N | ||
| Create_user_priv enum('N','Y') NO N | ||
| Event_priv enum('N','Y') NO N | ||
| Trigger_priv enum('N','Y') NO N | ||
| Create_tablespace_priv enum('N','Y') NO N | ||
| ssl_type enum('','ANY','X509','SPECIFIED') NO | ||
| ssl_cipher blob NO NULL | ||
| x509_issuer blob NO NULL | ||
| x509_subject blob NO NULL | ||
| max_questions int(11) unsigned NO 0 | ||
| max_updates int(11) unsigned NO 0 | ||
| max_connections int(11) unsigned NO 0 | ||
| max_user_connections int(11) NO 0 | ||
| plugin char(64) NO | ||
| authentication_string text NO NULL | ||
| password_expired enum('N','Y') NO N | ||
| is_role enum('N','Y') NO N | ||
| default_role char(80) NO | ||
| max_statement_time decimal(12,6) NO 0.000000 | ||
| # | ||
| # Drop the password column. | ||
| # | ||
| alter table mysql.user drop column password; | ||
| flush privileges; | ||
| # | ||
| # Create users without the password column present. | ||
| # | ||
| create user foo; | ||
| create user goo identified by "foo"; | ||
| select OLD_PASSWORD("ioo"); | ||
| OLD_PASSWORD("ioo") | ||
| 7a8f886d28473e85 | ||
| create user ioo identified with "mysql_old_password" as "7a8f886d28473e85"; | ||
| # | ||
| # Check if users have grants loaded correctly. | ||
| # | ||
| show grants for foo; | ||
| Grants for foo@% | ||
| GRANT USAGE ON *.* TO 'foo'@'%' | ||
| show grants for goo; | ||
| Grants for goo@% | ||
| GRANT USAGE ON *.* TO 'goo'@'%' IDENTIFIED BY PASSWORD '*F3A2A51A9B0F2BE2468926B4132313728C250DBF' | ||
| show grants for ioo; | ||
| Grants for ioo@% | ||
| GRANT USAGE ON *.* TO 'ioo'@'%' IDENTIFIED BY PASSWORD '7a8f886d28473e85' | ||
| select user, host, select_priv, plugin, authentication_string from mysql.user | ||
| where user like "%oo" | ||
| order by user; | ||
| user host select_priv plugin authentication_string | ||
| foo % N | ||
| goo % N mysql_native_password *F3A2A51A9B0F2BE2468926B4132313728C250DBF | ||
| ioo % N mysql_old_password 7a8f886d28473e85 | ||
| # | ||
| # Test setting password. | ||
| # | ||
| SET PASSWORD FOR foo=PASSWORD("bar"); | ||
| show grants for foo; | ||
| Grants for foo@% | ||
| GRANT USAGE ON *.* TO 'foo'@'%' IDENTIFIED BY PASSWORD '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB' | ||
| show grants for goo; | ||
| Grants for goo@% | ||
| GRANT USAGE ON *.* TO 'goo'@'%' IDENTIFIED BY PASSWORD '*F3A2A51A9B0F2BE2468926B4132313728C250DBF' | ||
| show grants for ioo; | ||
| Grants for ioo@% | ||
| GRANT USAGE ON *.* TO 'ioo'@'%' IDENTIFIED BY PASSWORD '7a8f886d28473e85' | ||
| select user, host, select_priv, plugin, authentication_string from mysql.user | ||
| where user like "%oo" | ||
| order by user; | ||
| user host select_priv plugin authentication_string | ||
| foo % N mysql_native_password *E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB | ||
| goo % N mysql_native_password *F3A2A51A9B0F2BE2468926B4132313728C250DBF | ||
| ioo % N mysql_old_password 7a8f886d28473e85 | ||
| # | ||
| # Test flush privileges without password column. | ||
| # | ||
| flush privileges; | ||
| show grants for foo; | ||
| Grants for foo@% | ||
| GRANT USAGE ON *.* TO 'foo'@'%' IDENTIFIED BY PASSWORD '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB' | ||
| show grants for goo; | ||
| Grants for goo@% | ||
| GRANT USAGE ON *.* TO 'goo'@'%' IDENTIFIED BY PASSWORD '*F3A2A51A9B0F2BE2468926B4132313728C250DBF' | ||
| show grants for ioo; | ||
| Grants for ioo@% | ||
| GRANT USAGE ON *.* TO 'ioo'@'%' IDENTIFIED BY PASSWORD '7a8f886d28473e85' | ||
| # | ||
| # Test granting of privileges. | ||
| # | ||
| grant select on *.* to foo; | ||
| grant select on *.* to goo; | ||
| grant select on *.* to ioo; | ||
| show grants for foo; | ||
| Grants for foo@% | ||
| GRANT SELECT ON *.* TO 'foo'@'%' IDENTIFIED BY PASSWORD '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB' | ||
| show grants for goo; | ||
| Grants for goo@% | ||
| GRANT SELECT ON *.* TO 'goo'@'%' IDENTIFIED BY PASSWORD '*F3A2A51A9B0F2BE2468926B4132313728C250DBF' | ||
| show grants for ioo; | ||
| Grants for ioo@% | ||
| GRANT SELECT ON *.* TO 'ioo'@'%' IDENTIFIED BY PASSWORD '7a8f886d28473e85' | ||
| # | ||
| # Check to see if grants are stable on flush. | ||
| # | ||
| flush privileges; | ||
| show grants for foo; | ||
| Grants for foo@% | ||
| GRANT SELECT ON *.* TO 'foo'@'%' IDENTIFIED BY PASSWORD '*E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB' | ||
| show grants for goo; | ||
| Grants for goo@% | ||
| GRANT SELECT ON *.* TO 'goo'@'%' IDENTIFIED BY PASSWORD '*F3A2A51A9B0F2BE2468926B4132313728C250DBF' | ||
| show grants for ioo; | ||
| Grants for ioo@% | ||
| GRANT SELECT ON *.* TO 'ioo'@'%' IDENTIFIED BY PASSWORD '7a8f886d28473e85' | ||
| # | ||
| # Check internal table representation. | ||
| # | ||
| select user, host, select_priv, plugin, authentication_string from mysql.user | ||
| where user like "%oo" | ||
| order by user; | ||
| user host select_priv plugin authentication_string | ||
| foo % Y mysql_native_password *E8D46CE25265E545D225A8A6F1BAF642FEBEE5CB | ||
| goo % Y mysql_native_password *F3A2A51A9B0F2BE2468926B4132313728C250DBF | ||
| ioo % Y mysql_old_password 7a8f886d28473e85 | ||
| # | ||
| # Reset to final original state. | ||
| # | ||
| drop table mysql.user; | ||
| rename table backup_user to mysql.user; | ||
| flush privileges; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| --source include/not_embedded.inc | ||
| --echo # | ||
| --echo # MDEV-11170: MariaDB 10.2 cannot start on MySQL 5.7 datadir: | ||
| --echo # Fatal error: mysql.user table is damaged or in | ||
| --echo # unsupported 3.20 format | ||
| --echo # | ||
|
|
||
|
|
||
| create table backup_user like mysql.user; | ||
| insert into backup_user select * from mysql.user; | ||
|
|
||
| --echo # | ||
| --echo # Original mysql.user table | ||
| --echo # | ||
| describe mysql.user; | ||
|
|
||
| --echo # | ||
| --echo # Drop the password column. | ||
| --echo # | ||
| alter table mysql.user drop column password; | ||
| flush privileges; | ||
|
|
||
| --echo # | ||
| --echo # Create users without the password column present. | ||
| --echo # | ||
| create user foo; | ||
| create user goo identified by "foo"; | ||
| select OLD_PASSWORD("ioo"); | ||
| create user ioo identified with "mysql_old_password" as "7a8f886d28473e85"; | ||
|
|
||
| --echo # | ||
| --echo # Check if users have grants loaded correctly. | ||
| --echo # | ||
| show grants for foo; | ||
| show grants for goo; | ||
| show grants for ioo; | ||
|
|
||
| select user, host, select_priv, plugin, authentication_string from mysql.user | ||
| where user like "%oo" | ||
| order by user; | ||
|
|
||
| --echo # | ||
| --echo # Test setting password. | ||
| --echo # | ||
| SET PASSWORD FOR foo=PASSWORD("bar"); | ||
|
|
||
| show grants for foo; | ||
| show grants for goo; | ||
| show grants for ioo; | ||
|
|
||
| select user, host, select_priv, plugin, authentication_string from mysql.user | ||
| where user like "%oo" | ||
| order by user; | ||
|
|
||
| --echo # | ||
| --echo # Test flush privileges without password column. | ||
| --echo # | ||
| flush privileges; | ||
| show grants for foo; | ||
| show grants for goo; | ||
| show grants for ioo; | ||
|
|
||
| --echo # | ||
| --echo # Test granting of privileges. | ||
| --echo # | ||
| grant select on *.* to foo; | ||
| grant select on *.* to goo; | ||
| grant select on *.* to ioo; | ||
| show grants for foo; | ||
| show grants for goo; | ||
| show grants for ioo; | ||
|
|
||
| --echo # | ||
| --echo # Check to see if grants are stable on flush. | ||
| --echo # | ||
| flush privileges; | ||
| show grants for foo; | ||
| show grants for goo; | ||
| show grants for ioo; | ||
|
|
||
| --echo # | ||
| --echo # Check internal table representation. | ||
| --echo # | ||
| select user, host, select_priv, plugin, authentication_string from mysql.user | ||
| where user like "%oo" | ||
| order by user; | ||
|
|
||
|
|
||
| --echo # | ||
| --echo # Reset to final original state. | ||
| --echo # | ||
| drop table mysql.user; | ||
| rename table backup_user to mysql.user; | ||
|
|
||
| flush privileges; |
Oops, something went wrong.