diff options
| author | unknown <monty@mysql.com> | 2003-11-28 13:31:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-28 13:31:38 +0200 |
| commit | ef43220170521a90454c05380cc01d562fc98c2f (patch) | |
| tree | 995a8061976a12fd5dfb02679e683b86c743879c /sql/sql_parse.cc | |
| parent | 03092d0c24067bf97359436e49e6cce7ca0e2803 (diff) | |
| parent | 183b02a8ac6074775bd8c33f036eed3cf6597bbe (diff) | |
| download | mariadb-git-ef43220170521a90454c05380cc01d562fc98c2f.tar.gz | |
Merge
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_derived.cc:
keep local copy
sql/sql_union.cc:
keep local copy
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a85cd5c648b..c50bfc43862 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4333,8 +4333,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, LEX_STRING *alias, ulong table_options, thr_lock_type lock_type, - List<String> *use_index, - List<String> *ignore_index, + List<String> *use_index_arg, + List<String> *ignore_index_arg, LEX_STRING *option) { register TABLE_LIST *ptr; @@ -4390,12 +4390,12 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ptr->force_index= test(table_options & TL_OPTION_FORCE_INDEX); ptr->ignore_leaves= test(table_options & TL_OPTION_IGNORE_LEAVES); ptr->derived= table->sel; - if (use_index) - ptr->use_index=(List<String> *) thd->memdup((gptr) use_index, - sizeof(*use_index)); - if (ignore_index) - ptr->ignore_index=(List<String> *) thd->memdup((gptr) ignore_index, - sizeof(*ignore_index)); + if (use_index_arg) + ptr->use_index=(List<String> *) thd->memdup((gptr) use_index_arg, + sizeof(*use_index_arg)); + if (ignore_index_arg) + ptr->ignore_index=(List<String> *) thd->memdup((gptr) ignore_index_arg, + sizeof(*ignore_index_arg)); ptr->option= option ? option->str : 0; /* check that used name is unique */ if (lock_type != TL_IGNORE) |