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
Jan Lindström
e15a83c0c7
Better comments part 2 with proof and simplified implementation.
...
Thanks to Daniel Black.
2014-11-26 16:41:28 +02:00
Jan Lindström
b62c4c6586
Better comments and add a test case.
2014-11-25 08:31:03 +02:00
Sergei Golubchik
a9a6bd5256
InnoDB 5.6.21
2014-11-20 16:59:22 +01:00
Sergei Golubchik
3c12c27907
5.5 merge
2014-11-20 16:07:34 +01:00
Jan Lindström
3486135bb5
MDEV-6928: Add trx pointer to struct mtr_t
...
Merge Facebook commit 25295d003cb0c17aa8fb756523923c77250b3294
authored by Steaphan Greene from https://github.com/facebook/mysql-5.6
This adds a pointer to the trx to each mtr.
This allows the trx to be accessed in parts of the code
where it was otherwise not available. This is needed later.
2014-10-24 22:26:31 +03:00
Sergei Golubchik
f62c12b405
Merge 10.0.14 into 10.1
2014-10-15 12:59:13 +02:00
Sergei Golubchik
75796d9ecb
InnoDB 5.6.20
2014-09-11 16:42:54 +02:00
Sergei Golubchik
2023fac281
innodb-5.6.19
2014-08-06 20:05:10 +02:00
Jan Lindström
a3acd72570
Merge InnoDB fixes from 5.5 revisions 4229, 4230, 4233, 4237 and 4238 i.e.
...
4229: MDEV-5670: Assertion failure in file buf0lru.c line 2355
Add more status information if repeatable.
4230: MDEV-5673: Crash while parallel dropping multiple tables under heavy load
Improve long semaphore wait output to include all semaphore waits
and try to find out if there is a sequence of waiters.
4233: Fix compiler errors on product build.
4237: Fix too agressive long semaphore wait output and add guard against introducing
compression failures on insert buffer.
4238: Fix test failure caused by simulated compression failure on
IBUF_DUMMY table.
2014-07-25 10:30:16 +03:00
Jan Lindström
1016ee9d77
Merge 10.0 -> 10.1
2014-05-24 21:37:21 +03:00
Jan Lindström
105060e307
Fix compiler warnings.
2014-05-23 08:10:54 +03:00
Jan Lindström
d12dbe77e2
MDEV-6246: Merge 10.0.10-FusionIO to 10.1.
2014-05-22 14:24:00 +03:00
Sergei Golubchik
8ee9d19607
innodb 5.6.17
2014-05-07 17:32:23 +02:00
Sergei Golubchik
e2e5d07b28
MDEV-6184 10.0.11 merge
...
InnoDB 5.6.16
2014-05-06 09:57:39 +02:00
Jan Lindström
96100d6652
Merge: lp:maria/10.0 latest.
2014-03-03 14:27:56 +02:00
Sergei Golubchik
15ee97214d
InnoDB 5.6.15 merge.
...
update test results
2014-02-26 19:36:33 +01:00
Jan Lindström
8c5d5bc5de
Fixed merge error on InnoDB page compression level handling.
...
Merged page compression feature to XtraDB storage engine.
Added feature where page compression can use lz4 compression
method (innodb_use_lz4, default OFF).
2014-02-03 10:08:15 +02:00
Sergei Golubchik
27d45e4696
MDEV-5574 Set AUTO_INCREMENT below max value of column.
...
Update InnoDB to 5.6.14
Apply MySQL-5.6 hack for MySQL Bug#16434374
Move Aria-only HA_RTREE_INDEX from my_base.h to maria_def.h (breaks an assert in InnoDB)
Fix InnoDB memory leak
2014-02-01 09:33:26 +01:00
Sergei Golubchik
d28d3ba40d
10.0-base merge
2013-12-16 13:02:21 +01:00
Michael Widenius
068c61978e
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
Sergei Golubchik
ab83952f29
10.0-base merge
2013-01-31 09:48:19 +01:00
Sergei Golubchik
40e94a3734
merge with 5.5
2012-11-03 12:28:51 +01:00
Michael Widenius
1d0f70c2f8
Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6
2012-08-01 17:27:34 +03:00
