mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
90819 commits 2791 branches 343 tags 1.7 GiB
Commit graph

115 commits

Author SHA1 Message Date
Sergei Golubchik
4b21cd21fe Merge branch '10.0' into merge-wip 2015-01-31 21:48:47 +01:00
Rich Prohaska
de9a378646 DB-766 use an extra flag that is supported on MySQL and does not require a tokutek patch to the wait_while_table_is_used function 2014-12-21 19:15:39 -05:00
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
Rich Prohaska
50b928b046 DB-759 test and fix alter table bug with cardinality data 2014-11-13 10:53:22 -05:00
Sergei Golubchik
42f359f982 after-merge fixes 2014-10-15 22:42:08 +02:00
Sergei Golubchik
f62c12b405 Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
Rich Prohaska
4df66169f2 #256 only force MDL X for certain alter table operations 2014-07-03 08:44:40 -04:00
Rich Prohaska
ca032f3e82 #256 only force MDL X for certain alter table operations 2014-06-26 15:24:47 -04:00
Rich Prohaska
083764f033 #225 hot optimize for 5.6 and 10.0 using alter recreate 2014-06-01 07:50:32 -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
Jan Lindström
1016ee9d77 Merge 10.0 -> 10.1 2014-05-24 21:37:21 +03:00
Rich Prohaska
c1c2d0e5aa #206 merge mariadb 10.0.11 changes 2014-05-20 09:47:19 -04:00
Rich Prohaska
2006f3bf58 #206 merge mariadb 10.0.11 changes 2014-05-14 14:43:44 -04:00
Sergei Golubchik
56f64f796e TokuDB: enable online alter for partitioned tabled 2014-05-09 14:53:32 +02:00
Rich Prohaska
2c992d641b #228 use thd_get/set_ha_data for tokudb_trx data 2014-05-07 15:22:14 -04:00
Rich Prohaska
b0493252e0 #228 use thd_get/set_ha_data for tokudb_trx data 2014-05-07 08:20:41 -04:00
Rich Prohaska
a97122c505 #206 compile without partition storage engine 2014-04-25 14:39:53 -04:00
Rich Prohaska
c9dfa7496e #206 support mariadb 10.0.10 alter compression table attribute 2014-04-25 14:39:53 -04:00
Rich Prohaska
1c3a7b0be7 #200 handle errors when writing cardinality data 2014-04-25 14:26:28 -04:00
Rich Prohaska
2e45809303 #195 merge mariadb 10.0.9 2014-04-25 14:26:28 -04:00
Igor Babaev
b186575fc0 Merge 10.0->10.1 2014-04-23 23:14:29 -07:00
Rich Prohaska
da5e2a19e6 #206 compile without partition storage engine 2014-04-09 07:45:15 -04:00
Rich Prohaska
38b95830b5 #206 support mariadb 10.0.10 alter compression table attribute 2014-04-08 15:24:06 -04:00
Sergei Golubchik
10740939eb 5.5 merge 2014-03-26 22:25:38 +01:00
Rich Prohaska
000f5143c3 #200 handle errors when writing cardinality data 2014-03-20 12:45:32 -04: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
unknown
fc86a1f4af Make tokudb working with 10.1 2014-02-20 09:28:18 +02:00
Sergey Vojtovich
d12c7adf71 MDEV-5314 - Compiling fails on OSX using clang 
This is port of fix for MySQL BUG#17647863.

revno: 5572
revision-id: jon.hauglid@oracle.com-20131030232243-b0pw98oy72uka2sj
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
timestamp: Thu 2013-10-31 00:22:43 +0100
message:
  Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM

  Rename test() macro to MY_TEST() to avoid conflict with libc++.
 2014-02-19 14:05:15 +04: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
c7836bb38d #166 add this handler to debug enter and return 2014-01-14 14:00:58 -05:00
Rich Prohaska
8bcf6c5379 add a session variable that controls whether or not alter table errors are printed to stderr 2013-12-20 07:28:08 -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
3840ef6b44 #87 grab exclusive MDL in the tokudb alter table commit function 2013-11-21 17:42:54 -05: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
36737f6c36 tokutek/ft-index#76 add US Patent 8,489,638 2013-10-04 16:44:43 -04:00
Rich Prohaska
935f78acc2 #92 add key_is_clustering accessor 2013-09-23 14:32:48 -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
bac94d097e tokudb: COMPRESSION = { DEFAULT | TOKUDB_UNCOMPRESSED | 
TOKUDB_ZLIB | TOKUDB_QUICKLZ |
                TOKUDB_LZMA | TOKUDB_FAST |
                TOKUDB_SMALL }
syntax for tables
 2013-09-09 13:35:00 +02:00
Sergei Golubchik
86bc6b6ae8 tokudb: CLUSTERING=YES syntax for indexes 2013-09-09 13:34:50 +02:00
Rich Prohaska
529d5b2f5b Tokutek/mysql56#26 fix crash on alter table of partitioned tokudb table 2013-08-29 17:21:29 -04:00
Rich Prohaska
25000cfdd5 refs #26 fix inplace_alter_table for tokudb partitions 2013-08-29 17:08:52 -04:00
Rich Prohaska
d46b4cfce2 #69 run create unique index with MDL shared no write (not hot WRT writes) 2013-08-21 10:15:47 -04:00
Rich Prohaska
8fe18b9488 #64 get hot text and blob column expansion working 2013-08-15 14:28:34 -04:00
zkasheff
9be800a47d refs #61, make blob expansion a non-hot operation 2013-07-29 11:11:47 -04:00