Skip to content

M
MariaDB
Commit 5995ca31 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.4 into 10.5

parents 41028d70 0d586d62
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
storage/spider/spd_conn.cc
View file @ 5995ca31
...@@ -132,7 +132,7 @@ uchar *spider_conn_get_key( ...@@ -132,7 +132,7 @@ uchar *spider_conn_get_key(
DBUG_ENTER("spider_conn_get_key"); DBUG_ENTER("spider_conn_get_key");
*length = conn->conn_key_length; *length = conn->conn_key_length;
DBUG_PRINT("info",("spider conn_kind=%u", conn->conn_kind)); 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); spider_print_keys(conn->conn_key, conn->conn_key_length);
#endif #endif
DBUG_RETURN((uchar*) conn->conn_key); DBUG_RETURN((uchar*) conn->conn_key);
...@@ -967,19 +967,19 @@ SPIDER_CONN *spider_get_conn( ...@@ -967,19 +967,19 @@ SPIDER_CONN *spider_get_conn(
if (conn_kind == SPIDER_CONN_KIND_MYSQL) if (conn_kind == SPIDER_CONN_KIND_MYSQL)
{ {
#endif #endif
#ifndef DBUG_OFF #ifdef DBUG_TRACE
spider_print_keys(conn_key, share->conn_keys_lengths[link_idx]); spider_print_keys(conn_key, share->conn_keys_lengths[link_idx]);
#endif #endif
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET) #if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
} else if (conn_kind == SPIDER_CONN_KIND_HS_READ) } else if (conn_kind == SPIDER_CONN_KIND_HS_READ)
{ {
conn_key = share->hs_read_conn_keys[link_idx]; 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]); spider_print_keys(conn_key, share->hs_read_conn_keys_lengths[link_idx]);
#endif #endif
} else { } else {
conn_key = share->hs_write_conn_keys[link_idx]; 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]); spider_print_keys(conn_key, share->hs_write_conn_keys_lengths[link_idx]);
#endif #endif
} }
......
storage/spider/spd_db_mysql.cc
View file @ 5995ca31
...@@ -912,7 +912,7 @@ int spider_db_mbase_result::fetch_table_status( ...@@ -912,7 +912,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif #endif
} else } else
stat.create_time = (time_t) 0; stat.create_time = (time_t) 0;
#ifndef DBUG_OFF #ifdef DBUG_TRACE
{ {
struct tm *ts, tmp_ts; struct tm *ts, tmp_ts;
char buf[80]; char buf[80];
...@@ -962,7 +962,7 @@ int spider_db_mbase_result::fetch_table_status( ...@@ -962,7 +962,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif #endif
} else } else
stat.check_time = (time_t) 0; stat.check_time = (time_t) 0;
#ifndef DBUG_OFF #ifdef DBUG_TRACE
{ {
struct tm *ts, tmp_ts; struct tm *ts, tmp_ts;
char buf[80]; char buf[80];
...@@ -1041,7 +1041,7 @@ int spider_db_mbase_result::fetch_table_status( ...@@ -1041,7 +1041,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif #endif
} else } else
stat.create_time = (time_t) 0; stat.create_time = (time_t) 0;
#ifndef DBUG_OFF #ifdef DBUG_TRACE
{ {
struct tm *ts, tmp_ts; struct tm *ts, tmp_ts;
char buf[80]; char buf[80];
...@@ -1066,7 +1066,7 @@ int spider_db_mbase_result::fetch_table_status( ...@@ -1066,7 +1066,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif #endif
} else } else
stat.update_time = (time_t) 0; stat.update_time = (time_t) 0;
#ifndef DBUG_OFF #ifdef DBUG_TRACE
{ {
struct tm *ts, tmp_ts; struct tm *ts, tmp_ts;
char buf[80]; char buf[80];
...@@ -1091,7 +1091,7 @@ int spider_db_mbase_result::fetch_table_status( ...@@ -1091,7 +1091,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif #endif
} else } else
stat.check_time = (time_t) 0; stat.check_time = (time_t) 0;
#ifndef DBUG_OFF #ifdef DBUG_TRACE
{ {
struct tm *ts, tmp_ts; struct tm *ts, tmp_ts;
char buf[80]; char buf[80];
...@@ -4206,7 +4206,7 @@ int spider_db_mariadb_util::append_column_value(ha_spider *spider, ...@@ -4206,7 +4206,7 @@ int spider_db_mariadb_util::append_column_value(ha_spider *spider,
ptr = tmp_str.get_str(); ptr = tmp_str.get_str();
} else if (field->type() == MYSQL_TYPE_GEOMETRY) } else if (field->type() == MYSQL_TYPE_GEOMETRY)
{ {
#ifndef DBUG_OFF #ifdef DBUG_TRACE
double xmin, xmax, ymin, ymax; double xmin, xmax, ymin, ymax;
float8get(xmin, new_ptr); float8get(xmin, new_ptr);
float8get(xmax, new_ptr + 8); float8get(xmax, new_ptr + 8);
...@@ -4363,7 +4363,7 @@ int spider_db_mysql_util::append_column_value( ...@@ -4363,7 +4363,7 @@ int spider_db_mysql_util::append_column_value(
} }
tmp_str.length(SIZEOF_STORED_DOUBLE * lcnt); tmp_str.length(SIZEOF_STORED_DOUBLE * lcnt);
*/ */
#ifndef DBUG_OFF #ifdef DBUG_TRACE
double xmin, xmax, ymin, ymax; double xmin, xmax, ymin, ymax;
/* /*
float8store(buf,xmin); float8store(buf,xmin);
......
storage/spider/spd_table.cc
View file @ 5995ca31
...@@ -4201,7 +4201,7 @@ int spider_set_connect_info_default_dbtable( ...@@ -4201,7 +4201,7 @@ int spider_set_connect_info_default_dbtable(
)); ));
} }
#ifndef DBUG_OFF #ifdef DBUG_TRACE
void spider_print_keys( void spider_print_keys(
const char *key, const char *key,
uint length uint length
......
storage/spider/spd_table.h
View file @ 5995ca31
...@@ -431,7 +431,7 @@ int spider_set_connect_info_default_dbtable( ...@@ -431,7 +431,7 @@ int spider_set_connect_info_default_dbtable(
int dbtable_name_length int dbtable_name_length
); );
#ifndef DBUG_OFF #ifdef DBUG_TRACE
void spider_print_keys( void spider_print_keys(
const char *key, const char *key,
uint length uint length
......
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