-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean include/mysql.h: Auto merged sql-common/client.c: Auto merged client/mysqltest.c: Resolve conflict
3eb26b77
into mysql.com:/home/jimw/my/mysql-5.0-clean include/mysql.h: Auto merged sql-common/client.c: Auto merged client/mysqltest.c: Resolve conflict