summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2012-11-01 17:23:06 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2012-11-01 17:23:06 +0100
commit86c0a80b0dc961530d3376d21028510c180d2cbc (patch)
treefa77d300b92a13c2e2cb00a9c6bc09d904be00e1 /libmysql
parent40b8b951428bd91275234d67ebba858bdfb844cd (diff)
downloadmariadb-git-86c0a80b0dc961530d3376d21028510c180d2cbc.tar.gz
Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIENT_TEST
Add missing DBUG_RETURNs, otherwise the debug-stack gets messed up, and _db_enter_ and _db_exit_ will access data outside the current stack frame.
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 5d153317150..f7eb19520b7 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4653,7 +4653,7 @@ int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind,
if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE)
{
set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL);
- return 1;
+ DBUG_RETURN(1);
}
if (column >= stmt->field_count)
{