Merge 10.6 into 10.7

Author: dr-m

storage/spider/spd_conn.cc

@@ -132,7 +132,7 @@ uchar *spider_conn_get_key(
   DBUG_ENTER("spider_conn_get_key");
   *length = conn->conn_key_length;
   DBUG_PRINT("info",("spider conn_kind=%u", conn->conn_kind));
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
   spider_print_keys(conn->conn_key, conn->conn_key_length);
 #endif
   DBUG_RETURN((uchar*) conn->conn_key);
@@ -990,19 +990,19 @@ SPIDER_CONN *spider_get_conn(
   if (conn_kind == SPIDER_CONN_KIND_MYSQL)
   {
 #endif
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
     spider_print_keys(conn_key, share->conn_keys_lengths[link_idx]);
 #endif
 #if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
   } else if (conn_kind == SPIDER_CONN_KIND_HS_READ)
   {
     conn_key = share->hs_read_conn_keys[link_idx];
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
     spider_print_keys(conn_key, share->hs_read_conn_keys_lengths[link_idx]);
 #endif
   } else {
     conn_key = share->hs_write_conn_keys[link_idx];
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
     spider_print_keys(conn_key, share->hs_write_conn_keys_lengths[link_idx]);
 #endif
   }

storage/spider/spd_db_mysql.cc

@@ -912,7 +912,7 @@ int spider_db_mbase_result::fetch_table_status(
 #endif
     } else
       stat.create_time = (time_t) 0;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
     {
       struct tm *ts, tmp_ts;
       char buf[80];
@@ -962,7 +962,7 @@ int spider_db_mbase_result::fetch_table_status(
 #endif
     } else
       stat.check_time = (time_t) 0;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
     {
       struct tm *ts, tmp_ts;
       char buf[80];
@@ -1041,7 +1041,7 @@ int spider_db_mbase_result::fetch_table_status(
 #endif
     } else
       stat.create_time = (time_t) 0;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
     {
       struct tm *ts, tmp_ts;
       char buf[80];
@@ -1066,7 +1066,7 @@ int spider_db_mbase_result::fetch_table_status(
 #endif
     } else
       stat.update_time = (time_t) 0;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
     {
       struct tm *ts, tmp_ts;
       char buf[80];
@@ -1091,7 +1091,7 @@ int spider_db_mbase_result::fetch_table_status(
 #endif
     } else
       stat.check_time = (time_t) 0;
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
     {
       struct tm *ts, tmp_ts;
       char buf[80];
@@ -4213,7 +4213,7 @@ int spider_db_mariadb_util::append_column_value(ha_spider *spider,
       ptr = tmp_str.get_str();
     } else if (field->type() == MYSQL_TYPE_GEOMETRY)
     {
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
       double xmin, xmax, ymin, ymax;
       float8get(xmin, new_ptr);
       float8get(xmax, new_ptr + 8);
@@ -4370,7 +4370,7 @@ int spider_db_mysql_util::append_column_value(
       }
       tmp_str.length(SIZEOF_STORED_DOUBLE * lcnt);
 */
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
       double xmin, xmax, ymin, ymax;
 /*
       float8store(buf,xmin);

storage/spider/spd_db_mysql.h

@@ -195,13 +195,13 @@ class spider_db_mbase_util: public spider_db_util
     spider_string *str
   ) override;
 #endif
-  bool tables_on_different_db_are_joinable();
-  bool socket_has_default_value();
-  bool database_has_default_value();
-  bool default_file_has_default_value();
-  bool host_has_default_value();
-  bool port_has_default_value();
-  bool append_charset_name_before_string();
+  bool tables_on_different_db_are_joinable() override;
+  bool socket_has_default_value() override;
+  bool database_has_default_value() override;
+  bool default_file_has_default_value() override;
+  bool host_has_default_value() override;
+  bool port_has_default_value() override;
+  bool append_charset_name_before_string() override;
 };
 
 class spider_db_mysql_util: public spider_db_mbase_util

storage/spider/spd_table.cc

@@ -4396,7 +4396,7 @@ int spider_set_connect_info_default_dbtable(
   ));
 }
 
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
 void spider_print_keys(
   const char *key,
   uint length

storage/spider/spd_table.h

@@ -431,7 +431,7 @@ int spider_set_connect_info_default_dbtable(
   int dbtable_name_length
 );
 
-#ifndef DBUG_OFF
+#ifdef DBUG_TRACE
 void spider_print_keys(
   const char *key,
   uint length