Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build mysql-test/t/type_blob.test: Auto merged sql/field.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/tztime.cc: Auto merged sql/unireg.h: Auto merged sql/share/errmsg.txt: Auto merged mysql-test/r/type_blob.result: manual merge sql/item_create.cc: manual merge
Showing
Please register or sign in to comment