Nirbhay Choubey
09e3094945
Merging wsrep specific changes from InnoDB to
...
xtradb (r3683..3808).
2014-03-26 15:17:51 -04:00
Nirbhay Choubey
90e4f7f9d3
* bzr merge -rtag:mariadb-10.0.9 maria/10.0
...
* Fix for post-merge build failures.
2014-03-26 14:27:24 -04:00
Nirbhay Choubey
71dafbf9c2
Merging InnoDB changes to xtradb (r3783..3808).
2014-03-26 14:04:50 -04:00
Jan Lindström
b0ad00df27
MDEV-5644: Assertion failure during lock_cancel_waiting_and_release.
...
Analysis: In wsrep case there is two transactions possible trx and
conflicting lock owning transaction. Code was handling trx mutexin
correctly but not for c_lock->trx case.
Fixed by taking clock-trx mutex when needed and releasing trx
mutex if it is taken at lower levels.
2014-02-11 15:03:42 +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
Jan Lindström
5b6a4f25a5
Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed merge
...
errors found on mysql-test suite testing.
2014-01-29 08:54:17 +02:00
Jan Lindström
d43afb8828
Merge MariaDB-10.0.7 revision 3961.
2014-01-25 11:02:49 +02:00
Seppo Jaakola
496e22cf3b
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
...
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
2013-12-04 10:32:43 +02:00
Seppo Jaakola
447b19a3bf
Ported all remaining storage/innobase changes from lp:codership-mysql/5.6, up tp revision #4021
...
This is same level as wsrep_25.1 milestone
Note: stotage/xtaradb is not upgraded yet
2013-11-27 14:45:32 +02:00
Seppo Jaakola
964234412b
diffed in fix in #3953 from lp:codership-mysql/5.6
2013-11-27 01:10:29 +02:00
Jan Lindström
eec8297107
Fixed performance schema instrumentation on galera and added correct mutexing when cancelling waiting trx on InnoDB
2013-10-15 12:03:57 +03:00
Jan Lindström
745239fd29
After merge fixes
2013-09-25 10:42:05 +03:00
Jan Lindström
ba3ff50ab2
Merge 10.0 to galera-10.0
2013-09-03 17:50:36 +03:00
Seppo Jaakola
81739d308f
Initial fixes after mariadb 10 merge, basic replication works now
2013-07-16 12:09:38 +03:00
Seppo Jaakola
0a9216835f
Initial merge result with mariaDB 10: lp:maria
2013-07-13 13:01:13 +03:00
Sergei Golubchik
a9035be5b7
10.0-base merge
2013-04-15 15:09:22 +02: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
Michael Widenius
1d0f70c2f8
Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6
2012-08-01 17:27:34 +03:00
