mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#252 fix MDEV-6324 uninit var in discover3

Browse source
This commit is contained in:
Rich Prohaska 2014-06-10 18:55:57 -04:00
parent ee2a0724a0
commit fd9ded206c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/tokudb/hatoku_defines.h
View file

@ -161,7 +161,7 @@ PATENT RIGHTS GRANT:
#if defined(MARIADB_BASE_VERSION) #if defined(MARIADB_BASE_VERSION)
#define TOKU_INCLUDE_EXTENDED_KEYS 1 #define TOKU_INCLUDE_EXTENDED_KEYS 1
#endif #endif
#define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 1 #define TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL 0
#else #else
#error #error

2
storage/tokudb/hatoku_hton.cc
View file

@ -969,7 +969,7 @@ static int tokudb_discover3(handlerton *hton, THD* thd, const char *db, const ch
HA_METADATA_KEY curr_key = hatoku_frm_data; HA_METADATA_KEY curr_key = hatoku_frm_data;
DBT key = {}; DBT key = {};
DBT value = {}; DBT value = {};
bool do_commit; bool do_commit = false;
#if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099 #if 100000 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 100099
tokudb_trx_data *trx = (tokudb_trx_data *) thd_get_ha_data(thd, tokudb_hton); tokudb_trx_data *trx = (tokudb_trx_data *) thd_get_ha_data(thd, tokudb_hton);