Skip to content

M
MariaDB
Commit f16b3122 authored by Rich Prohaska's avatar Rich Prohaska
Browse files
Options

#252 fix MDEV-6324 uninit var in discover3

parent 2f948975
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/tokudb/hatoku_defines.h
View file @ f16b3122
...@@ -161,7 +161,7 @@ PATENT RIGHTS GRANT: ...@@ -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
......
storage/tokudb/hatoku_hton.cc
View file @ f16b3122
...@@ -969,7 +969,7 @@ static int tokudb_discover3(handlerton *hton, THD* thd, const char *db, const ch ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7