diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 14:02:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 14:02:37 +0200 |
| commit | 2ce52790ffc72c4a4d3670ebf67c6655450620f2 (patch) | |
| tree | 4be382f34905809f0a19e87574e2b07b91f5cb7c /sql/sql_lex.h | |
| parent | caa9023c9ed101acbcf6b9bd821a09daeb8271ee (diff) | |
| parent | 757daa4174ed1b8786d0307852f79885dd08ea89 (diff) | |
| download | mariadb-git-2ce52790ffc72c4a4d3670ebf67c6655450620f2.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 0142f812632..845e1242eb7 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -543,7 +543,7 @@ public: List<Index_hint> *hints= 0, List<String> *partition_names= 0, LEX_STRING *option= 0); - virtual void set_lock_for_tables(thr_lock_type lock_type) {} + virtual void set_lock_for_tables(thr_lock_type lock_type, bool for_update) {} friend class st_select_lex_unit; friend bool mysql_new_select(LEX *lex, bool move_down); @@ -963,7 +963,7 @@ public: TABLE_LIST *convert_right_join(); List<Item>* get_item_list(); ulong get_table_join_options(); - void set_lock_for_tables(thr_lock_type lock_type); + void set_lock_for_tables(thr_lock_type lock_type, bool for_update); inline void init_order() { order_list.elements= 0; |