1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-24586: remove mysql_to_mariadb.sql

Browse Source 
This script is unused and unmaintained.

The logic is implemented in scripts/mysql_system_tables_fix.sql that forms part of mysql_upgrade

Its components:

  alter table mysql.user drop column `password_last_changed`, drop column `password_lifetime`, drop column `account_locked`;

has a friendlier migration path coming MDEV-24122

  alter table mysql.user change column `authentication_string` `auth_string` text COLLATE utf8_bin NOT NULL;

Already part of scripts/mysql_system_tables_fix.sql

  alter table mysql.user add column  `Password` char(41) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '' after `user`, add column  `is_role` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N' after `auth_string`;

  alter table mysql.user add column `default_role` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', add column `max_statement_time` decimal(12,6) NOT NULL DEFAULT '0.000000';

corrected in MDEV-23201 to be in the right order.

  update mysql.user set `password`=`auth_string`, plugin='' where plugin="mysql_native_password";

Is handled in server in the function acl_load.
This commit is contained in:
Daniel Black 2021-01-14 16:55:35 +11:00
parent 4d870b591d
commit 85b6a81805
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/CMakeLists.txt
View File

@ -99,7 +99,6 @@ INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_db.sql
${CMAKE_CURRENT_SOURCE_DIR}/fill_help_tables.sql
${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_data_timezone.sql
${CMAKE_CURRENT_SOURCE_DIR}/mysql_to_mariadb.sql
${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql
${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql
${FIX_PRIVILEGES_SQL}

22
scripts/mysql_to_mariadb.sql
View File

@ -1,22 +0,0 @@
-- Script that changes MySQL 5.7 privilege tables to MariaDB 10.x
-- This should be run first with
-- mysql --force mysql < mysql_to_mariadb.sql
-- It's ok to ignore any errors, as these usually means that the tables are
-- already fixed.
-- After this script s run, one should run at least:
-- mysql_upgrade --upgrade-system-tables
-- to get the other tables in the mysql database fixed.
-- Drop not existing columnms
alter table mysql.user drop column `password_last_changed`, drop column `password_lifetime`, drop column `account_locked`;
-- Change existing columns
alter table mysql.user change column `authentication_string` `auth_string` text COLLATE utf8_bin NOT NULL;
-- Add new columns
alter table mysql.user add column `Password` char(41) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '' after `user`, add column `is_role` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N' after `auth_string`;
alter table mysql.user add column `default_role` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', add column `max_statement_time` decimal(12,6) NOT NULL DEFAULT '0.000000';
-- Fix passwords
update mysql.user set `password`=`auth_string`, plugin='' where plugin="mysql_native_password";