diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-09 22:43:23 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-09 22:43:23 +0200 |
| commit | 91f18f0a26e3714bd9edc78b1c6fe7a1fd243167 (patch) | |
| tree | 5ffbc6660efade54ba4bc490d83c1538515feb3e /sql/sql_lex.cc | |
| parent | ac2aea8c4a36175e844bbc884dfd5d38167cf181 (diff) | |
| parent | f7ff1cca148b8cb0742f3d23c0e05e797c673dc0 (diff) | |
| download | mariadb-git-91f18f0a26e3714bd9edc78b1c6fe7a1fd243167.tar.gz | |
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
innobase/mem/mem0pool.c:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index c7c7a97cdc2..dda3d4e822e 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1171,13 +1171,14 @@ List<String>* st_select_lex_node::get_use_index() { return 0; } List<String>* st_select_lex_node::get_ignore_index() { return 0; } TABLE_LIST *st_select_lex_node::add_table_to_list(THD *thd, Table_ident *table, LEX_STRING *alias, - bool updating, + ulong table_join_options, thr_lock_type flags, List<String> *use_index, List<String> *ignore_index) { return 0; } +ulong st_select_lex_node::get_table_join_options() { return 0; } /* This is used for UNION & subselect to create a new table list of all used @@ -1334,6 +1335,11 @@ List<String>* st_select_lex::get_ignore_index() return ignore_index_ptr; } +ulong st_select_lex::get_table_join_options() +{ + return table_join_options; +} + /* There are st_select_lex::add_table_to_list & st_select_lex::set_lock_for_tables in sql_parse.cc |