diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-07-12 22:20:46 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-07-12 22:20:46 +0200 |
commit | c6fdb92ca829fed893d9e7324e80b1450de16087 (patch) | |
tree | 39fbccb1aea1a6a4234fe134a419f51a23232e61 /libmysqld | |
parent | f12ebed0a46d3051bbc76d62a8cd73b2b572364b (diff) | |
parent | 4e19aa386493fcf0613049b47cbb9b151e2d3e8d (diff) | |
download | mariadb-git-c6fdb92ca829fed893d9e7324e80b1450de16087.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/lib_sql.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index a5fef8ecdd0..281ac26ce91 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -341,6 +341,12 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) THD *thd; my_bool res; + if (stmt->param_count && !stmt->bind_param_done) + { + set_stmt_error(stmt, CR_PARAMS_NOT_BOUND, unknown_sqlstate, NULL); + DBUG_RETURN(1); + } + int4store(header, stmt->stmt_id); header[4]= (uchar) stmt->flags; thd= (THD*)stmt->mysql->thd; |