Commit d3837c79 authored by unknown's avatar unknown

Merge mysql.com:/home/alexi/mysql-5.0

into  mysql.com:/home/alexi/dev/mysql-5.0-12101


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
parents 057855a3 c7386a19
...@@ -1169,6 +1169,8 @@ void Item_func_between::print(String *str) ...@@ -1169,6 +1169,8 @@ void Item_func_between::print(String *str)
{ {
str->append('('); str->append('(');
args[0]->print(str); args[0]->print(str);
if (negated)
str->append(" not", 4);
str->append(" between ", 9); str->append(" between ", 9);
args[1]->print(str); args[1]->print(str);
str->append(" and ", 5); str->append(" and ", 5);
...@@ -2411,6 +2413,8 @@ void Item_func_in::print(String *str) ...@@ -2411,6 +2413,8 @@ void Item_func_in::print(String *str)
{ {
str->append('('); str->append('(');
args[0]->print(str); args[0]->print(str);
if (negated)
str->append(" not", 4);
str->append(" in (", 5); str->append(" in (", 5);
print_args(str, 1); print_args(str, 1);
str->append("))", 2); str->append("))", 2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment