Skip to content

M
MariaDB
Commit 0accd5f2 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files
Options

corrected previos manual merge

parent 66145361
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/ha_ndbcluster.cc
View file @ 0accd5f2
...@@ -8415,6 +8415,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -8415,6 +8415,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
struct timespec abstime; struct timespec abstime;
List<NDB_SHARE> util_open_tables; List<NDB_SHARE> util_open_tables;
Thd_ndb *thd_ndb; Thd_ndb *thd_ndb;
uint share_list_size= 0;
NDB_SHARE **share_list= NULL;
my_thread_init(); my_thread_init();
DBUG_ENTER("ndb_util_thread"); DBUG_ENTER("ndb_util_thread");
...@@ -8499,8 +8501,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -8499,8 +8501,6 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
ndbcluster_find_all_files(thd); ndbcluster_find_all_files(thd);
#endif #endif
uint share_list_size= 0;
NDB_SHARE **share_list= NULL;
set_timespec(abstime, 0); set_timespec(abstime, 0);
for (;;) for (;;)
{ {
......
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