Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -0/+1 |
|\ | |||||
| * | MDEV-7299 Assertion `m_status == DA_ERROR || m_status == DA_OK' fails on conc... | Sergei Golubchik | 2015-01-19 | 1 | -0/+1 |
* | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -3/+34 |
|\ \ | |/ | |||||
| * | MDEV-5792 - Deadlock between SELECTs from METADATA_LOCK_INFO and another | Sergey Vojtovich | 2014-04-23 | 1 | -3/+34 |
* | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -7/+0 |
|\ \ | |/ | |||||
| * | MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tables | Sergey Vojtovich | 2014-03-20 | 1 | -7/+0 |
* | | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -5/+5 |
|\ \ | |||||
| * | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 1 | -5/+6 |
| * | | bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only). | Nirbhay Choubey | 2014-03-25 | 1 | -4/+4 |
* | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -22/+20 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | MDEV-5675 - Performance: my_hash_sort_bin is called too often | Sergey Vojtovich | 2014-03-06 | 1 | -22/+20 |
* | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -0/+42 |
|\ \ | |/ | |||||
| * | add metadata_lock_info | Kentoku SHIBA | 2013-12-11 | 1 | -0/+42 |
* | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -10/+10 |
|\ \ | |/ | |||||
* | | bzr merge -r3890..3891 lp:codership-mysql/5.5 | Seppo Jaakola | 2013-11-06 | 1 | -0/+1 |
* | | Merged revisions 3425..3430 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -1/+6 |
* | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -171/+312 |
|\ \ | |/ | |||||
| * | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -166/+305 |
| |\ | |||||
| | * | mdl_sync now works. | Michael Widenius | 2013-07-02 | 1 | -3/+8 |
| | * | More merge fixes: | Michael Widenius | 2013-06-16 | 1 | -84/+181 |
| | * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -66/+86 |
* | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | - Fixed compiler warning | Michael Widenius | 2013-06-05 | 1 | -1/+1 |
* | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+134 |
|/ / | |||||
* | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -21/+105 |
|\ \ | |/ |/| | |||||
| * | MDEV-3917 multiple use locks (GET_LOCK) in one connection. | Alexey Botchkov | 2013-04-12 | 1 | -21/+105 |
* | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -5/+10 |
|\ \ | |/ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -4/+8 |
| |\ | |||||
| | * | Fixed some race conditons and bugs related to killed queries | Michael Widenius | 2013-01-11 | 1 | -3/+3 |
| | * | Fix for MDEV-4009: main.delayed sporadically fails with "query 'REPLACE DELAY... | Michael Widenius | 2013-01-10 | 1 | -1/+5 |
| * | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+2 |
| |/ | |||||
* | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -8/+112 |
|\ \ | |/ | |||||
| * | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -8/+112 |
| |\ | |||||
| | * | Bug#13058122 - DML, LOCK/UNLOCK TABLES AND SELECT LEAD TO | Praveenkumar Hulakund | 2012-08-07 | 1 | -8/+112 |
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -24/+41 |
|/ / | |||||
* | | MDEV-117 Assertion: prebuilt->sql_stat_start || trx->conc_state == 1 failed a... | Sergei Golubchik | 2012-03-01 | 1 | -9/+13 |
* | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -45/+221 |
|\ \ | |/ | |||||
| * | Fix for bug#12695572 - "IMPROVE MDL PERFORMANCE IN PRE-VISTA | Dmitry Lenev | 2011-11-15 | 1 | -45/+221 |
* | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
* | | cleanups | Sergei Golubchik | 2011-10-19 | 1 | -3/+0 |
|/ | |||||
* | More review fixes | Mikael Ronstrom | 2011-03-04 | 1 | -2/+2 |
* | merge | Mikael Ronstrom | 2011-01-04 | 1 | -242/+355 |
|\ | |||||
| * | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -218/+345 |
| * | Reverted a temporary workaround for bug #56405 "Deadlock | Dmitry Lenev | 2010-09-30 | 1 | -24/+10 |
* | | Added more wait states for THD wait service | Mikael Ronstrom | 2010-10-27 | 1 | -0/+6 |
|/ | |||||
* | A temporary workaround for bug #56405 "Deadlock in the | Dmitry Lenev | 2010-09-06 | 1 | -10/+24 |
* | Commit on behalf of Dmitry Lenev. | Konstantin Osipov | 2010-08-12 | 1 | -63/+98 |
|\ | |||||
| * | Fix for bug #52044 "FLUSH TABLES WITH READ LOCK and FLUSH | Dmitry Lenev | 2010-07-27 | 1 | -69/+19 |
* | | A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". | Konstantin Osipov | 2010-08-09 | 1 | -8/+0 |