3633 Alexander Nozdrin 2009-10-10 [merge]
Merge from mysql-next-mr-bar.
3632 Alexander Nozdrin 2009-10-10 [merge]
Merge from mysql-6.0-codebase.
3631 Alexander Nozdrin 2009-10-09 [merge]
Merge from mysql-6.0-codebase.
added:
mysql-test/std_data/ca.cert
mysql-test/std_data/client.cert
mysql-test/std_data/client.key
mysql-test/std_data/server.cert
mysql-test/std_data/server.key
mysql-test/suite/optimizer_unfixed_bugs/
mysql-test/suite/optimizer_unfixed_bugs/README.txt
mysql-test/suite/optimizer_unfixed_bugs/r/
mysql-test/suite/optimizer_unfixed_bugs/r/bug45219.result
mysql-test/suite/optimizer_unfixed_bugs/t/
mysql-test/suite/optimizer_unfixed_bugs/t/bug45219.test
mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
mysql-test/suite/rpl/t/rpl_show_slave_hosts.cnf
mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
mysql-test/suite/rpl/t/rpl_ssl1.cnf
modified:
Makefile.am
client/mysqldump.c
client/mysqlimport.c
client/mysqlslap.c
client/mysqltest.cc
configure.in
include/mysql.h
libmysqld/lib_sql.cc
libmysqld/libmysqld.c
mysql-test/collections/default.experimental
mysql-test/include/show_rpl_debug_info.inc
mysql-test/include/wait_for_slave_param.inc
mysql-test/include/wait_show_condition.inc
mysql-test/r/bigint.result
mysql-test/r/explain.result
mysql-test/r/func_default.result
mysql-test/r/func_regexp.result
mysql-test/r/func_test.result
mysql-test/r/having.result
mysql-test/r/index_merge_innodb.result
mysql-test/r/join_cache.result
mysql-test/r/metadata.result
mysql-test/r/mysqldump.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/select.result
mysql-test/r/select_jcl6.result
mysql-test/r/subselect.result
mysql-test/r/subselect4.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/r/type_datetime.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
mysql-test/suite/rpl/r/rpl_semi_sync.result
mysql-test/suite/rpl/r/rpl_ssl1.result
mysql-test/suite/rpl/t/rpl_semi_sync.test
mysql-test/suite/rpl/t/rpl_ssl1.test
mysql-test/t/explain.test
mysql-test/t/index_merge_innodb.test
mysql-test/t/join_cache.test
mysql-test/t/lock_multi.test
mysql-test/t/mdl_sync.test
mysql-test/t/metadata.test
mysql-test/t/subselect4.test
mysys/Makefile.am
plugin/semisync/Makefile.am
plugin/semisync/semisync.h
plugin/semisync/semisync_master.cc
plugin/semisync/semisync_master.h
plugin/semisync/semisync_master_plugin.cc
plugin/semisync/semisync_slave.cc
plugin/semisync/semisync_slave.h
plugin/semisync/semisync_slave_plugin.cc
sql-common/client.c
sql/repl_failsafe.cc
sql/slave.cc
sql/sql_join_cache.cc
sql/sql_select.cc
sql/sql_select.h
sql/table.h
storage/myisam/mi_scan.c
unittest/Makefile.am
unittest/backup/Makefile.am
unittest/mysys/Makefile.am
Attachment: [text/bzr-bundle] bzr/alik@ibmvm-20091010153002-5guz6dtxj9o2938f.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-codebase branch (bar:3631 to 3633) | Alexander Barkov | 12 Oct |