diff options
| author | unknown <ramil@mysql.com> | 2005-12-01 14:31:28 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-12-01 14:31:28 +0400 |
| commit | babaa74e8a2c6548a726ace86ab1cf0c7c323e0e (patch) | |
| tree | 5746856ab978783835427bbfa170928071efead0 /sql/sql_class.cc | |
| parent | c9ef409150a1cdcdd0ab3d618baec592db45de78 (diff) | |
| parent | f853fbc9f43e76018752cab3b91e04157dd9b097 (diff) | |
| download | mariadb-git-babaa74e8a2c6548a726ace86ab1cf0c7c323e0e.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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; |