database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 15:57:05 +01:00
parent 2a4c573339 6cfd2ba397
commit b83c379420
381 changed files with 10233 additions and 5782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/main/mysql_upgrade.test
View File

@ -485,6 +485,16 @@ 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
#