summaryrefslogtreecommitdiff
path: root/databases/mysql55-server/files/patch-libmysqld_lib_sql.cc
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2011-01-13 09:15:22 +0000
committerAlex Dupre <ale@FreeBSD.org>2011-01-13 09:15:22 +0000
commit186cfdea42d53328d6a34ac7e5b2aa0eefa96cfc (patch)
treebd17ea672934787586500ea95fdf1e8df7b853aa /databases/mysql55-server/files/patch-libmysqld_lib_sql.cc
parentupdate to 3.51.1 (diff)
Fix init_embedded_server when argc=0.
Submitted by: fluffy Obtained from: MySQL Bug #57931 Feature safe: yes
Notes
Notes: svn path=/head/; revision=267728
Diffstat (limited to 'databases/mysql55-server/files/patch-libmysqld_lib_sql.cc')
-rw-r--r--databases/mysql55-server/files/patch-libmysqld_lib_sql.cc13
1 files changed, 13 insertions, 0 deletions
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;