-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build mysql-test/r/type_blob.result: Auto merged mysql-test/t/type_blob.test: Auto merged sql/field.cc: Auto merged sql/unireg.h: Auto merged
2a999890
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build mysql-test/r/type_blob.result: Auto merged mysql-test/t/type_blob.test: Auto merged sql/field.cc: Auto merged sql/unireg.h: Auto merged