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
f5b76d8c
Commit
f5b76d8c
authored
Dec 06, 2019
by
Kentoku
Committed by
Kentoku SHIBA
Dec 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compiler warnings
parent
aab6cefe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
storage/spider/spd_conn.cc
storage/spider/spd_conn.cc
+4
-2
storage/spider/spd_db_mysql.cc
storage/spider/spd_db_mysql.cc
+2
-2
storage/spider/spd_include.h
storage/spider/spd_include.h
+1
-1
No files found.
storage/spider/spd_conn.cc
View file @
f5b76d8c
...
@@ -4565,16 +4565,18 @@ SPIDER_IP_PORT_CONN* spider_create_ipport_conn(SPIDER_CONN *conn)
...
@@ -4565,16 +4565,18 @@ SPIDER_IP_PORT_CONN* spider_create_ipport_conn(SPIDER_CONN *conn)
goto
err_malloc_key
;
goto
err_malloc_key
;
}
}
ret
->
key
=
(
char
*
)
my_malloc
(
ret
->
key_len
,
MY_ZEROFILL
|
MY_WME
);
ret
->
key
=
(
char
*
)
my_malloc
(
ret
->
key_len
+
conn
->
tgt_host_length
+
1
,
MY_ZEROFILL
|
MY_WME
);
if
(
!
ret
->
key
)
{
if
(
!
ret
->
key
)
{
pthread_cond_destroy
(
&
ret
->
cond
);
pthread_cond_destroy
(
&
ret
->
cond
);
pthread_mutex_destroy
(
&
ret
->
mutex
);
pthread_mutex_destroy
(
&
ret
->
mutex
);
goto
err_malloc_key
;
goto
err_malloc_key
;
}
}
ret
->
remote_ip_str
=
ret
->
key
+
ret
->
key_len
;
memcpy
(
ret
->
key
,
conn
->
conn_key
,
ret
->
key_len
);
memcpy
(
ret
->
key
,
conn
->
conn_key
,
ret
->
key_len
);
strncpy
(
ret
->
remote_ip_str
,
conn
->
tgt_host
,
sizeof
(
ret
->
remote_ip_str
)
);
memcpy
(
ret
->
remote_ip_str
,
conn
->
tgt_host
,
conn
->
tgt_host_length
);
ret
->
remote_port
=
conn
->
tgt_port
;
ret
->
remote_port
=
conn
->
tgt_port
;
ret
->
conn_id
=
conn
->
conn_id
;
ret
->
conn_id
=
conn
->
conn_id
;
ret
->
ip_port_count
=
1
;
// init
ret
->
ip_port_count
=
1
;
// init
...
...
storage/spider/spd_db_mysql.cc
View file @
f5b76d8c
...
@@ -14131,7 +14131,7 @@ int spider_mbase_handler::simple_action(
...
@@ -14131,7 +14131,7 @@ int spider_mbase_handler::simple_action(
SPIDER_DB_RESULT
*
res
;
SPIDER_DB_RESULT
*
res
;
SPIDER_SHARE
*
share
=
spider
->
share
;
SPIDER_SHARE
*
share
=
spider
->
share
;
uint
pos
=
spider
->
conn_link_idx
[
link_idx
];
uint
pos
=
spider
->
conn_link_idx
[
link_idx
];
spider_string
*
str
;
spider_string
*
str
=
NULL
;
DBUG_ENTER
(
"spider_mbase_handler::simple_action"
);
DBUG_ENTER
(
"spider_mbase_handler::simple_action"
);
switch
(
simple_action
)
switch
(
simple_action
)
{
{
...
@@ -14172,7 +14172,7 @@ int spider_mbase_handler::simple_action(
...
@@ -14172,7 +14172,7 @@ int spider_mbase_handler::simple_action(
#endif
#endif
default:
default:
DBUG_ASSERT
(
0
);
DBUG_ASSERT
(
0
);
break
;
DBUG_RETURN
(
0
)
;
}
}
pthread_mutex_lock
(
&
conn
->
mta_conn_mutex
);
pthread_mutex_lock
(
&
conn
->
mta_conn_mutex
);
SPIDER_SET_FILE_POS
(
&
conn
->
mta_conn_mutex_file_pos
);
SPIDER_SET_FILE_POS
(
&
conn
->
mta_conn_mutex_file_pos
);
...
...
storage/spider/spd_include.h
View file @
f5b76d8c
...
@@ -1452,7 +1452,7 @@ typedef struct st_spider_ip_port_conn {
...
@@ -1452,7 +1452,7 @@ typedef struct st_spider_ip_port_conn {
#ifdef SPIDER_HAS_HASH_VALUE_TYPE
#ifdef SPIDER_HAS_HASH_VALUE_TYPE
my_hash_value_type
key_hash_value
;
my_hash_value_type
key_hash_value
;
#endif
#endif
char
remote_ip_str
[
SPIDER_CONN_META_BUF_LEN
]
;
char
*
remote_ip_str
;
long
remote_port
;
long
remote_port
;
ulong
ip_port_count
;
ulong
ip_port_count
;
volatile
ulong
waiting_count
;
volatile
ulong
waiting_count
;
...
...
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