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.h | |
| 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.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index b32e4489b01..4b6ac927f07 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -243,7 +243,7 @@ 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 ulong get_table_join_options(); virtual TABLE_LIST *add_table_to_list(THD *thd, Table_ident *table, LEX_STRING *alias, ulong table_options, @@ -375,7 +375,7 @@ public: List<Item>* get_item_list(); List<String>* get_use_index(); List<String>* get_ignore_index(); - ulong table_join_options(); + ulong get_table_join_options(); TABLE_LIST* add_table_to_list(THD *thd, Table_ident *table, LEX_STRING *alias, ulong table_options, |