database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/mysql-5.0

Browse Source 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
This commit is contained in:
igor@rurik.mysql.com
2005-11-22 23:00:57 -08:00
parent a0744fba27 83d692da88
commit 7b1b69a6e7
133 changed files with 3261 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_lex.cc
View File

@@ -1531,9 +1531,9 @@ void st_select_lex_unit::print(String *str)
{
if (sl != first_select())
{
str->append(" union ", 7);
str->append(STRING_WITH_LEN(" union "));
if (union_all)
str->append("all ", 4);
str->append(STRING_WITH_LEN("all "));
else if (union_distinct == sl)
union_all= TRUE;
}
@@ -1547,7 +1547,7 @@ void st_select_lex_unit::print(String *str)
{
if (fake_select_lex->order_list.elements)
{
str->append(" order by ", 10);
str->append(STRING_WITH_LEN(" order by "));
fake_select_lex->print_order(str,
(ORDER *) fake_select_lex->
order_list.first);
@@ -1570,7 +1570,7 @@ void st_select_lex::print_order(String *str, ORDER *order)
else
(*order->item)->print(str);
if (!order->asc)
str->append(" desc", 5);
str->append(STRING_WITH_LEN(" desc"));
if (order->next)
str->append(',');
}
@@ -1593,7 +1593,7 @@ void st_select_lex::print_limit(THD *thd, String *str)
if (explicit_limit)
{
str->append(" limit ", 7);
str->append(STRING_WITH_LEN(" limit "));
if (offset_limit)
{
offset_limit->print(str);