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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e1fc2f4d
Commit
e1fc2f4d
authored
Aug 24, 2013
by
Kentoku SHIBA
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix valgrind warnings.
parent
04471ba7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
storage/spider/ha_spider.cc
storage/spider/ha_spider.cc
+3
-0
storage/spider/spd_sys_table.cc
storage/spider/spd_sys_table.cc
+16
-2
No files found.
storage/spider/ha_spider.cc
View file @
e1fc2f4d
...
@@ -67,6 +67,7 @@ ha_spider::ha_spider(
...
@@ -67,6 +67,7 @@ ha_spider::ha_spider(
conns
=
NULL
;
conns
=
NULL
;
need_mons
=
NULL
;
need_mons
=
NULL
;
condition
=
NULL
;
condition
=
NULL
;
cond_check
=
FALSE
;
blob_buff
=
NULL
;
blob_buff
=
NULL
;
conn_keys
=
NULL
;
conn_keys
=
NULL
;
spider_thread_id
=
0
;
spider_thread_id
=
0
;
...
@@ -159,6 +160,7 @@ ha_spider::ha_spider(
...
@@ -159,6 +160,7 @@ ha_spider::ha_spider(
conns
=
NULL
;
conns
=
NULL
;
need_mons
=
NULL
;
need_mons
=
NULL
;
condition
=
NULL
;
condition
=
NULL
;
cond_check
=
FALSE
;
blob_buff
=
NULL
;
blob_buff
=
NULL
;
conn_keys
=
NULL
;
conn_keys
=
NULL
;
spider_thread_id
=
0
;
spider_thread_id
=
0
;
...
@@ -1676,6 +1678,7 @@ int ha_spider::reset()
...
@@ -1676,6 +1678,7 @@ int ha_spider::reset()
spider_free
(
spider_current_trx
,
condition
,
MYF
(
0
));
spider_free
(
spider_current_trx
,
condition
,
MYF
(
0
));
condition
=
tmp_cond
;
condition
=
tmp_cond
;
}
}
cond_check
=
FALSE
;
#ifdef HA_MRR_USE_DEFAULT_IMPL
#ifdef HA_MRR_USE_DEFAULT_IMPL
if
(
multi_range_keys
)
if
(
multi_range_keys
)
{
{
...
...
storage/spider/spd_sys_table.cc
View file @
e1fc2f4d
...
@@ -371,15 +371,29 @@ int spider_get_sys_table_by_idx(
...
@@ -371,15 +371,29 @@ int spider_get_sys_table_by_idx(
const
int
col_count
const
int
col_count
)
{
)
{
int
error_num
;
int
error_num
;
uint
key_length
;
KEY
*
key_info
=
table
->
key_info
;
DBUG_ENTER
(
"spider_get_sys_table_by_idx"
);
DBUG_ENTER
(
"spider_get_sys_table_by_idx"
);
if
((
error_num
=
spider_sys_index_init
(
table
,
idx
,
FALSE
)))
if
((
error_num
=
spider_sys_index_init
(
table
,
idx
,
FALSE
)))
DBUG_RETURN
(
error_num
);
DBUG_RETURN
(
error_num
);
if
((
int
)
key_info
->
key_parts
==
col_count
)
{
key_length
=
key_info
->
key_length
;
}
else
{
int
roop_count
;
key_length
=
0
;
for
(
roop_count
=
0
;
roop_count
<
col_count
;
++
roop_count
)
{
key_length
+=
key_info
->
key_part
[
roop_count
].
store_length
;
}
}
key_copy
(
key_copy
(
(
uchar
*
)
table_key
,
(
uchar
*
)
table_key
,
table
->
record
[
0
],
table
->
record
[
0
],
table
->
key_info
,
key_info
,
table
->
key_info
->
key_length
);
key_length
);
if
(
if
(
/*
/*
...
...
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