mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
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
This commit is contained in:
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user