mariadb/storage/spider
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
..
hs_client MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
mysql-test/spider Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
scripts
CMakeLists.txt
configure.in
ha_spider.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
ha_spider.h
Makefile.am
spd_conn.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_conn.h
spd_copy_tables.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_copy_tables.h
spd_db_conn.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_db_conn.h
spd_db_handlersocket.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_db_handlersocket.h
spd_db_include.h
spd_db_mysql.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_db_mysql.h
spd_db_oracle.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_db_oracle.h
spd_direct_sql.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_direct_sql.h
spd_err.h
spd_i_s.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_include.h
spd_malloc.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_malloc.h
spd_param.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_param.h
spd_ping_table.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_ping_table.h
spd_sys_table.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_sys_table.h
spd_table.cc Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
spd_table.h
spd_trx.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
spd_trx.h
spd_udf.cc
spd_udf.def
spd_udf.h