database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-11-20 11:32:59 +02:00
parent 41028d70f6 0d586d62e5
commit 5995ca3166
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
storage/spider/spd_db_mysql.cc
View File

@@ -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];
@@ -4206,7 +4206,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);
@@ -4363,7 +4363,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);