Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint Makefile.am: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqltest.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/mysql.h: Auto merged include/typelib.h: Auto merged mysql-test/Makefile.am: Auto merged mysys/default.c: Auto merged mysys/mf_iocache.c: Auto merged mysys/my_seek.c: Auto merged mysys/my_wincond.c: Auto merged mysys/typelib.c: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/instance.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged sql/share/charsets/hebrew.xml: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged strings/conf_to_src.c: Auto merged vio/viossl.c: Auto merged
Showing
Please register or sign in to comment