1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge neptunus.(none):/home/msvensson/mysql/bug10713

into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
This commit is contained in:
msvensson@neptunus.(none)
2005-09-13 09:41:01 +02:00
6 changed files with 168 additions and 23 deletions

View File

@ -13875,13 +13875,20 @@ void st_table_list::print(THD *thd, String *str)
const char *cmp_name; // Name to compare with alias
if (view_name.str)
{
append_identifier(thd, str, view_db.str, view_db.length);
str->append('.');
// A view
if (!(belong_to_view &&
belong_to_view->compact_view_format))
{
append_identifier(thd, str, view_db.str, view_db.length);
str->append('.');
}
append_identifier(thd, str, view_name.str, view_name.length);
cmp_name= view_name.str;
}
else if (derived)
{
// A derived table
str->append('(');
derived->print(str);
str->append(')');
@ -13889,8 +13896,14 @@ void st_table_list::print(THD *thd, String *str)
}
else
{
append_identifier(thd, str, db, db_length);
str->append('.');
// A normal table
if (!(belong_to_view &&
belong_to_view->compact_view_format))
{
append_identifier(thd, str, db, db_length);
str->append('.');
}
if (schema_table)
{
append_identifier(thd, str, schema_table_name,