diff options
| author |   Brian Evans <grknight@lavabit.com> | 2013-01-19 22:45:03 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@lavabit.com> | 2013-01-19 23:10:25 -0500 |
| commit | cff00b7bef9779f996077e340d8336eb636718a1 (patch) | |
| tree | 683363589721f4a74397b3d6607dd2202b3445e1 | |
| parent | Respin minimal patch for 5.5.29 (diff) | |
| download | mysql-extras-cff00b7bef9779f996077e340d8336eb636718a1.tar.gz mysql-extras-cff00b7bef9779f996077e340d8336eb636718a1.tar.bz2 mysql-extras-cff00b7bef9779f996077e340d8336eb636718a1.zip | |
Patch for bug 442000. Use empty va_list across all arches.mysql-extras-20130120-2303Z
| -rw-r--r-- | 00000_index.txt | 5 | ||||
| -rw-r--r-- | 20002_all_mysql-va-list.patch | 49 |
2 files changed, 54 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt index dbee56e..ab3621f 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1456,3 +1456,8 @@ @ver 5.05.25.00 to 5.05.26.99 @pn mariadb @@ Fix sql + +@patch 20002_all_mysql-va-list.patch +@ver 5.05.00.00 to 5.99.99.99 +@pn mysql +@@ Bug 442000, upstream 62729 compilation failure on arm and possibly other arches where va_list is a struct or array. diff --git a/20002_all_mysql-va-list.patch b/20002_all_mysql-va-list.patch new file mode 100644 index 0000000..2375aa1 --- /dev/null +++ b/20002_all_mysql-va-list.patch @@ -0,0 +1,49 @@ +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; |