diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-29 17:06:26 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-29 17:06:26 +0200 |
| commit | 614a610ad30f3fad3ab3f1d5774d95c7416f1a76 (patch) | |
| tree | 5c8bf57b12db47384654bd4f4bfe1539401a8503 /sql/sql_parse.cc | |
| parent | 8e02b39abd5868b8c7ed3c94780c6636a5667b0c (diff) | |
| parent | 66e3b9d7e66a89b73c8e13ee76dbfcaf47098034 (diff) | |
| download | mariadb-git-614a610ad30f3fad3ab3f1d5774d95c7416f1a76.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 70fb5acdffd..bce05095bcc 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3410,8 +3410,15 @@ TABLE_LIST *st_select_lex::add_table_to_list(Table_ident *table, } if (!alias) /* Alias is case sensitive */ + { + if (table->sel) + { + net_printf(thd,ER_DERIVED_MUST_HAVE_ALIAS); + DBUG_RETURN(0); + } if (!(alias_str=thd->memdup(alias_str,table->table.length+1))) DBUG_RETURN(0); + } if (!(ptr = (TABLE_LIST *) thd->calloc(sizeof(TABLE_LIST)))) DBUG_RETURN(0); /* purecov: inspected */ |