Sergei Golubchik
932646b1ff
Merge branch '10.1' into 10.2
2016-06-30 16:38:05 +02:00
Sergei Golubchik
3361aee591
Merge branch '10.0' into 10.1
2016-06-28 22:01:55 +02:00
Sergei Golubchik
30d9d4e26d
5.6.29-76.2
2016-04-26 20:58:29 +02:00
Alexander Barkov
2ba7ed77aa
Merge remote-tracking branch 'origin/10.1' into 10.2
2015-12-29 19:37:11 +04:00
Sergei Golubchik
a2bcee626d
Merge branch '10.0' into 10.1
2015-12-21 21:24:22 +01:00
Sergei Golubchik
dcc501aec3
5.6.27-76.0
2015-12-15 17:23:58 +01:00
Sergei Golubchik
0d66c7dd84
update tokudb to 10.2
2015-11-20 11:14:21 +01:00
Sergei Golubchik
2c8c652978
5.6.26-74.0
2015-10-26 12:57:57 +01:00
Sergei Golubchik
658992699b
Merge tag 'mariadb-10.0.20' into 10.1
2015-06-27 20:35:26 +02:00
Rik Prohaska
69d5695c00
DB-823 fix lock tables + transaction accounting for subsequent operations
2015-03-04 15:49:27 -05:00
Sergei Golubchik
4b21cd21fe
Merge branch '10.0' into merge-wip
2015-01-31 21:48:47 +01:00
Rich Prohaska
b9d154c564
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
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
2db029048f
DB-759 test and fix alter table bug with cardinality data
2014-11-13 10:53:22 -05: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
d74c5f7432
#256 only force MDL X for certain alter table operations
2014-06-26 15:24:47 -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
e335e62c87
#225 hot optimize for 5.6 and 10.0 using alter recreate
2014-06-01 07:49:28 -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
ede2f6963a
#206 merge mariadb 10.0.11 changes
2014-05-14 14:43:44 -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
493f9fd081
#228 use thd_get/set_ha_data for tokudb_trx data
2014-05-07 08:20:41 -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
a1b98694e5
#206 compile without partition storage engine
2014-04-09 07:45:15 -04:00
Rich Prohaska
da5e2a19e6
#206 compile without partition storage engine
2014-04-09 07:45:15 -04:00
Rich Prohaska
0b1edd4302
#206 support mariadb 10.0.10 alter compression table attribute
2014-04-08 15:24:06 -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
a95eb9505d
#200 handle errors when writing cardinality data
2014-03-20 12:45:32 -04:00
Rich Prohaska
000f5143c3
#200 handle errors when writing cardinality data
2014-03-20 12:45:32 -04:00
Rich Prohaska
f7eac23dbb
#195 merge mariadb 10.0.9
2014-03-18 19:18:40 -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
