MDEV-35421 - main.mysql_upgrade fails without unix_socket plugin
Fixed main.mysql_upgrade to pass when unix_socket plugin is unavailable. Also don't redefine _GNU_SOURCE, which was previously defined by command line/environment. This fixes silent auth_socket build failure with MYSQL_MAINTAINER_MODE=ERR.
This commit is contained in:
parent
7f55c61060
commit
ed72eadfb8
@ -1062,7 +1062,7 @@ set global sql_safe_updates=@orig_sql_safe_updates;
|
|||||||
# MDEV-32043 Remove plugins previously external that are now built in (unix_socket)
|
# MDEV-32043 Remove plugins previously external that are now built in (unix_socket)
|
||||||
#
|
#
|
||||||
INSERT INTO mysql.plugin SELECT 'unix_socket', 'auth_socket.so'
|
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
|
# mariadb-upgrade --force --silent 2>&1
|
||||||
SELECT * FROM mysql.plugin WHERE name='unix_socket';
|
SELECT * FROM mysql.plugin WHERE name='unix_socket';
|
||||||
name dl
|
name dl
|
||||||
|
@ -500,7 +500,7 @@ set global sql_safe_updates=@orig_sql_safe_updates;
|
|||||||
--echo #
|
--echo #
|
||||||
|
|
||||||
INSERT INTO mysql.plugin SELECT 'unix_socket', 'auth_socket.so'
|
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;
|
||||||
--echo # mariadb-upgrade --force --silent 2>&1
|
--echo # mariadb-upgrade --force --silent 2>&1
|
||||||
--exec $MYSQL_UPGRADE --force --silent 2>&1
|
--exec $MYSQL_UPGRADE --force --silent 2>&1
|
||||||
SELECT * FROM mysql.plugin WHERE name='unix_socket';
|
SELECT * FROM mysql.plugin WHERE name='unix_socket';
|
||||||
|
@ -15,7 +15,9 @@
|
|||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
|
||||||
|
|
||||||
CHECK_CXX_SOURCE_COMPILES(
|
CHECK_CXX_SOURCE_COMPILES(
|
||||||
"#define _GNU_SOURCE
|
"#ifndef _GNU_SOURCE
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
#endif
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
int main() {
|
int main() {
|
||||||
struct ucred cred;
|
struct ucred cred;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user