Commit 532dd677 authored by unknown's avatar unknown
Browse files

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
parents 2e07d010 1a53ee1a

There are no changes