mariadb/mysql-test/lib
Sergei Golubchik 853077ad7e Merge branch '10.0' into bb-10.1-merge
Conflicts:
	.bzrignore
	VERSION
	cmake/plugin.cmake
	debian/dist/Debian/control
	debian/dist/Ubuntu/control
	mysql-test/r/join_outer.result
	mysql-test/r/join_outer_jcl6.result
	mysql-test/r/null.result
	mysql-test/r/old-mode.result
	mysql-test/r/union.result
	mysql-test/t/join_outer.test
	mysql-test/t/null.test
	mysql-test/t/old-mode.test
	mysql-test/t/union.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_config.sh
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_cond.cc
	sql/item_cmpfunc.h
	sql/lock.cc
	sql/sql_select.cc
	sql/sql_show.cc
	sql/sql_update.cc
	sql/sql_yacc.yy
	storage/innobase/buf/buf0flu.cc
	storage/innobase/fil/fil0fil.cc
	storage/innobase/include/srv0srv.h
	storage/innobase/lock/lock0lock.cc
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0flu.cc
	storage/xtradb/fil/fil0fil.cc
	storage/xtradb/include/srv0srv.h
	storage/xtradb/lock/lock0lock.cc
	support-files/mysql.spec.sh
2014-12-02 22:25:16 +01:00
..
My Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
t Updated/added copyright headers 2011-06-30 17:46:53 +02:00
v1 MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) 2014-10-11 18:53:06 +02:00
mtr_cases.pm MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) 2014-10-11 18:53:06 +02:00
mtr_gcov.pl Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
mtr_gprof.pl Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
mtr_io.pl Updated/added copyright headers 2011-06-30 17:37:13 +02:00
mtr_match.pm Updated/added copyright header. Added line "use is subject to license terms" 2014-02-17 18:19:04 +05:30
mtr_misc.pl per-file combinations 2012-02-06 21:36:56 +01:00
mtr_process.pl 5.3 merge 2012-01-13 15:50:02 +01:00
mtr_report.pm merge with mysql-5.5.30 minus few incorrect or not applicable changesets 2013-02-28 18:42:49 +01:00
mtr_results.pm WL #5680 MTR results written to file with well defined format 2011-05-09 16:07:43 +02:00
mtr_stress.pl Updated/added copyright headers 2011-06-30 17:37:13 +02:00
mtr_unique.pm Updated/added copyright headers 2011-06-30 17:37:13 +02:00
process-purecov-annotations.pl Gcov support improvements 2009-09-18 05:15:29 +04:00