diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-09 22:42:31 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-09 22:42:31 +0200 |
| commit | f7ff1cca148b8cb0742f3d23c0e05e797c673dc0 (patch) | |
| tree | f816bf52a43930fec89dbe67f90d81dd28b28a78 /sql/sql_lex.cc | |
| parent | 9d812016c1287fe06a0c0715f0b2852c919cff82 (diff) | |
| download | mariadb-git-f7ff1cca148b8cb0742f3d23c0e05e797c673dc0.tar.gz | |
Post merge fix
Allow empty key list in USE|IGNORE|FORCE INDEX()
mysql-test/r/myisam.result:
New explain format
mysql-test/t/myisam.test:
test of index()
mysys/my_handler.c:
Updated ha_key_cmp() to be as latest _mi_key_cmp() in 4.0
sql/sql_lex.cc:
Post merge fix
sql/sql_lex.h:
Post merge fix
sql/sql_parse.cc:
Post merge fix
sql/sql_yacc.yy:
Post merge fix for FORCE INDEX ()
Allow empty key list in USE|IGNORE|FORCE INDEX()
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 c7595c7ec5c..d22d5b8e0af 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 |