diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-07-08 15:06:43 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-07-08 15:06:43 +0500 |
| commit | fa936cb6cc6c721c20dac098083be12ba45c7e71 (patch) | |
| tree | 3f36bf7efaef43cf17a5d737576946d62feb7b50 /sql | |
| parent | 4adf180432bba0e2f7e67ecb8fa5aa6d9ed86bdb (diff) | |
| parent | c11b418db6e57a080ae1772f69d422bc850ba037 (diff) | |
| download | mariadb-git-fa936cb6cc6c721c20dac098083be12ba45c7e71.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 5 | ||||
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ea3c2d45333..edbc30bfe87 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -559,6 +559,7 @@ void free_prep_stmt(PREP_STMT *stmt, TREE_FREE mode, void *not_used); bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length); void mysql_stmt_execute(THD *thd, char *packet); void mysql_stmt_free(THD *thd, char *packet); +void mysql_stmt_reset(THD *thd, char *packet); void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length); int check_insert_fields(THD *thd,TABLE *table,List<Item> &fields, List<Item> &values, ulong counter); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 0db6ce8a642..00917e296ca 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1290,6 +1290,11 @@ restore_user: mysql_stmt_free(thd, packet); break; } + case COM_RESET_STMT: + { + mysql_stmt_reset(thd, packet); + break; + } case COM_QUERY: { if (alloc_query(thd, packet, packet_length)) diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index c38fb44db1c..550e4bbe086 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -965,7 +965,7 @@ void mysql_stmt_reset(THD *thd, char *packet) PREP_STMT *stmt; DBUG_ENTER("mysql_stmt_reset"); - if (!(stmt=find_prepared_statement(thd, stmt_id, "close"))) + if (!(stmt= find_prepared_statement(thd, stmt_id, "reset"))) { send_error(thd); DBUG_VOID_RETURN; |