diff options
| author | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-11-23 14:57:00 +0200 |
|---|---|---|
| committer | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2005-11-23 14:57:00 +0200 |
| commit | 5273071265c894d3f4b01763955ac190ae855750 (patch) | |
| tree | ee73c0781d75c64d0c74007e2d2a68f9de4b9a29 /sql/sql_lex.cc | |
| parent | 35735cfefa15d36f100e790b570dd548230a58e8 (diff) | |
| parent | 1343975dda2e5dc3f8dac4217a0b63b6db9812d6 (diff) | |
| download | mariadb-git-5273071265c894d3f4b01763955ac190ae855750.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 00c095c0a4e..c19efff2d85 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1528,9 +1528,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; } @@ -1544,7 +1544,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); @@ -1567,7 +1567,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(','); } @@ -1590,7 +1590,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); |