Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
* | | bzr merge -r4104..4120 codership/5.6/ | Nirbhay Choubey | 2014-08-12 | 1 | -0/+1 |
* | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel | unknown | 2014-06-03 | 1 | -1/+1 |
* | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -6/+8 |
|\ \ | |/ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -1/+4 |
| |\ | |||||
| | * | Added new states to be able to better diagnose where server hangs. | Michael Widenius | 2014-05-03 | 1 | -1/+5 |
| * | | merge of "BUG# 13975227: ONLINE OPTIMIZE TABLE FOR INNODB TABLES" | Sergei Golubchik | 2014-05-07 | 1 | -4/+4 |
* | | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -0/+11 |
|\ \ \ | |/ / | |||||
| * | | MDEV-4360: ANALYZE shows "Table is already up to date" while updating stats | Sergey Petrunya | 2014-03-28 | 1 | -0/+11 |
* | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -3/+4 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
| * | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -2/+3 |
| |\ \ | |||||
| | * \ | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -2/+3 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -2/+3 |
* | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -2/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -2/+14 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -2/+14 |
| | |\ \ | | | |/ | |||||
| | | * | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -2/+14 |
| | | |\ | |||||
| | | | * | Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEAR | Dmitry Lenev | 2013-08-20 | 1 | -2/+14 |
* | | | | | After merge fixes | Jan Lindström | 2013-09-25 | 1 | -1/+3 |
* | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -73/+91 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-4702 - Reduce usage of LOCK_open | Sergey Vojtovich | 2013-08-14 | 1 | -8/+2 |
| * | | | | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -7/+2 |
| * | | | | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -2/+1 |
| * | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -56/+86 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix merge.test failure | Sergey Petrunya | 2013-07-09 | 1 | -0/+8 |
| | * | | | Fixed some wrong format strings. | Michael Widenius | 2013-06-28 | 1 | -17/+48 |
| | * | | | merge of 2876.430.11 & 2876.430.1 | unknown | 2013-06-27 | 1 | -2/+1 |
| | * | | | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 1 | -4/+8 |
| | * | | | Fixed patch that was part of last push that didn't apply correctly. | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
| | * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -29/+35 |
* | | | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -2/+3 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING | Mattias Jonsson | 2013-01-30 | 1 | -2/+3 |
* | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | remove ha_create_table_from_engine() | Sergei Golubchik | 2013-04-09 | 1 | -2/+1 |
* | | | | convenience helpers for get_table_share() and tdc_open_view(). | Sergei Golubchik | 2013-04-09 | 1 | -7/+2 |
* | | | | moving LOCK_open into get_table_share() | Sergei Golubchik | 2013-04-09 | 1 | -2/+0 |
* | | | | * don't use 1-8 numbers for open_table_error codes, use an enum. | Sergei Golubchik | 2013-04-09 | 1 | -1/+2 |
* | | | | don't use I_S constants for open_table_def and get_table_share, | Sergei Golubchik | 2013-04-09 | 1 | -2/+2 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -6/+30 |
|\ \ \ \ | |/ / / | |||||
| * | | | Automatic merge | Michael Widenius | 2013-03-01 | 1 | -2/+6 |
| |\ \ \ | |||||
| | * | | | Fixed bug MPDEV-628 / LP:989055 - Querying myisam table metadata may corrupt ... | Michael Widenius | 2013-03-01 | 1 | -2/+6 |
| * | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -4/+24 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Bug#11751825 - OPTIMIZE PARTITION RECREATES FULL TABLE INSTEAD JUST PARTITION | Aditya A | 2012-11-06 | 1 | -4/+24 |
* | | | | cleanup: | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
* | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
| |_|/ |/| | |