database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2023-12-18 08:59:07 +02:00
parent f98d2ef5b4 87a5d16911
commit 4ae105a37d
66 changed files with 1029 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/main/mysql_upgrade.result
View File

@ -1058,6 +1058,14 @@ test
Phase 7/7: Running 'FLUSH PRIVILEGES'
OK
set global sql_safe_updates=@orig_sql_safe_updates;
#
# MDEV-32043 Remove plugins previously external that are now built in (unix_socket)
#
INSERT INTO mysql.plugin SELECT 'unix_socket', 'auth_socket.so'
FROM dual WHERE convert(@@version_compile_os using latin1) not in ('Win32', 'Win64', 'Windows');
# mariadb-upgrade --force --silent 2>&1
SELECT * FROM mysql.plugin WHERE name='unix_socket';
name dl
# End of 10.4 tests
#
# Check that mysql_upgrade can be run on mysqldump