1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

MDEV-29914: Fix maridab-upgrade when sql_safe_updates = on is set in my.cnf

Tested multiple major version upgrades with sql_safe_updates enabled, and
confirmed the issue is resolved.

Reviewer: Daniel Black
This commit is contained in:
Anthony Ryan
2023-10-20 22:27:14 -04:00
committed by Daniel Black
parent 179424db5f
commit babd833685
3 changed files with 63 additions and 0 deletions

View File

@ -485,4 +485,14 @@ drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv;
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
--echo #
--echo # mariadb-upgrade fails with sql_safe_updates = on
--echo #
set @orig_sql_safe_updates = @@GLOBAL.sql_safe_updates;
set global sql_safe_updates=ON;
--exec $MYSQL_UPGRADE --force 2>&1
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
set global sql_safe_updates=@orig_sql_safe_updates;
--echo # End of 10.4 tests