Commit c7386a19 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/alexi/dev/mysql-4.1-12101 

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


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
parents cf0b4702 26f8e9c9

sql/item_cmpfunc.cc

+4 −0
Original line number Diff line number Diff line
@@ -1169,6 +1169,8 @@ void Item_func_between::print(String *str) 
{

  str->append('(');

  args[0]->print(str);

  if (negated)

    str->append(" not", 4);

  str->append(" between ", 9);

  args[1]->print(str);

  str->append(" and ", 5);
@@ -2411,6 +2413,8 @@ void Item_func_in::print(String *str) 
{

  str->append('(');

  args[0]->print(str);

  if (negated)

    str->append(" not", 4);

  str->append(" in (", 5);

  print_args(str, 1);

  str->append("))", 2);