diff options
| author | ramil@mysql.com <> | 2005-12-01 14:31:28 +0400 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-12-01 14:31:28 +0400 |
| commit | ab04ceafc7d40d3bf9ec242e89fb8d47f19a0ae4 (patch) | |
| tree | 5746856ab978783835427bbfa170928071efead0 /sql | |
| parent | d80feb9e215443918928a029ed8bbb1208b9ea3f (diff) | |
| parent | 37cfade0b4e4ceccd6c0ae547f518ba456c83f54 (diff) | |
| download | mariadb-git-ab04ceafc7d40d3bf9ec242e89fb8d47f19a0ae4.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp_head.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 9b7ce44c14a..81e10e59a9b 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1069,7 +1069,7 @@ int sp_head::execute(THD *thd) } /* we should cleanup free_list and memroot, used by instruction */ - thd->free_items(); + thd->cleanup_after_query(); free_root(&execute_mem_root, MYF(0)); /* diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 8237cacbdb0..989b8142202 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1949,6 +1949,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup, backup->last_insert_id= last_insert_id; backup->next_insert_id= next_insert_id; backup->insert_id_used= insert_id_used; + backup->clear_next_insert_id= clear_next_insert_id; backup->limit_found_rows= limit_found_rows; backup->examined_row_count= examined_row_count; backup->sent_row_count= sent_row_count; @@ -2000,6 +2001,7 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup) last_insert_id= backup->last_insert_id; next_insert_id= backup->next_insert_id; insert_id_used= backup->insert_id_used; + clear_next_insert_id= backup->clear_next_insert_id; limit_found_rows= backup->limit_found_rows; sent_row_count= backup->sent_row_count; client_capabilities= backup->client_capabilities; diff --git a/sql/sql_class.h b/sql/sql_class.h index e882d061dbf..e4e024cbb09 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1090,7 +1090,7 @@ public: ha_rows cuted_fields, sent_row_count, examined_row_count; ulong client_capabilities; uint in_sub_stmt; - bool enable_slow_log, insert_id_used; + bool enable_slow_log, insert_id_used, clear_next_insert_id; my_bool no_send_ok; SAVEPOINT *savepoints; }; |