Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt BitKeeper/deleted/.del-ps_6bdb.result: Auto merged client/mysql.cc: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/type_bit.result: Auto merged mysql-test/suite/ndb/r/ps_7ndb.result: Auto merged mysql-test/t/delete.test: Auto merged mysql-test/t/merge.test: Auto merged mysql-test/t/variables.test: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/protocol.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql-common/my_time.c: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/myisam/ha_myisam.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/myisam.result: merge 5.0-opt -> 5.1-opt mysql-test/r/subselect.result: merge 5.0-opt -> 5.1-opt mysql-test/t/myisam.test: merge 5.0-opt -> 5.1-opt mysql-test/t/subselect.test: merge 5.0-opt -> 5.1-opt
Showing
Please register or sign in to comment