mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 07:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge MDEV-9112 into 10.0

Browse source 
Conflicts:
	configure.cmake
This commit is contained in:
Kristian Nielsen 2016-02-01 16:29:00 +01:00
commit 955126e31d
4 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sql-common/client.c
View file

@ -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);
}