From 186cfdea42d53328d6a34ac7e5b2aa0eefa96cfc Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Thu, 13 Jan 2011 09:15:22 +0000 Subject: Fix init_embedded_server when argc=0. Submitted by: fluffy Obtained from: MySQL Bug #57931 Feature safe: yes --- databases/mysql55-server/files/patch-libmysqld_lib_sql.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 databases/mysql55-server/files/patch-libmysqld_lib_sql.cc (limited to 'databases/mysql55-server/files/patch-libmysqld_lib_sql.cc') diff --git a/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc b/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc new file mode 100644 index 000000000000..bc520caf038e --- /dev/null +++ b/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc @@ -0,0 +1,13 @@ +--- libmysqld/lib_sql.cc.orig 2011-01-13 09:53:29.000000000 +0100 ++++ libmysqld/lib_sql.cc 2011-01-13 09:54:03.000000000 +0100 +@@ -510,8 +510,8 @@ + return 1; + defaults_argc= *argcp; + defaults_argv= *argvp; +- remaining_argc= argc; +- remaining_argv= argv; ++ remaining_argc= *argcp; ++ remaining_argv= *argvp; + + /* Must be initialized early for comparison of options name */ + system_charset_info= &my_charset_utf8_general_ci; -- cgit v1.2.3