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
7ab7abdb
Commit
7ab7abdb
authored
Jun 16, 2016
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation failure when compiling with std=c90
Change variable declaration to be before any other statements.
parent
b644661e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
storage/maria/ma_sort.c
storage/maria/ma_sort.c
+2
-3
storage/myisam/sort.c
storage/myisam/sort.c
+3
-4
No files found.
storage/maria/ma_sort.c
View file @
7ab7abdb
...
@@ -335,15 +335,14 @@ static ha_rows find_all_keys(MARIA_SORT_PARAM *info, uint keys,
...
@@ -335,15 +335,14 @@ static ha_rows find_all_keys(MARIA_SORT_PARAM *info, uint keys,
static
my_bool
_ma_thr_find_all_keys_exec
(
MARIA_SORT_PARAM
*
sort_param
)
static
my_bool
_ma_thr_find_all_keys_exec
(
MARIA_SORT_PARAM
*
sort_param
)
{
{
DBUG_ENTER
(
"_ma_thr_find_all_keys"
);
DBUG_PRINT
(
"enter"
,
(
"master: %d"
,
sort_param
->
master
));
my_bool
error
=
FALSE
;
my_bool
error
=
FALSE
;
ulonglong
memavl
,
old_memavl
;
ulonglong
memavl
,
old_memavl
;
uint
UNINIT_VAR
(
keys
),
idx
;
uint
UNINIT_VAR
(
keys
),
idx
;
uint
sort_length
;
uint
sort_length
;
uint
maxbuffer
;
uint
maxbuffer
;
uchar
**
sort_keys
=
NULL
;
uchar
**
sort_keys
=
NULL
;
DBUG_ENTER
(
"_ma_thr_find_all_keys"
);
DBUG_PRINT
(
"enter"
,
(
"master: %d"
,
sort_param
->
master
));
if
(
sort_param
->
sort_info
->
got_error
)
if
(
sort_param
->
sort_info
->
got_error
)
DBUG_RETURN
(
TRUE
);
DBUG_RETURN
(
TRUE
);
...
...
storage/myisam/sort.c
View file @
7ab7abdb
...
@@ -321,16 +321,15 @@ static ha_rows find_all_keys(MI_SORT_PARAM *info, uint keys,
...
@@ -321,16 +321,15 @@ static ha_rows find_all_keys(MI_SORT_PARAM *info, uint keys,
static
my_bool
thr_find_all_keys_exec
(
MI_SORT_PARAM
*
sort_param
)
static
my_bool
thr_find_all_keys_exec
(
MI_SORT_PARAM
*
sort_param
)
{
{
DBUG_ENTER
(
"thr_find_all_keys"
);
DBUG_PRINT
(
"enter"
,
(
"master: %d"
,
sort_param
->
master
));
ulonglong
memavl
,
old_memavl
;
ulonglong
memavl
,
old_memavl
;
uint
UNINIT_VAR
(
keys
),
idx
;
uint
UNINIT_VAR
(
keys
),
idx
;
uint
sort_length
;
uint
sort_length
;
uint
maxbuffer
;
uint
maxbuffer
;
uchar
**
sort_keys
=
NULL
;
uchar
**
sort_keys
=
NULL
;
my_bool
error
=
FALSE
;
my_bool
error
=
FALSE
;
DBUG_ENTER
(
"thr_find_all_keys"
);
DBUG_PRINT
(
"enter"
,
(
"master: %d"
,
sort_param
->
master
));
if
(
sort_param
->
sort_info
->
got_error
)
if
(
sort_param
->
sort_info
->
got_error
)
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
...
...
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