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

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0


mysql-test/r/subselect.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
This commit is contained in:
unknown
2004-07-20 22:10:47 +03:00
parent 362ce6a8aa b0b75bbfbb
commit e92ca135ff
31 changed files with 254 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_select.cc
View File

@ -11249,13 +11249,13 @@ void st_table_list::print(THD *thd, String *str)
}
else if (view_name.str)
{
str->append(view_db.str, view_db.length);
append_identifier(thd, str, view_db.str, view_db.length);
str->append('.');
str->append(view_name.str, view_name.length);
append_identifier(thd, str, view_name.str, view_name.length);
if (my_strcasecmp(table_alias_charset, view_name.str, alias))
{
str->append(' ');
str->append(alias);
append_identifier(thd, str, alias, strlen(alias));
}
}
else if (derived)
@ -11263,28 +11263,29 @@ void st_table_list::print(THD *thd, String *str)
str->append('(');
derived->print(str);
str->append(") ", 2);
str->append(alias);
append_identifier(thd, str, alias, strlen(alias));
}
else
{
str->append(db);
append_identifier(thd, str, db, db_length);
str->append('.');
str->append(real_name);
append_identifier(thd, str, real_name, real_name_length);
if (my_strcasecmp(table_alias_charset, real_name, alias))
{
str->append(' ');
str->append(alias);
append_identifier(thd, str, alias, strlen(alias));
}
}
}
void st_select_lex::print(THD *thd, String *str)
{
if (!thd)
thd= current_thd;
str->append("select ", 7);
//options
if (options & SELECT_STRAIGHT_JOIN)
str->append("straight_join ", 14);