temporary reverting for merging Spider

storage/spider/ha_spider.cc

@@ -4393,12 +4393,12 @@ int ha_spider::read_multi_range_first_internal(
 #ifdef HA_MRR_USE_DEFAULT_IMPL
         (error_num = spider_db_append_key_where(
           &mrr_cur_range.start_key,
-          MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ?
+          test(mrr_cur_range.range_flag & EQ_RANGE) ?
           NULL : &mrr_cur_range.end_key, this))
 #else
         (error_num = spider_db_append_key_where(
           &multi_range_curr->start_key,
-          MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ?
+          test(multi_range_curr->range_flag & EQ_RANGE) ?
           NULL : &multi_range_curr->end_key, this))
 #endif
       )
@@ -4834,9 +4834,9 @@ int ha_spider::read_multi_range_first_internal(
         !(sql_kinds & SPIDER_SQL_KIND_HS) &&
 #endif
 #ifdef HA_MRR_USE_DEFAULT_IMPL
-        MY_TEST(mrr_cur_range.range_flag & EQ_RANGE)
+        test(mrr_cur_range.range_flag & EQ_RANGE)
 #else
-        MY_TEST(multi_range_curr->range_flag & EQ_RANGE)
+        test(multi_range_curr->range_flag & EQ_RANGE)
 #endif
       ) {
         if (
@@ -4951,11 +4951,11 @@ int ha_spider::read_multi_range_first_internal(
         {
           if (
 #ifdef HA_MRR_USE_DEFAULT_IMPL
-            !MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ||
+            !test(mrr_cur_range.range_flag & EQ_RANGE) ||
             result_list.tmp_table_join_key_part_map !=
               mrr_cur_range.start_key.keypart_map
 #else
-            !MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ||
+            !test(multi_range_curr->range_flag & EQ_RANGE) ||
             result_list.tmp_table_join_key_part_map !=
               multi_range_curr->start_key.keypart_map
 #endif
@@ -5119,12 +5119,12 @@ int ha_spider::read_multi_range_first_internal(
 #ifdef HA_MRR_USE_DEFAULT_IMPL
             (error_num = spider_db_append_key_where(
               &mrr_cur_range.start_key,
-              MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ?
+              test(mrr_cur_range.range_flag & EQ_RANGE) ?
               NULL : &mrr_cur_range.end_key, this))
 #else
             (error_num = spider_db_append_key_where(
               &multi_range_curr->start_key,
-              MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ?
+              test(multi_range_curr->range_flag & EQ_RANGE) ?
               NULL : &multi_range_curr->end_key, this))
 #endif
           )
@@ -5739,12 +5739,12 @@ int ha_spider::read_multi_range_next(
 #ifdef HA_MRR_USE_DEFAULT_IMPL
         (error_num = spider_db_append_key_where(
           &mrr_cur_range.start_key,
-          MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ?
+          test(mrr_cur_range.range_flag & EQ_RANGE) ?
           NULL : &mrr_cur_range.end_key, this))
 #else
         (error_num = spider_db_append_key_where(
           &multi_range_curr->start_key,
-          MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ?
+          test(multi_range_curr->range_flag & EQ_RANGE) ?
           NULL : &multi_range_curr->end_key, this))
 #endif
       )
@@ -6193,9 +6193,9 @@ int ha_spider::read_multi_range_next(
         !(sql_kinds & SPIDER_SQL_KIND_HS) &&
 #endif
 #ifdef HA_MRR_USE_DEFAULT_IMPL
-        MY_TEST(mrr_cur_range.range_flag & EQ_RANGE)
+        test(mrr_cur_range.range_flag & EQ_RANGE)
 #else
-        MY_TEST(multi_range_curr->range_flag & EQ_RANGE)
+        test(multi_range_curr->range_flag & EQ_RANGE)
 #endif
       ) {
         if (
@@ -6311,11 +6311,11 @@ int ha_spider::read_multi_range_next(
         {
           if (
 #ifdef HA_MRR_USE_DEFAULT_IMPL
-            !MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ||
+            !test(mrr_cur_range.range_flag & EQ_RANGE) ||
             result_list.tmp_table_join_key_part_map !=
               mrr_cur_range.start_key.keypart_map
 #else
-            !MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ||
+            !test(multi_range_curr->range_flag & EQ_RANGE) ||
             result_list.tmp_table_join_key_part_map !=
               multi_range_curr->start_key.keypart_map
 #endif
@@ -6478,12 +6478,12 @@ int ha_spider::read_multi_range_next(
 #ifdef HA_MRR_USE_DEFAULT_IMPL
             (error_num = spider_db_append_key_where(
               &mrr_cur_range.start_key,
-              MY_TEST(mrr_cur_range.range_flag & EQ_RANGE) ?
+              test(mrr_cur_range.range_flag & EQ_RANGE) ?
               NULL : &mrr_cur_range.end_key, this))
 #else
             (error_num = spider_db_append_key_where(
               &multi_range_curr->start_key,
-              MY_TEST(multi_range_curr->range_flag & EQ_RANGE) ?
+              test(multi_range_curr->range_flag & EQ_RANGE) ?
               NULL : &multi_range_curr->end_key, this))
 #endif
           )

storage/spider/hs_client/socket.cpp

@@ -8,7 +8,6 @@
  */
 
 #ifndef __WIN__
-#include <sys/types.h>
 #include <sys/un.h>
 #endif
 

storage/spider/spd_include.h

@@ -60,8 +60,8 @@
 #endif
 
 #if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100004
-#define spider_stmt_da_message(A) thd_get_error_message(A)
-#define spider_stmt_da_sql_errno(A) thd_get_error_number(A)
+#define spider_stmt_da_message(A) (A)->get_stmt_da()->message()
+#define spider_stmt_da_sql_errno(A) (A)->get_stmt_da()->sql_errno()
 #define spider_user_defined_key_parts(A) (A)->user_defined_key_parts
 #define SPIDER_CAN_BG_UPDATE (1LL << 39)
 #define SPIDER_ALTER_ADD_PARTITION        Alter_info::ALTER_ADD_PARTITION

storage/spider/spd_table.cc

@@ -7990,7 +7990,7 @@ int spider_discover_table_structure(
       DBUG_RETURN(ER_SPIDER_UNKNOWN_NUM);
     }
     if (!(part_syntax = generate_partition_syntax(part_info, &part_syntax_len,
-      FALSE, TRUE, info, NULL, NULL)))
+      FALSE, TRUE, info, NULL)))
     {
       DBUG_RETURN(HA_ERR_OUT_OF_MEM);
     }

storage/spider/spd_trx.cc

@@ -246,7 +246,7 @@ int spider_trx_another_lock_tables(
   SPIDER_BACKUP_DASTATUS;
   sql_str.init_calc_mem(188);
   sql_str.length(0);
-  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
+  memset(&tmp_spider, 0, sizeof(ha_spider));
   memset(&tmp_share, 0, sizeof(SPIDER_SHARE));
   tmp_spider.share = &tmp_share;
   tmp_spider.trx = trx;
@@ -292,7 +292,7 @@ int spider_trx_another_flush_tables(
   long tmp_link_statuses = SPIDER_LINK_STATUS_OK;
   DBUG_ENTER("spider_trx_another_flush_tables");
   SPIDER_BACKUP_DASTATUS;
-  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
+  memset(&tmp_spider, 0, sizeof(ha_spider));
   tmp_share.link_count = 1;
   tmp_share.all_link_count = 1;
   tmp_share.link_statuses = &tmp_link_statuses;
@@ -326,7 +326,7 @@ int spider_trx_all_flush_tables(
   long tmp_link_statuses = SPIDER_LINK_STATUS_OK;
   DBUG_ENTER("spider_trx_all_flush_tables");
   SPIDER_BACKUP_DASTATUS;
-  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
+  memset(&tmp_spider, 0, sizeof(ha_spider));
   tmp_share.link_count = 1;
   tmp_share.all_link_count = 1;
   tmp_share.link_statuses = &tmp_link_statuses;
@@ -358,7 +358,7 @@ int spider_trx_all_unlock_tables(
   ha_spider tmp_spider;
   DBUG_ENTER("spider_trx_all_unlock_tables");
   SPIDER_BACKUP_DASTATUS;
-  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
+  memset(&tmp_spider, 0, sizeof(ha_spider));
   tmp_spider.conns = &conn;
   tmp_spider.need_mons = &need_mon;
   while ((conn = (SPIDER_CONN*) my_hash_element(&trx->trx_conn_hash,
@@ -386,7 +386,7 @@ int spider_trx_all_start_trx(
   ha_spider tmp_spider;
   DBUG_ENTER("spider_trx_all_start_trx");
   SPIDER_BACKUP_DASTATUS;
-  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
+  memset(&tmp_spider, 0, sizeof(ha_spider));
   tmp_spider.trx = trx;
   tmp_spider.need_mons = &need_mon;
   while ((conn = (SPIDER_CONN*) my_hash_element(&trx->trx_conn_hash,
@@ -421,7 +421,7 @@ int spider_trx_all_flush_logs(
   long net_write_timeout = 600;
   DBUG_ENTER("spider_trx_all_flush_logs");
   SPIDER_BACKUP_DASTATUS;
-  memset((void*)&tmp_spider, 0, sizeof(ha_spider));
+  memset(&tmp_spider, 0, sizeof(ha_spider));
   tmp_share.link_count = 1;
   tmp_share.all_link_count = 1;
   tmp_share.link_statuses = &tmp_link_statuses;