Viewing all changes in revision 5089.
- Committer: xpan at twitter
- Date: 2014-08-13 20:19:59 UTC
- mfrom: (5077.36.148 clone)
- Revision ID: xpan@twitter.com-20140813201959-9brdow9p11a2odi5
Merge MySQL 5.6.20
- packaging/deb-precise
- packaging/deb-precise/extra
- packaging/deb-precise/patches
- packaging/deb-precise/source
- packaging/deb-trusty
- packaging/deb-trusty/extra
- packaging/deb-trusty/patches
- packaging/deb-trusty/source
- packaging/deb-wheezy
- packaging/deb-wheezy/extra
- packaging/deb-wheezy/patches
- packaging/deb-wheezy/source
- files removed:
- mysql-test/include/wait_for_ndb_to_binlog.inc
- packaging/rpm-uln
- files modified:
- CMakeLists.txt
- mysql-test/include/check_ipv4_mapped.inc *
- mysql-test/include/have_QC_Disabled.inc *
- mysql-test/include/memcache_config.inc *
- mysql-test/include/shutdown_mysqld.inc *
- mysql-test/include/start_mysqld.inc *
- mysql-test/r/lowercase_table4.result *
- mysql-test/r/named_pipe.result *
- mysql-test/r/shm.result *
- mysql-test/std_data/checkDBI_DBD-mysql.pl *
- mysql-test/suite/innodb/r/innodb-wl5980-debug.result *
- mysql-test/suite/innodb/r/innodb-wl5980-linux.result *
- mysql-test/suite/innodb/r/innodb-wl5980-windows.result *
- mysql-test/suite/innodb/r/innodb_bug14169459.result *
- mysql-test/suite/innodb/r/innodb_bug57904.result *
- mysql-test/suite/innodb/r/innodb_bug60196.result *
- mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test *
- mysql-test/suite/innodb/t/innodb-wl5980-debug.test *
- mysql-test/suite/innodb/t/innodb-wl5980-discard.test *
- mysql-test/suite/innodb/t/innodb-wl5980-windows.test *
- mysql-test/suite/innodb/t/innodb_bug14169459.test *
- mysql-test/suite/innodb/t/innodb_bug57904.test *
- mysql-test/suite/innodb/t/innodb_bug60196.test *
- mysql-test/suite/innodb/t/portability_wl5980_linux.zip *
- mysql-test/suite/innodb/t/portability_wl5980_windows.zip *
- mysql-test/suite/ndb/t/ndb_show_tables_result.inc *
- mysql-test/suite/opt_trace/validate_json.py *
- mysql-test/suite/parts/r/partition_exch_innodb.result *
- mysql-test/suite/parts/r/partition_exch_myisam.result *
- mysql-test/suite/parts/r/partition_exch_myisam_innodb.result *
- mysql-test/suite/parts/r/partition_exch_qa.result *
- mysql-test/suite/parts/r/partition_exch_qa_10.result *
- mysql-test/suite/parts/r/partition_exch_qa_11.result *
- mysql-test/suite/parts/r/partition_exch_qa_14.result *
- mysql-test/suite/parts/r/partition_exch_qa_3.result *
- mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result *
- mysql-test/suite/parts/r/partition_exch_qa_4_myisam.result *
- mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result *
- mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result *
- mysql-test/suite/parts/r/partition_exch_qa_6.result *
- mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result *
- mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result *
- mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result *
- mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result *
- mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result *
- mysql-test/t/lowercase_table4.test *
- scripts/mysqlaccess.conf *
- sql-bench/compare-results.sh *
- unittest/gunit/my_fileutils-t.cc *
expand all
collapse all
added
removed
