Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -80/+518 |
|\ | |||||
| * | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -1/+10 |
| |\ | |||||
| | * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -1/+10 |
| | |\ | |||||
| | | * | better fix for MySQL bugs | Sergei Golubchik | 2010-10-20 | 1 | -0/+10 |
| * | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -11/+21 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -5/+13 |
| | |\ \ | | | |/ | |||||
| | | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -5/+13 |
| | | |\ | |||||
| | * | \ | Merge with MariaDB 5.1 | Michael Widenius | 2010-08-06 | 1 | -1/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fix for LP#614265 Crash in _ma_unpin_all_pages / _ma_search on DELETE with Ar... | Michael Widenius | 2010-08-06 | 1 | -1/+2 |
| | * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+1 |
| | | |\ \ | |||||
| | * | \ \ | merge with 5.1 | Sergei Golubchik | 2010-07-25 | 1 | -3/+3 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -4/+3 |
| | * | | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -1/+2 |
| * | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -121/+159 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s... | Sergei Golubchik | 2010-06-05 | 1 | -110/+18 |
| | * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | * | | | | | A temporary solution to make CREATE TABLE attributes | Sergei Golubchik | 2010-05-11 | 1 | -0/+4 |
| | * | | | | | small changes to WL#43: | Sergei Golubchik | 2010-04-30 | 1 | -19/+19 |
| | * | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -6/+119 |
| | * | | | | | Merge with the latest changes in the 5.2 tree. | Igor Babaev | 2010-03-29 | 1 | -3/+16 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | simple speed & space optimization: | Michael Widenius | 2010-03-25 | 1 | -3/+16 |
| | * | | | | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -0/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -7/+20 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -6/+11 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Fix for compiler warnings on windows | Michael Widenius | 2010-01-14 | 1 | -6/+6 |
| | | * | | | | Add DB_TYPE_AUTOASSIGN as a better name for DB_TYPE_UNKNOWN, which is what pl... | unknown | 2010-01-04 | 1 | -0/+5 |
| | * | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -1/+9 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+9 |
| | | |\ \ \ \ | |||||
| * | | | | | | | Backport of subquery optimizations to 5.3. | Sergey Petrunya | 2010-01-17 | 1 | -0/+2 |
| * | | | | | | | MWL#67: MRR backport | Sergey Petrunya | 2009-12-22 | 1 | -1/+1 |
| * | | | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -18/+0 |
| * | | | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -1/+3 |
| * | | | | | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -11/+247 |
| |/ / / / / / | |||||
| * | | | | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -0/+11 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+11 |
| | |/ / / / / | |||||
| * | | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -14/+152 |
| |/ / / / / | |||||
| * | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -10/+13 |
| |\ \ \ \ \ | |||||
| * | | | | | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -0/+2 |
| * | | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -6/+25 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -12/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix for Bug #37007 Maria: different checksum for MyISAM table depending on CH... | Michael Widenius | 2008-06-28 | 1 | -1/+4 |
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 1 | -3/+3 |
| * | | | | | | | | | | Manual merge and some fixes. | unknown | 2008-05-14 | 1 | -0/+1 |
| * | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -10/+115 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Add warning of TRANSACTIONAL=1 is used with handler that doesn't support it | unknown | 2008-02-11 | 1 | -1/+10 |
| * | | | | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -108/+138 |
| |\ \ \ \ \ \ \ \ \ \ |