diff options
| author | Monty <monty@mariadb.org> | 2016-04-28 16:59:33 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-04-28 16:59:33 +0300 |
| commit | 9c846373f02d6431d83add639e7560a69ba885a2 (patch) | |
| tree | 101d110d3ec9a4796b4050779fb052120fd6d516 /libmysqld | |
| parent | fabeab781920dfcaf8e606708ba2c6812f6ae5d8 (diff) | |
| parent | d5822a3ad0657040114cdc185c6387b9eb3a12b2 (diff) | |
| download | mariadb-git-9c846373f02d6431d83add639e7560a69ba885a2.tar.gz | |
Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 476981023fd..a067856b287 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -517,6 +517,9 @@ int init_embedded_server(int argc, char **argv, char **groups) if (my_thread_init()) return 1; + if (init_early_variables()) + return 1; + if (argc) { argcp= &argc; |