diff options
author | unknown <konstantin@mysql.com> | 2005-02-10 16:58:02 +0300 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2005-02-10 16:58:02 +0300 |
commit | c7674f14248e41dc76ca32feedf7dd76cc1ad7f8 (patch) | |
tree | e4cdc7197bc74eca4ad26370116105b9d7baa1f3 /libmysql | |
parent | 77b2435e4ef22271984551eb6195d64b475ede14 (diff) | |
parent | fca90750dfa0a2bee85a4824aba7c2197d45587c (diff) | |
download | mariadb-git-c7674f14248e41dc76ca32feedf7dd76cc1ad7f8.tar.gz |
manual merge
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index a1e13be8e25..48af83f4de5 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -2499,6 +2499,11 @@ int cli_stmt_execute(MYSQL_STMT *stmt) set_stmt_error(stmt, CR_PARAMS_NOT_BOUND, unknown_sqlstate); DBUG_RETURN(1); } + if (stmt->mysql->status != MYSQL_STATUS_READY) + { + set_stmt_error(stmt, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate); + DBUG_RETURN(1); + } net_clear(net); /* Sets net->write_pos */ /* Reserve place for null-marker bytes */ |