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.8 into 10.9

Browse Source
This commit is contained in:
Marko Mäkelä
2022-11-21 10:25:38 +02:00
parent 91a7e9eb1e 5b1eb87b6f
commit b35a048ece
104 changed files with 3031 additions and 3576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
storage/spider/spd_db_mysql.cc
View File

@@ -892,7 +892,7 @@ int spider_db_mbase_result::fetch_table_status(
&not_used_long, &not_used_uint);
} else
stat.create_time = (time_t) 0;
#ifndef DBUG_OFF
#ifdef DBUG_TRACE
{
struct tm *ts, tmp_ts;
char buf[80];
@@ -932,7 +932,7 @@ int spider_db_mbase_result::fetch_table_status(
&not_used_long, &not_used_uint);
} else
stat.check_time = (time_t) 0;
#ifndef DBUG_OFF
#ifdef DBUG_TRACE
{
struct tm *ts, tmp_ts;
char buf[80];
@@ -1006,7 +1006,7 @@ int spider_db_mbase_result::fetch_table_status(
&not_used_long, &not_used_uint);
} else
stat.create_time = (time_t) 0;
#ifndef DBUG_OFF
#ifdef DBUG_TRACE
{
struct tm *ts, tmp_ts;
char buf[80];
@@ -1026,7 +1026,7 @@ int spider_db_mbase_result::fetch_table_status(
&not_used_long, &not_used_uint);
} else
stat.update_time = (time_t) 0;
#ifndef DBUG_OFF
#ifdef DBUG_TRACE
{
struct tm *ts, tmp_ts;
char buf[80];
@@ -1046,7 +1046,7 @@ int spider_db_mbase_result::fetch_table_status(
&not_used_long, &not_used_uint);
} else
stat.check_time = (time_t) 0;
#ifndef DBUG_OFF
#ifdef DBUG_TRACE
{
struct tm *ts, tmp_ts;
char buf[80];
@@ -4036,7 +4036,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);
@@ -4193,7 +4193,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);