Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -5/+6 |
|\ | |||||
| * | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -5/+5 |
| |\ | |||||
| | * | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -5/+5 |
| | |\ | |||||
| | | * | Bug#52172 test binlog.binlog_index needs --skip-core-file to avoid leaving co... | Tor Didriksen | 2010-10-18 | 1 | -5/+5 |
| * | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th... | Michael Widenius | 2010-11-07 | 1 | -0/+1 |
* | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -3/+5 |
* | | | | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 1 | -0/+32 |
|\ \ \ \ | |/ / / | |||||
| * | | | Automatic merge with MariaDB 5.1 | Michael Widenius | 2010-11-04 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge thread | unknown | 2010-11-03 | 1 | -0/+6 |
| * | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -0/+26 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -0/+26 |
* | | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -27/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -27/+15 |
| |\ \ \ | | |/ / | |||||
| | * | | better fix for MySQL bugs | Sergei Golubchik | 2010-10-20 | 1 | -1/+15 |
* | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -10/+31 |
|\ \ \ \ | |/ / / | |||||
| * | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -1/+1 |
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2010-08-06 | 1 | -6/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -6/+11 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Disable some tests that is waiting for next merge with xtradb | Michael Widenius | 2010-08-02 | 1 | -0/+1 |
| * | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -3/+17 |
| * | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixes for Opensolaris (to get buildbot green) | Michael Widenius | 2010-06-23 | 1 | -1/+2 |
* | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -55/+89 |
|\ \ \ \ | |/ / / | |||||
| * | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s... | Sergei Golubchik | 2010-06-05 | 1 | -14/+39 |
| * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -4/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -4/+8 |
| | |\ \ | | | |/ | |||||
| | | * | BUG#39053 - UNISTALL PLUGIN does not allow the storage engine | Sergey Vojtovich | 2010-04-14 | 1 | -4/+8 |
| | | * | Revert of the push of bug #20837 due to failing regression tests. | Georgi Kodinov | 2009-12-01 | 1 | -8/+2 |
| | | * | Bug #20837 Apparent change of isolation level during transaction | Magne Mahre | 2009-11-30 | 1 | -2/+8 |
| * | | | A temporary solution to make CREATE TABLE attributes | Sergei Golubchik | 2010-05-11 | 1 | -3/+0 |
| * | | | Merge with local tree | Michael Widenius | 2010-04-08 | 1 | -0/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge with 5.1 | Michael Widenius | 2010-04-08 | 1 | -0/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Removed compiler warnings | Michael Widenius | 2010-04-07 | 1 | -0/+2 |
| * | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -0/+5 |
| |/ / / | |||||
| * | | | Merge with the latest changes of 5.2 | Igor Babaev | 2010-04-03 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -1/+1 |
| * | | | | Merge with the latest changes in the 5.2 tree. | Igor Babaev | 2010-03-29 | 1 | -10/+8 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | simple speed & space optimization: | Michael Widenius | 2010-03-25 | 1 | -2/+5 |
| * | | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -3/+33 |
* | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -27/+39 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -8/+3 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | small code cleanup - "good ifdef is no ifdef" | Sergei Golubchik | 2010-03-08 | 1 | -8/+3 |
| * | | | Merge with 5.1 | Michael Widenius | 2010-01-04 | 1 | -10/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge PBXT 1.0.09f RC3 into MariaDB. | unknown | 2009-12-02 | 1 | -10/+0 |
| | |\ \ | |||||
| | | * | | Removed the assertion that assumes InnoDB is the only engine that supports XA | Paul McCullagh | 2009-11-25 | 1 | -1/+6 |
| * | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -9/+36 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -9/+36 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ |