Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |_|/ |/| | | |||||
* | | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -1/+2 |
* | | | Addressed the following issues from the review of the patch: | Igor Babaev | 2012-12-05 | 1 | -1/+9 |
* | | | Fixed bug mdev-485. | Igor Babaev | 2012-09-10 | 1 | -10/+0 |
* | | | Merge 5.5->5.5-mwl248. | Igor Babaev | 2012-08-29 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE t... | Michael Widenius | 2012-08-28 | 1 | -0/+1 |
* | | | Fixed bug mdev-463. | Igor Babaev | 2012-08-20 | 1 | -0/+11 |
* | | | Made the process of collecting persistent statistics killable. | Igor Babaev | 2012-08-18 | 1 | -0/+2 |
* | | | Performed re-factoring and re-structuring of the code for mwl#248: | Igor Babaev | 2012-07-26 | 1 | -0/+2 |
* | | | Removed the server option --stat-tables. | Igor Babaev | 2012-06-02 | 1 | -5/+3 |
* | | | Fixed a buildbot failure with a testcase from statistics.test | Igor Babaev | 2012-06-01 | 1 | -1/+1 |
* | | | An attempt to fix a buildbot failure with a test case from statistics.test | Igor Babaev | 2012-06-01 | 1 | -1/+2 |
* | | | Merge. | Igor Babaev | 2012-05-22 | 1 | -4/+64 |
|\ \ \ | |||||
| * | | | Support of the extended syntax for ANALYZE. | Igor Babaev | 2012-05-22 | 1 | -4/+64 |
* | | | | Merge. | Igor Babaev | 2012-05-18 | 1 | -13/+25 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | More fixes for LOCK TABLE and REPAIR/FLUSH | Michael Widenius | 2012-05-17 | 1 | -13/+25 |
| * | | Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close ... | Michael Widenius | 2012-05-16 | 1 | -1/+1 |
* | | | Inverted the option --skip-stat-tables for --stat-tables. | Igor Babaev | 2012-05-08 | 1 | -1/+1 |
* | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -6/+4 |
|\ \ \ | |/ / | |||||
| * | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -6/+4 |
| |\ \ | | |/ | |||||
| | * | Bug#13593865 - 64037: CRASH IN HA_PARTITION::CREATE_HANDLERS ON | Mattias Jonsson | 2012-02-02 | 1 | -6/+4 |
* | | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -3/+17 |
|/ / | |||||
* | | Merge MySQL 5.5.20 into MariaDB 5.5. | unknown | 2012-02-14 | 1 | -0/+5 |
|\ \ | |/ |