diff options
| author | unknown <igor@rurik.mysql.com> | 2003-10-30 10:45:28 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-10-30 10:45:28 -0800 |
| commit | 52e86548c2ed957e1bef549c38a5b391cd3f47c6 (patch) | |
| tree | bfd8508896ec045400e82650920bcfd37e53a8f1 /sql/sql_lex.h | |
| parent | a4161274ef18a38eff95272cf9f05f46fb08fcb7 (diff) | |
| parent | 06ecf87e15d8e8d7ae24aa23ccead4a2c4bbc78e (diff) | |
| download | mariadb-git-52e86548c2ed957e1bef549c38a5b391cd3f47c6.tar.gz | |
Merge
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
isam/test2.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test2.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/func_group.result:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
SCCS merged
sql/set_var.cc:
SCCS merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 7545f525082..c31420b951c 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -59,7 +59,8 @@ enum enum_sql_command { SQLCOM_CHANGE_DB, SQLCOM_CREATE_DB, SQLCOM_DROP_DB, SQLCOM_ALTER_DB, SQLCOM_REPAIR, SQLCOM_REPLACE, SQLCOM_REPLACE_SELECT, SQLCOM_CREATE_FUNCTION, SQLCOM_DROP_FUNCTION, - SQLCOM_REVOKE,SQLCOM_OPTIMIZE, SQLCOM_CHECK, SQLCOM_PRELOAD_KEYS, + SQLCOM_REVOKE,SQLCOM_OPTIMIZE, SQLCOM_CHECK, + SQLCOM_ASSIGN_TO_KEYCACHE, SQLCOM_PRELOAD_KEYS, SQLCOM_FLUSH, SQLCOM_KILL, SQLCOM_ANALYZE, SQLCOM_ROLLBACK, SQLCOM_ROLLBACK_TO_SAVEPOINT, SQLCOM_COMMIT, SQLCOM_SAVEPOINT, @@ -257,6 +258,13 @@ public: virtual List<String>* get_use_index(); virtual List<String>* get_ignore_index(); virtual ulong get_table_join_options(); + virtual TABLE_LIST *add_table_to_list(THD *thd, Table_ident *table, + LEX_STRING *alias, + ulong table_options, + thr_lock_type flags= TL_UNLOCK, + List<String> *use_index= 0, + List<String> *ignore_index= 0, + LEX_STRING *option= 0); virtual void set_lock_for_tables(thr_lock_type lock_type) {} friend class st_select_lex_unit; @@ -443,8 +451,8 @@ public: ulong table_options, thr_lock_type flags= TL_UNLOCK, List<String> *use_index= 0, - List<String> *ignore_index= 0); - + List<String> *ignore_index= 0, + LEX_STRING *option= 0); TABLE_LIST* get_table_list(); List<Item>* get_item_list(); List<String>* get_use_index(); |