Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
This commit is contained in:
unknown 2007-03-20 08:49:47 +01:00
commit a9f06b2f28

View File

@ -7561,13 +7561,13 @@ index_hint_definition:
{ {
Select->set_index_hint_type($1, $3); Select->set_index_hint_type($1, $3);
} }
'(' key_usage_list ')'; '(' key_usage_list ')'
| USE_SYM key_or_index index_hint_clause | USE_SYM key_or_index index_hint_clause
{ {
Select->set_index_hint_type(INDEX_HINT_USE, $3); Select->set_index_hint_type(INDEX_HINT_USE, $3);
} }
'(' opt_key_usage_list ')'; '(' opt_key_usage_list ')'
;
index_hints_list: index_hints_list:
index_hint_definition index_hint_definition