diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:29:00 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-02-01 16:29:00 +0100 |
| commit | 955126e31d091a8588f1b6f23506c5d63a644904 (patch) | |
| tree | ba76de07c0c6f92eef71b62a587ab5b503710560 /sql-common | |
| parent | a4ff37e912ee50d2ccee7fa50a361f9990ac78b4 (diff) | |
| parent | 8cf1f50967ff58abb7d9688ae64ac662e66389c0 (diff) | |
| download | mariadb-git-955126e31d091a8588f1b6f23506c5d63a644904.tar.gz | |
Merge MDEV-9112 into 10.0
Conflicts:
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 d20759cc0ad..8ad50e00eaf 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -4338,6 +4338,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); } |