summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorGeorg Richter <georg@mariadb.com>2016-02-01 16:10:49 +0100
committerKristian Nielsen <knielsen@knielsen-hq.org>2016-02-01 16:12:00 +0100
commit8cf1f50967ff58abb7d9688ae64ac662e66389c0 (patch)
tree08f3689273e449ab9d95361fa85eb945fd7e9b0b /sql-common
parent9c9d10b441fe79b111509949ca40afe1a6284c0f (diff)
downloadmariadb-git-8cf1f50967ff58abb7d9688ae64ac662e66389c0.tar.gz
MDEV-9112: Non-blocking client API missing on non-x86 platforms
The check for UCONTEXT in cmake was somehow become broken, disabling the fallback to ucontext. This caused the non-blocking client API to not be available for non-x86 platforms, on which no hand-crafted assembler implementation of my_context is available.
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 1bb4a250c69..f8bd483e8c2 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -4293,6 +4293,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);
}