Merged 4.1 -> 5.0

include/mysql_com.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/client_test.c b/tests/client_test.c
index 048935d2efb..464d5b632ae 100644
--- a/tests/client_test.c
+++ b/tests/client_test.c
@@ -7955,7 +7955,12 @@ static void test_ts()
 
 /*
   Test for bug #1500.
+  XXX: despite that this bug is fixed, it spots mysqld code which is not
+  working correctly yet: to fix all things  properly we need to implement
+  Item::cleanup() method for all items (as described in bugs #1663 and
+  #1749). So don't be surprised in case valgrind barks on it.
 */
+
 static void test_bug1500()
 {
   MYSQL_STMT *stmt;