Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
Browse Source

Merge 10.5 into 10.6

pull/2174/head
Marko Mäkelä 3 years ago
parent
9aea7d83c8 c9ccd978eb
commit
6b083ce851
5 changed files with 20 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      storage/spider/spd_conn.cc
  2. 14
      storage/spider/spd_db_mysql.cc
  3. 14
      storage/spider/spd_db_mysql.h
  4. 2
      storage/spider/spd_table.cc
  5. 2
      storage/spider/spd_table.h

8
storage/spider/spd_conn.cc
View File

@ -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);
@ -990,19 +990,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
} }

14
storage/spider/spd_db_mysql.cc
View File

@ -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(
#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(
#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(
#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(
#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];
@ -4210,7 +4210,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);
@ -4367,7 +4367,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);

14
storage/spider/spd_db_mysql.h
View File

@ -195,13 +195,13 @@ public:
spider_string *str spider_string *str
) override; ) override;
#endif #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 class spider_db_mysql_util: public spider_db_mbase_util

2
storage/spider/spd_table.cc
View File

@ -4351,7 +4351,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

2
storage/spider/spd_table.h
View File

@ -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

Write Preview
Loading…
Cancel
Save