database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-11-29 12:37:46 +02:00
parent 19acb0257e fdb6db6b47
commit 7d4077cc11
246 changed files with 2643 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2508,7 +2508,7 @@ 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');
FROM information_schema.plugins WHERE plugin_name='unix_socket' AND plugin_library IS NULL;
# mariadb-upgrade --force --silent 2>&1
SELECT * FROM mysql.plugin WHERE name='unix_socket';
name dl