Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge mysql-test/r/ndb_update.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged
Showing
Please register or sign in to comment