diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-09 03:55:26 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-09 03:55:26 +0200 |
| commit | 9d812016c1287fe06a0c0715f0b2852c919cff82 (patch) | |
| tree | af09adc5a3ec6814545553d72fda1d33e443d162 /sql/sql_lex.h | |
| parent | cd2f741d5d2cc52928668c6ce1f77052d1ca8a3b (diff) | |
| parent | cf2ef3c68f696707671a96c8a2ad6c8449390f4a (diff) | |
| download | mariadb-git-9d812016c1287fe06a0c0715f0b2852c919cff82.tar.gz | |
merge with 4.0.9
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
client/mysqladmin.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/Makefile.am:
Auto merged
include/my_base.h:
Auto merged
innobase/log/log0log.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/myisam.result:
Auto merged
sql/lex.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/test-insert.sh:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
configure.in:
merge with 4.0.9
innobase/btr/btr0pcur.c:
merge with 4.0.9
myisam/mi_check.c:
merge with 4.0.9
myisam/mi_search.c:
merge with 4.0.9
mysql-test/t/myisam.test:
merge with 4.0.9
sql/log_event.cc:
merge with 4.0.9
sql/mysql_priv.h:
merge with 4.0.9
sql/sql_lex.h:
merge with 4.0.9
sql/sql_parse.cc:
merge with 4.0.9
sql/sql_yacc.yy:
merge with 4.0.9
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 9b8f4a47515..b32e4489b01 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -243,9 +243,10 @@ public: virtual List<Item>* get_item_list(); virtual List<String>* get_use_index(); virtual List<String>* get_ignore_index(); + virtual ulong table_join_options(); virtual TABLE_LIST *add_table_to_list(THD *thd, Table_ident *table, LEX_STRING *alias, - bool updating, + ulong table_options, thr_lock_type flags= TL_UNLOCK, List<String> *use_index= 0, List<String> *ignore_index= 0); @@ -336,6 +337,7 @@ public: List<Item_func_match> ftfunc_list_alloc; JOIN *join; /* after JOIN::prepare it is pointer to corresponding JOIN */ const char *type; /* type of select for EXPLAIN */ + ulong table_join_options; uint in_sum_expr; uint select_number; /* number of select (used for EXPLAIN) */ bool braces; /* SELECT ... UNION (SELECT ... ) <- this braces */ @@ -373,9 +375,10 @@ public: List<Item>* get_item_list(); List<String>* get_use_index(); List<String>* get_ignore_index(); + ulong table_join_options(); TABLE_LIST* add_table_to_list(THD *thd, Table_ident *table, LEX_STRING *alias, - bool updating, + ulong table_options, thr_lock_type flags= TL_UNLOCK, List<String> *use_index= 0, List<String> *ignore_index= 0); |