diff options
| author | monty@mashka.mysql.fi <> | 2002-11-16 20:19:10 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-11-16 20:19:10 +0200 |
| commit | 1a96948e81b079b1f84f98be9c6569e57f47a5a9 (patch) | |
| tree | 9cac640546f7a1615d184835e8fea1d18456e4e5 /sql/sql_class.h | |
| parent | aa67a7963266468927490cc3fc37089b721dc474 (diff) | |
| download | mariadb-git-1a96948e81b079b1f84f98be9c6569e57f47a5a9.tar.gz | |
Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling: Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 0f010b9de28..dba2ad130bf 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -461,6 +461,8 @@ public: THD(); ~THD(); + void init(void); + void change_user(void); void cleanup(void); bool store_globals(); #ifdef SIGNAL_WITH_VIO_CLOSE @@ -804,11 +806,9 @@ public: ha_rows deleted; uint num_of_tables; int error; - thr_lock_type lock_option; bool do_delete, transactional_tables, log_delayed, normal_tables; public: - multi_delete(THD *thd, TABLE_LIST *dt, thr_lock_type lock_option_arg, - uint num_of_tables); + multi_delete(THD *thd, TABLE_LIST *dt, uint num_of_tables); ~multi_delete(); int prepare(List<Item> &list); bool send_fields(List<Item> &list, @@ -829,7 +829,6 @@ public: ha_rows updated, found; List<Item> fields; List <Item> **fields_by_tables; - thr_lock_type lock_option; enum enum_duplicates dupl; uint num_of_tables, num_fields, num_updated, *save_time_stamps, *field_sequence; int error; @@ -837,7 +836,7 @@ public: public: multi_update(THD *thd_arg, TABLE_LIST *ut, List<Item> &fs, enum enum_duplicates handle_duplicates, - thr_lock_type lock_option_arg, uint num); + uint num); ~multi_update(); int prepare(List<Item> &list); bool send_fields(List<Item> &list, |