Merge mysql.com:/home/kostja/mysql/tmp_merge2

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqltest.c:
  Auto merged
sql/sql_db.cc:
  Auto merged