diff options
author | Remi Collet <fedora@famillecollet.com> | 2011-02-07 19:35:09 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2011-02-07 19:35:09 +0100 |
commit | 42f6b501f74be018842a560a4a1daad888a4d12f (patch) | |
tree | 43dd31061fafc83e40730349c5d5563a0cd0004e /mysql-embedded-crash.patch | |
parent | e04b6e74d7f6b494fc235e1a81937370e54834e9 (diff) |
mysql 5.5.8, sync with rawhide (latest patches)
Diffstat (limited to 'mysql-embedded-crash.patch')
-rw-r--r-- | mysql-embedded-crash.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-embedded-crash.patch b/mysql-embedded-crash.patch new file mode 100644 index 0000000..b445fce --- /dev/null +++ b/mysql-embedded-crash.patch @@ -0,0 +1,19 @@ +Fix crash in embedded mysql library when mysql_library_init() is invoked +with argc = 0, as is supposed to be a supported thing to do. +Patch from upstream bug #57931. + + +diff -Naur mysql-5.5.8.orig/libmysqld/lib_sql.cc mysql-5.5.8/libmysqld/lib_sql.cc +--- mysql-5.5.8.orig/libmysqld/lib_sql.cc 2010-12-03 12:58:26.000000000 -0500 ++++ mysql-5.5.8/libmysqld/lib_sql.cc 2011-01-12 23:10:55.837471629 -0500 +@@ -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; |