diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-21 12:54:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-21 12:54:56 +0200 |
| commit | 59d51f0c12d6f2bccc8354079be67c6e520d3675 (patch) | |
| tree | d4bf888eceb9434807dd4889fd04257d5bf5ad2b /libmysqld | |
| parent | fb8bc59f0120fbd3517a291e71d81c3d11443baa (diff) | |
| parent | 4368efe870f225279106798f71978b68c473e2ab (diff) | |
| download | mariadb-git-59d51f0c12d6f2bccc8354079be67c6e520d3675.tar.gz | |
Merge branch '10.2' into bb-10.2-connector-c-integ-subm
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 5ab72103f9d..b64348cdd70 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -111,6 +111,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/item_windowfunc.cc ../sql/sql_window.cc ../sql/sql_cte.cc ../sql/temporary_tables.cc + ../sql/session_tracker.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 4a84e63f222..555eadc9425 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -334,6 +334,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; @@ -1172,7 +1178,7 @@ bool net_send_ok(THD *thd, uint server_status, uint statement_warn_count, ulonglong affected_rows, ulonglong id, const char *message, - bool unused __attribute__((unused))) + bool, bool) { DBUG_ENTER("emb_net_send_ok"); MYSQL_DATA *data; |