diff options
author | periapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2012-05-13 04:15:51 +0000 |
---|---|---|
committer | periapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1> | 2012-05-13 04:15:51 +0000 |
commit | 37ef281d4c383e9da360b90ea7d990c7f4c10a3d (patch) | |
tree | dac412e2e6f9b3ac691cd51a0c57b60c0a0b8505 /debian/patches/mysql_va_list.patch | |
parent | 8927673fc38ac4de32597c8a31c3539306d3d0a4 (diff) | |
download | mysql-5.5-37ef281d4c383e9da360b90ea7d990c7f4c10a3d.tar.gz |
Removed the numerical prefix from the patch files
git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2103 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
Diffstat (limited to 'debian/patches/mysql_va_list.patch')
-rw-r--r-- | debian/patches/mysql_va_list.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/debian/patches/mysql_va_list.patch b/debian/patches/mysql_va_list.patch new file mode 100644 index 0000000..e4a8b04 --- /dev/null +++ b/debian/patches/mysql_va_list.patch @@ -0,0 +1,53 @@ +Bug: http://bugs.mysql.com/bug.php?id=62769 +Bug-Ubuntu: http://pad.lv/700982 +Description: make sure va_list usage is portable to fix FTBFS on ARM + +diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c +--- mysql-5.5.16.orig/sql-common/client_plugin.c 2011-09-09 11:56:39.000000000 -0400 ++++ mysql-5.5.16/sql-common/client_plugin.c 2011-10-16 23:00:00.708799138 -0400 +@@ -228,11 +228,13 @@ + { + MYSQL mysql; + struct st_mysql_client_plugin **builtin; ++ va_list unused; + + if (initialized) + return 0; + + bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */ ++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ + + pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); + init_alloc_root(&mem_root, 128, 128); +@@ -244,7 +246,7 @@ + pthread_mutex_lock(&LOCK_load_client_plugin); + + for (builtin= mysql_client_builtins; *builtin; builtin++) +- add_plugin(&mysql, *builtin, 0, 0, 0); ++ add_plugin(&mysql, *builtin, 0, 0, unused); + + pthread_mutex_unlock(&LOCK_load_client_plugin); + +@@ -288,9 +290,13 @@ + mysql_client_register_plugin(MYSQL *mysql, + struct st_mysql_client_plugin *plugin) + { ++ va_list unused; ++ + if (is_not_initialized(mysql, plugin->name)) + return NULL; + ++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ ++ + pthread_mutex_lock(&LOCK_load_client_plugin); + + /* make sure the plugin wasn't loaded meanwhile */ +@@ -302,7 +308,7 @@ + plugin= NULL; + } + else +- plugin= add_plugin(mysql, plugin, 0, 0, 0); ++ plugin= add_plugin(mysql, plugin, 0, 0, unused); + + pthread_mutex_unlock(&LOCK_load_client_plugin); + return plugin; |