diff options
| author | Kentoku <kentokushiba@gmail.com> | 2019-04-09 19:21:02 +0900 |
|---|---|---|
| committer | Kentoku <kentokushiba@gmail.com> | 2019-04-09 19:32:02 +0900 |
| commit | a65a9f785ffcf6694e988450ebad46774db10e4e (patch) | |
| tree | 71dfb4bb2643a63f20fe24eb598f16a4ead48a4e | |
| parent | 304ae942f78f231a1f382624cdef9be80b3f5b84 (diff) | |
| download | mariadb-git-a65a9f785ffcf6694e988450ebad46774db10e4e.tar.gz | |
MDEV-18993 The keep-alive connection (set spider_conn_recycle_mode = 1) in spider would cause cash in MariaDB
| -rw-r--r-- | storage/spider/spd_db_mysql.cc | 3 | ||||
| -rw-r--r-- | storage/spider/spd_environ.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index d744de02a9d..18b66d33fbf 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -1948,6 +1948,9 @@ int spider_db_mbase::connect( connect_retry_count--; my_sleep((ulong) connect_retry_interval); } else { +#ifdef SPIDER_NET_HAS_THD + db_conn->net.thd = NULL; +#endif if (connect_mutex) pthread_mutex_unlock(&spider_open_conn_mutex); break; diff --git a/storage/spider/spd_environ.h b/storage/spider/spd_environ.h index 5e66a912582..ded2927482b 100644 --- a/storage/spider/spd_environ.h +++ b/storage/spider/spd_environ.h @@ -25,6 +25,7 @@ #if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100100 #define SPIDER_SUPPORT_CREATE_OR_REPLACE_TABLE +#define SPIDER_NET_HAS_THD #endif #if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100211 |