diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-03-17 16:29:24 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-03-17 16:29:24 -0400 |
| commit | 0d588edf61c93ab67fb7e26101a0fc00d021bb11 (patch) | |
| tree | 3c313f70fd16653491985d8e8108fb5b99f0d5d0 /sql/sql_lex.h | |
| parent | 5b7347bda31b9d66cd78937e5dc339f553b9a736 (diff) | |
| parent | 7ca1ebd83a1a7d291593be7a94f5a37298dfc863 (diff) | |
| download | mariadb-git-0d588edf61c93ab67fb7e26101a0fc00d021bb11.tar.gz | |
auto-merge
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 0eefe031c8d..f34a1c7c36f 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -688,6 +688,15 @@ public: int cur_pos_in_select_list; List<udf_func> udf_list; /* udf function calls stack */ + + /** + Per sub-query locking strategy. + Note: This variable might interfer with the corresponding statement-level + variable Lex::lock_option because on how different parser rules depend + on eachother. + */ + thr_lock_type lock_option; + /* This is a copy of the original JOIN USING list that comes from the parser. The parser : |