mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 14:32:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
90815 commits 2783 branches 343 tags 1.6 GiB
Commit graph

115 commits

Author SHA1 Message Date
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
Sergei Golubchik
3495801e2e 5.5 merge 2014-11-19 17:23:39 +01:00
Sergei Golubchik
302b50fa30 TokuDB 7.5.3 2014-11-18 17:54:00 +01:00
Rich Prohaska
695ce3ad29 DB-756 set cardinality data for partitioned tokudb tables 2014-11-08 08:59:55 -05:00
Sergei Golubchik
50556e7e9a tokudb post-merge fixes 2014-11-02 17:33:02 +01:00
Sergei Golubchik
a2a18dd9d7 tokudb-7.5.3 2014-11-02 16:47:46 +01:00
Rich Prohaska
ac995231d6 DB-746 merge clustering key is covering key for mariadb 10 2014-10-24 11:23:54 -04:00
Sergei Golubchik
f62c12b405 Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
Sergei Golubchik
14200dfa43 tokudb-7.1.7 2014-08-01 17:04:15 +02:00
Sergei Golubchik
6fb17a0601 5.5.39 merge 2014-08-07 18:06:56 +02:00
Rich Prohaska
4a993fc93f #252 fix the MDEV-6324 fix 2014-06-13 14:43:36 -04:00
Rich Prohaska
f16b3122ab #252 fix MDEV-6324 uninit var in discover3 2014-06-10 18:55:57 -04:00
Rich Prohaska
454e974ce4 #225 hot optimize for 5.6 and 10.0 using alter recreate 2014-06-01 07:49:28 -04:00
Sergei Golubchik
eef1201bcc set version to 10.1.0 2014-05-25 17:17:50 +02:00
Rich Prohaska
39b08e0222 #232 compile in jemalloc detector 2014-05-10 15:53:31 -04:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Sergei Golubchik
aff4854dfd merge: 
git://github.com/Tokutek/ft-index.git
git://github.com/Tokutek/ft-engine.git
at the tag tokudb-7.1.6
 2014-05-05 22:59:44 +02:00
Rich Prohaska
25f931c6b6 #202 allow non-null AND null key index cursor operations (2nd try) 2014-04-18 14:07:14 -04:00
Rich Prohaska
38b95830b5 #206 support mariadb 10.0.10 alter compression table attribute 2014-04-08 15:24:06 -04:00
Rich Prohaska
dc9ed4c5fe #205 build tokudb with webscalesql-5.6 2014-03-31 11:05:45 -04:00
Sergei Golubchik
10740939eb 5.5 merge 2014-03-26 22:25:38 +01:00
Rich Prohaska
daddc85f76 #195 merge mariadb 10.0.9 2014-03-18 19:18:40 -04:00
Sergei Golubchik
99a0b5464d merge ft-index and ft-engine as of 7.1.5 2014-03-18 09:02:57 +01:00
Rich Prohaska
ff1be5d961 #198 add tokudb_backtrace to help debug handler interface bugs 2014-03-12 10:28:57 -04:00
Rich Prohaska
e9b9fd9077 #188 keep track of and cleanup last_lock_timeout memory 2014-02-24 09:46:24 -05:00
Rich Prohaska
2e7e13af2d #185 fix out of range read from uint3korr 2014-02-14 10:11:51 -05:00
Rich Prohaska
bc07ccf8a7 #182 fix dbt array memory leak 2014-02-12 15:07:44 -05:00
Rich Prohaska
dfe4872524 #180 avoid thd_proc_info pointing to invalid info (like when a function sets proc info with a local variable and then returns) 2014-02-07 12:58:10 -05:00
Rich Prohaska
b7e362e48c #178 clean up hatoku_defines.h a bit. it is a mess. 2014-02-07 12:07:53 -05:00
Rich Prohaska
04b8c2f63c #177 disable inline alter table drop default, add key, drop key, rename column when null bytes changed 2014-02-05 15:38:06 -05:00
Rich Prohaska
3ec9648f3d Tokutek/mysql56#54 fix to tokudb::external_lock for the alter table assert bug, plus a rewrite of the tokudb debug tracing 2014-01-22 08:54:46 -05:00
Rich Prohaska
babd7525a9 #169 simplify the tokudb config for mariadb 5.5 2014-01-20 14:49:39 -05:00
Rich Prohaska
c7836bb38d #166 add this handler to debug enter and return 2014-01-14 14:00:58 -05:00
Sergei Golubchik
d28d3ba40d 10.0-base merge 2013-12-16 13:02:21 +01:00
Rich Prohaska
521cf40b4e port to mysql 5.6.15 2013-12-11 15:47:25 -05:00
Rich Prohaska
610474f974 #150 cleanup indexing cursor when a txn is retired 2013-12-08 16:36:37 -05:00
Rich Prohaska
b65e6e3d74 #141 redo table open and close locking to avoid table opening pileup 2013-12-05 11:59:34 -05:00
Rich Prohaska
11e4b8b84c Tokutek/mysql#10 use DB_TYPE_TOKUDB in mysql 5.5 2013-12-02 14:49:08 -05:00
Rich Prohaska
affe5ac600 #15 set the tokudb plugin type to DB_TYPE_TOKUDB 2013-12-02 12:46:28 -05:00
Rich Prohaska
2df023d3dd Tokutek/mariadb#12 rebase to mariadb-5.5.34 2013-11-28 09:51:21 -05:00
Sergei Golubchik
c6d30805db 5.5 merge 2013-11-23 00:50:54 +01:00
Sergei Golubchik
ff41edab6c merge with ft-engine and ft-index up to tag:tokudb-7.1.0 2013-11-19 15:35:31 +01:00
Rich Prohaska
fb6d749f2f start port of tokudb to mariadb 10 2013-11-10 16:45:11 -05:00
Rich Prohaska
b8d7ee9795 basic tokudb running in mysql 5.7 2013-11-09 16:55:12 -05:00
Rich Prohaska
a8af167fe3 tokutek/mysql56#23 turn on extended keys for tokudb 2013-10-23 12:30:07 -04:00
Rich Prohaska
36737f6c36 tokutek/ft-index#76 add US Patent 8,489,638 2013-10-04 16:44:43 -04:00
Rich Prohaska
a9caa21f48 remove cruft 2013-09-27 13:14:23 -04:00
Rich Prohaska
5cf85b79cd #92 simplify my_free calls 2013-09-23 13:42:48 -04:00
Sergei Golubchik
20031c6273 Enable TokuDB online ALTER 
sql/create_options.cc:
  an utility function to compare two filled-in engine_option structures
sql/sql_table.cc:
  * two keys are different if their option_struct's differ
    (for ALTER TABLE DROP key, ADD key)
  * engines doing inplace alter must see the new frm image
 2013-09-25 19:42:22 +02:00
Sergei Golubchik
4ec2e9d7ed 5.5 merge and fixes for compiler/test errors 2013-09-18 13:07:31 +02:00