-
unknown authored
into mysql.com:/home/hf/work/w3475/my51-w3475 client/mysqltest.c: Auto merged BitKeeper/deleted/.del-bdb-deadlock.test: Auto merged libmysql/libmysql.c: Auto merged mysql-test/t/lock_multi.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/status.test: Auto merged mysql-test/include/deadlock.inc: SCCS merged
0eb21ee4