Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0d586d62
Commit
0d586d62
authored
Nov 20, 2022
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-29613 fixup: Fix Spider
parent
20969aa4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
storage/spider/spd_conn.cc
storage/spider/spd_conn.cc
+4
-4
storage/spider/spd_db_mysql.cc
storage/spider/spd_db_mysql.cc
+7
-7
storage/spider/spd_table.cc
storage/spider/spd_table.cc
+1
-1
storage/spider/spd_table.h
storage/spider/spd_table.h
+1
-1
No files found.
storage/spider/spd_conn.cc
View file @
0d586d62
...
...
@@ -128,7 +128,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
));
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
spider_print_keys
(
conn
->
conn_key
,
conn
->
conn_key_length
);
#endif
DBUG_RETURN
((
uchar
*
)
conn
->
conn_key
);
...
...
@@ -829,19 +829,19 @@ SPIDER_CONN *spider_get_conn(
if
(
conn_kind
==
SPIDER_CONN_KIND_MYSQL
)
{
#endif
#if
ndef DBUG_OFF
#if
def 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
];
#if
ndef DBUG_OFF
#if
def 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
];
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
spider_print_keys
(
conn_key
,
share
->
hs_write_conn_keys_lengths
[
link_idx
]);
#endif
}
...
...
storage/spider/spd_db_mysql.cc
View file @
0d586d62
...
...
@@ -902,7 +902,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif
}
else
stat
.
create_time
=
(
time_t
)
0
;
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
{
struct
tm
*
ts
,
tmp_ts
;
char
buf
[
80
];
...
...
@@ -952,7 +952,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif
}
else
stat
.
check_time
=
(
time_t
)
0
;
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
{
struct
tm
*
ts
,
tmp_ts
;
char
buf
[
80
];
...
...
@@ -1031,7 +1031,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif
}
else
stat
.
create_time
=
(
time_t
)
0
;
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
{
struct
tm
*
ts
,
tmp_ts
;
char
buf
[
80
];
...
...
@@ -1056,7 +1056,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif
}
else
stat
.
update_time
=
(
time_t
)
0
;
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
{
struct
tm
*
ts
,
tmp_ts
;
char
buf
[
80
];
...
...
@@ -1081,7 +1081,7 @@ int spider_db_mbase_result::fetch_table_status(
#endif
}
else
stat
.
check_time
=
(
time_t
)
0
;
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
{
struct
tm
*
ts
,
tmp_ts
;
char
buf
[
80
];
...
...
@@ -4065,7 +4065,7 @@ int spider_db_mariadb_util::append_column_value(ha_spider *spider,
ptr
=
tmp_str
.
get_str
();
}
else
if
(
field
->
type
()
==
MYSQL_TYPE_GEOMETRY
)
{
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
double
xmin
,
xmax
,
ymin
,
ymax
;
float8get
(
xmin
,
new_ptr
);
float8get
(
xmax
,
new_ptr
+
8
);
...
...
@@ -4222,7 +4222,7 @@ int spider_db_mysql_util::append_column_value(
}
tmp_str.length(SIZEOF_STORED_DOUBLE * lcnt);
*/
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
double
xmin
,
xmax
,
ymin
,
ymax
;
/*
float8store(buf,xmin);
...
...
storage/spider/spd_table.cc
View file @
0d586d62
...
...
@@ -3986,7 +3986,7 @@ int spider_set_connect_info_default_dbtable(
));
}
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
void
spider_print_keys
(
const
char
*
key
,
uint
length
...
...
storage/spider/spd_table.h
View file @
0d586d62
...
...
@@ -439,7 +439,7 @@ int spider_set_connect_info_default_dbtable(
int
dbtable_name_length
);
#if
ndef DBUG_OFF
#if
def DBUG_TRACE
void
spider_print_keys
(
const
char
*
key
,
uint
length
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment