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
3faa15cf
Commit
3faa15cf
authored
Mar 17, 2020
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't give warnings from safemalloc for aria_pack --help
parent
6736f152
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
storage/maria/maria_pack.c
storage/maria/maria_pack.c
+14
-5
No files found.
storage/maria/maria_pack.c
View file @
3faa15cf
...
...
@@ -204,6 +204,7 @@ static QUEUE queue;
static
HUFF_COUNTS
*
global_count
;
static
char
zero_string
[]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
static
const
char
*
load_default_groups
[]
=
{
"ariapack"
,
0
};
static
char
**
default_argv
;
/*
Register handler error messages for usage with my_error()
...
...
@@ -225,7 +226,6 @@ int main(int argc, char **argv)
{
int
error
,
ok
;
PACK_MRG_INFO
merge
;
char
**
default_argv
;
my_bool
no_control_file
=
0
;
MY_INIT
(
argv
[
0
]);
...
...
@@ -293,6 +293,14 @@ int main(int argc, char **argv)
#endif
}
static
void
my_exit
(
int
error
)
{
free_defaults
(
default_argv
);
maria_end
();
my_end
(
verbose
?
MY_CHECK_ERROR
|
MY_GIVE_INFO
:
MY_CHECK_ERROR
);
exit
(
error
);
}
enum
options_mp
{
OPT_CHARSETS_DIR_MP
=
256
,
OPT_AUTO_CLOSE
};
static
struct
my_option
my_long_options
[]
=
...
...
@@ -414,11 +422,12 @@ get_one_option(const struct my_option *opt,
break
;
case
'V'
:
print_version
();
exit
(
0
);
my_exit
(
0
);
break
;
case
'I'
:
case
'?'
:
usage
();
exit
(
0
);
my_
exit
(
0
);
}
return
0
;
}
...
...
@@ -435,12 +444,12 @@ static void get_options(int *argc,char ***argv)
write_loop
=
1
;
if
((
ho_error
=
handle_options
(
argc
,
argv
,
my_long_options
,
get_one_option
)))
exit
(
ho_error
);
my_
exit
(
ho_error
);
if
(
!*
argc
)
{
usage
();
exit
(
1
);
my_
exit
(
1
);
}
if
(
join_table
)
{
...
...
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