diff options
| author | Mayank Prasad <mayank.prasad@oracle.com> | 2011-06-14 00:11:24 +0530 |
|---|---|---|
| committer | Mayank Prasad <mayank.prasad@oracle.com> | 2011-06-14 00:11:24 +0530 |
| commit | 061983f9f311b3d5b6d3ef6db09a77a55048a04d (patch) | |
| tree | dad9115efb1b0b332a4ed2fe9fe43eddb43d9a65 /libmysqld | |
| parent | 10e3313366ff9b2050c4e8674381cb069cc1b770 (diff) | |
| download | mariadb-git-061983f9f311b3d5b6d3ef6db09a77a55048a04d.tar.gz | |
BUG#12561297:LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.
Issue:
When libmysqld/example/mysql_embedded is executed, it was getting abort. Its a
regression as it was working in 5.1 and failed in 5.5. Issue is there because
remaining_argc/remaining_argv were not getting assigned correctly in
init_embedded_server() which were being used later in init_common_variable().
Solution:
Rectified code to pass correct argc/argv to be used in init_common_variable().
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 34f8f685e45..eed5e90edcd 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -531,8 +531,8 @@ int init_embedded_server(int argc, char **argv, char **groups) return 1; defaults_argc= *argcp; defaults_argv= *argvp; - remaining_argc= argc; - remaining_argv= argv; + remaining_argc= *argcp; + remaining_argv= *argvp; /* Must be initialized early for comparison of options name */ system_charset_info= &my_charset_utf8_general_ci; |