mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/myisammrg
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
..
mysql-test/storage_engine Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
CMakeLists.txt Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
ha_myisammrg.cc Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
ha_myisammrg.h 5.5 merge 2014-05-09 12:35:11 +02:00
myrg_close.c Updated/added copyright headers 2011-06-30 17:46:53 +02:00
myrg_create.c fix merge.test: online alter table support for MERGE tables, really 2013-07-11 18:57:11 +02:00
myrg_def.h Fix compile error on Windows. 2013-07-13 15:09:47 +02:00
myrg_delete.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30
myrg_extra.c Updated/added copyright headers 2011-06-30 17:46:53 +02:00
myrg_info.c Updated/added copyright headers 2011-06-30 17:46:53 +02:00
myrg_locking.c MySQL-5.5.36 merge 2014-02-17 11:00:51 +01:00
myrg_open.c mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
myrg_panic.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30
myrg_queue.c mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
myrg_range.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30
myrg_records.c Updated/added copyright header. Added line "use is subject to license terms" 2014-02-17 18:19:04 +05:30
myrg_rfirst.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30
myrg_rkey.c Updated/added copyright headers 2011-06-30 17:46:53 +02:00
myrg_rlast.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30
myrg_rnext.c MySQL-5.5.36 merge 2014-02-17 11:00:51 +01:00
myrg_rnext_same.c MySQL-5.5.36 merge 2014-02-17 11:00:51 +01:00
myrg_rprev.c MySQL-5.5.36 merge 2014-02-17 11:00:51 +01:00
myrg_rrnd.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30
myrg_rsame.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30
myrg_static.c fixes for test failures 2012-09-27 20:09:46 +02:00
myrg_update.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30
myrg_write.c Updated/added copyright headers 2014-01-06 10:52:35 +05:30