mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/innobase/mysql-test/storage_engine
History
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
..
parts Various changes coming from 5.6 2013-11-08 23:25:06 +04:00
trx 10.0-base merge 2013-12-16 13:02:21 +01:00
alter_tablespace.opt MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
autoinc_secondary.rdiff MDEV-4028 - Converted rdiff files to uniform 2013-02-03 02:53:57 +04:00
cache_index.rdiff MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
checksum_table_live.rdiff MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
col_opt_not_null.opt Fixes in storage_engine test suite 2014-09-12 03:21:54 +04:00
col_opt_null.opt Fixes in storage_engine test suite 2014-09-12 03:21:54 +04:00
define_engine.inc Fixes in storage_engine test suite 2014-09-12 03:21:54 +04:00
disabled.def 5.5 merge 2014-11-19 17:23:39 +01:00
fulltext_search.rdiff From MySQL 5.6.13 change log: 2014-02-05 16:41:29 +04:00
index_enable_disable.rdiff More verbose error messages 2013-11-07 03:36:53 +04:00
index_type_hash.rdiff MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
insert_delayed.rdiff MDEV-4028 - Converted rdiff files to uniform 2013-02-03 02:53:57 +04:00
lock_concurrent.rdiff MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
optimize_table.rdiff MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
repair_table.rdiff Various changes coming from 5.6 2013-11-08 23:25:06 +04:00
suite.opt Fixes in storage_engine test suite 2014-09-12 03:21:54 +04:00
tbl_opt_data_index_dir.rdiff Various changes coming from 5.6 2013-11-08 23:25:06 +04:00
tbl_opt_insert_method.rdiff MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
tbl_opt_key_block_size.opt MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
tbl_opt_row_format.opt MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
tbl_opt_row_format.rdiff More comprehensive error messages and codes 2013-11-08 23:21:26 +04:00
tbl_opt_union.rdiff MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
type_blob.opt Fixes in storage_engine test suite 2014-09-12 03:21:54 +04:00
type_char_indexes.rdiff engine_condition_pushdown has been deprecated 2014-10-12 14:26:27 +04:00
type_float_indexes.rdiff MDEV-11: Generic storage engine test suite 2012-07-16 06:17:56 +04:00
type_spatial_indexes.rdiff More verbose error messages 2013-11-07 03:36:53 +04:00
type_text.opt Fixes in storage_engine test suite 2014-09-12 03:21:54 +04:00