-
unknown authored
into macbook.gmz:/Users/kgeorge/mysql/work/B19216-5.0-opt sql/protocol.h: Auto merged sql-common/client.c: Auto merged BitKeeper/deleted/.del-mysql_client.test: merge 4.1->5.0 sql/protocol.cc: merge 4.1->5.0
d1f87863
into macbook.gmz:/Users/kgeorge/mysql/work/B19216-5.0-opt sql/protocol.h: Auto merged sql-common/client.c: Auto merged BitKeeper/deleted/.del-mysql_client.test: merge 4.1->5.0 sql/protocol.cc: merge 4.1->5.0