diff options
| author | monty@mysql.com <> | 2005-08-15 18:35:48 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-08-15 18:35:48 +0300 |
| commit | 1a6f16edd94570eb8359e94149d5393d3dd82888 (patch) | |
| tree | 613842f6646a144777e4e07d77c2a89dbb659781 /sql/sql_derived.cc | |
| parent | d0c66bbaa3446f44a1cdd38ffde7527c0a058e2d (diff) | |
| parent | 4880d22b79fc3ab486a4ec0b4f267bfbe06b367c (diff) | |
| download | mariadb-git-1a6f16edd94570eb8359e94149d5393d3dd82888.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index fc9d15e94c4..7b9191cd841 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -125,6 +125,11 @@ int mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *orig_table_list) if ((res= unit->prepare(thd, derived_result, 0, orig_table_list->alias))) goto exit; + if (check_duplicate_names(unit->types, 0)) + { + res= -1; + goto exit; + } derived_result->tmp_table_param.init(); derived_result->tmp_table_param.field_count= unit->types.elements; |