mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
This commit is contained in:
@ -2839,8 +2839,8 @@ void st_select_lex::fix_prepare_information(THD *thd, Item **conds,
|
||||
|
||||
SYNOPSIS
|
||||
set_index_hint_type()
|
||||
type the kind of hints to be added from now on.
|
||||
clause the clause to use for hints to be added from now on.
|
||||
type_arg The kind of hints to be added from now on.
|
||||
clause The clause to use for hints to be added from now on.
|
||||
|
||||
DESCRIPTION
|
||||
Used in filling up the tagged hints list.
|
||||
@ -2849,10 +2849,10 @@ void st_select_lex::fix_prepare_information(THD *thd, Item **conds,
|
||||
Then the context variable index_hint_type can be reset to the
|
||||
next hint type.
|
||||
*/
|
||||
void st_select_lex::set_index_hint_type(enum index_hint_type type,
|
||||
void st_select_lex::set_index_hint_type(enum index_hint_type type_arg,
|
||||
index_clause_map clause)
|
||||
{
|
||||
current_index_hint_type= type;
|
||||
current_index_hint_type= type_arg;
|
||||
current_index_hint_clause= clause;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user