diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:40:20 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:40:20 +0100 |
| commit | 91ff0172972fdc3b858d6272b653f70a5650b067 (patch) | |
| tree | 181b1fb38fff3e466167d8431b6c23a77e76a73e /sql-common | |
| parent | a96fbc3c352dad89c6007672eedf437e0516abe0 (diff) | |
| parent | 8cf1f50967ff58abb7d9688ae64ac662e66389c0 (diff) | |
| download | mariadb-git-91ff0172972fdc3b858d6272b653f70a5650b067.tar.gz | |
Merge MDEV-9112 into 10.1
Conflicts:
config.h.cmake
configure.cmake
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 36a644cb90f..f846c0e19a2 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -4337,6 +4337,7 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg) stacksize= ASYNC_CONTEXT_DEFAULT_STACK_SIZE; if (my_context_init(&ctxt->async_context, stacksize)) { + set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate); my_free(ctxt); DBUG_RETURN(1); } |