diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 20:32:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 20:32:15 +0200 |
| commit | 8049d2e9d98388296c86854d1291aa69afc78f44 (patch) | |
| tree | 148b3823dab34d668b7c546e783239caa896873b /sql/sql_lex.h | |
| parent | fb5ee7d6d043b01fabc59f09d70d532e843add60 (diff) | |
| parent | f0c19b6a57b699d113e3ae4a67920924bbecae45 (diff) | |
| download | mariadb-git-8049d2e9d98388296c86854d1291aa69afc78f44.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 6ec112cc038..6f49ef145a2 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -893,6 +893,9 @@ public: /* namp of nesting SELECT visibility (for aggregate functions check) */ nesting_map name_visibility_map; + /* it is for correct printing SELECT options */ + thr_lock_type lock_type; + void init_query(); void init_select(); st_select_lex_unit* master_unit() { return (st_select_lex_unit*) master; } |