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
932baa94
Commit
932baa94
authored
Mar 04, 2020
by
Kentoku SHIBA
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix build errors on windows environments
parent
6c3180be
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
storage/spider/ha_spider.cc
storage/spider/ha_spider.cc
+3
-3
storage/spider/spd_conn.cc
storage/spider/spd_conn.cc
+8
-6
storage/spider/spd_db_mysql.cc
storage/spider/spd_db_mysql.cc
+3
-2
No files found.
storage/spider/ha_spider.cc
View file @
932baa94
...
...
@@ -9332,7 +9332,7 @@ ulong ha_spider::table_flags_for_partition()
{
DBUG_ENTER
(
"ha_spider::table_flags_for_partition"
);
DBUG_PRINT
(
"info"
,(
"spider this=%p"
,
this
));
DBUG_RETURN
(
ulong
flags
=
#ifdef HA_PT_CALL_AT_ONCE_STORE_LOCK
HA_PT_CALL_AT_ONCE_STORE_LOCK
|
#endif
...
...
@@ -9354,8 +9354,8 @@ ulong ha_spider::table_flags_for_partition()
#ifdef HA_PT_CALL_AT_ONCE_TOP_TABLE
HA_PT_CALL_AT_ONCE_TOP_TABLE
|
#endif
0
);
0
;
DBUG_RETURN
(
flags
);
}
const
char
*
ha_spider
::
index_type
(
...
...
storage/spider/spd_conn.cc
View file @
932baa94
...
...
@@ -26,6 +26,7 @@
#include "probes_mysql.h"
#include "sql_class.h"
#include "sql_partition.h"
#include "sql_table.h"
#include "tztime.h"
#endif
#include "spd_err.h"
...
...
@@ -1923,15 +1924,16 @@ int spider_conn_queue_loop_check(
(
uchar
*
)
loop_check_buf
,
buf_sz
-
1
);
#endif
pthread_mutex_lock
(
&
conn
->
loop_check_mutex
);
if
(
unlikely
(
#ifdef SPIDER_HAS_HASH_VALUE_TYPE
!
(
lcptr
=
(
SPIDER_CONN_LOOP_CHECK
*
)
my_hash_search_using_hash_value
(
&
conn
->
loop_checked
,
hash_value
,
(
uchar
*
)
loop_check_buf
,
buf_sz
-
1
))
||
lcptr
=
(
SPIDER_CONN_LOOP_CHECK
*
)
my_hash_search_using_hash_value
(
&
conn
->
loop_checked
,
hash_value
,
(
uchar
*
)
loop_check_buf
,
buf_sz
-
1
);
#else
!
(
lcptr
=
(
SPIDER_CONN_LOOP_CHECK
*
)
my_hash_search
(
&
conn
->
loop_checked
,
(
uchar
*
)
loop_check_buf
,
buf_sz
-
1
))
||
lcptr
=
(
SPIDER_CONN_LOOP_CHECK
*
)
my_hash_search
(
&
conn
->
loop_checked
,
(
uchar
*
)
loop_check_buf
,
buf_sz
-
1
);
#endif
if
(
unlikely
(
!
lcptr
||
(
!
lcptr
->
flag
&&
(
...
...
storage/spider/spd_db_mysql.cc
View file @
932baa94
...
...
@@ -2359,8 +2359,9 @@ int spider_db_mbase::print_warnings(
DBUG_PRINT
(
"info"
,(
"spider row[2]=%s"
,
row
[
2
]));
longlong
res_num
=
(
longlong
)
my_strtoll10
(
row
[
1
],
(
char
**
)
NULL
,
&
error_num
);
my_printf_error
(
res_num
,
row
[
2
],
MYF
(
0
));
error_num
=
res_num
;
DBUG_PRINT
(
"info"
,(
"spider res_num=%lld"
,
res_num
));
my_printf_error
((
int
)
res_num
,
row
[
2
],
MYF
(
0
));
error_num
=
(
int
)
res_num
;
row
=
mysql_fetch_row
(
res
);
}
}
...
...
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