database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Code Activity

5.1 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-05-18 14:23:05 +02:00
parent 5a47413934 57f824b099
commit 280fcf0808
109 changed files with 2542 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysqld/lib_sql.cc
View File

@@ -343,6 +343,8 @@ static int emb_stmt_execute(MYSQL_STMT *stmt)
set_stmt_errmsg(stmt, net);
DBUG_RETURN(1);
}
else if (stmt->mysql->status == MYSQL_STATUS_GET_RESULT)
stmt->mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT;
DBUG_RETURN(0);
}