[Commits] fc8caf1997b: Merge remote-tracking branch 'origin/10.3' into bb-10.4-supermergejan

jan jan.lindstrom at mariadb.com
Fri Apr 12 12:37:31 EEST 2019


revision-id: fc8caf1997ba6b0dc099103347b12e8bd264c340 (mariadb-10.4.4-7-gfc8caf1997b)
parent(s): 71848585f81690babb70cba345719a5d178b00d7 4dc10ec68d354241768ce4779c024b4bb2ca897b
author: Jan Lindström
committer: Jan Lindström
timestamp: 2019-04-12 12:37:27 +0300
message:

Merge remote-tracking branch 'origin/10.3' into bb-10.4-supermergejan


 cmake/cpack_rpm.cmake          | 2 +-
 storage/spider/spd_db_mysql.cc | 3 +++
 storage/spider/spd_environ.h   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --cc storage/spider/spd_db_mysql.cc
index d744de02a9d,262e47120ce..18b66d33fbf
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@@ -1948,6 -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 --cc storage/spider/spd_environ.h
index 5e66a912582,5e66a912582..ded2927482b
--- a/storage/spider/spd_environ.h
+++ b/storage/spider/spd_environ.h
@@@ -25,6 -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


More information about the commits mailing list