Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge | Igor Babaev | 2009-11-09 | 10 | -35/+29 |
|\ | |||||
| * | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 10 | -35/+29 |
| |\ | |||||
| | * | Merge with latest MariaDB 5.1 trunk. | unknown | 2009-10-15 | 3 | -1/+13 |
| | |\ | |||||
| | * \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 10 | -35/+29 |
| | |\ \ | |||||
| | | * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 10 | -32/+20 |
| | | * | | Fix for a few assorted compiler warnings. | Davi Arnaut | 2009-08-28 | 1 | -1/+1 |
| | | * | | Bug#46639: 1030 (HY000): Got error 124 from storage engine on | Mattias Jonsson | 2009-08-21 | 1 | -2/+8 |
* | | | | | Merge of the latest 5.1 changes. | Igor Babaev | 2009-10-26 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Automatic merge with maria-merge | Michael Widenius | 2009-10-26 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Fixes for binary distribution in tar file | Michael Widenius | 2009-10-23 | 1 | -1/+1 |
* | | | | | Merge | Igor Babaev | 2009-10-17 | 3 | -1/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Automatic merge with 5.1-merge | Michael Widenius | 2009-10-14 | 3 | -1/+13 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | * | | merge | unknown | 2009-10-06 | 3 | -1/+13 |
| | |\ \ | |||||
| | | * | | BUG#39249 Maria:query cache returns out of date results | unknown | 2009-10-06 | 3 | -1/+13 |
* | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 2 | -1/+2 |
|/ / / / | |||||
* | | | | Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP). | Michael Widenius | 2009-10-06 | 1 | -2/+12 |
|/ / / | |||||
* | | | Fixed bug #47455 - a failure with main.myisam_crash_before_flush_keys.test | Igor Babaev | 2009-09-19 | 1 | -1/+4 |
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 2 | -5/+6 |
|\ \ \ | |/ / | |||||
| * | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 2 | -5/+6 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 11 | -52/+147 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 1 | -9/+3 |
| |\ | |||||
| | * | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 2 | -1/+11 |
| | |\ | |||||
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -9/+3 |
| * | | | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -8/+3 |
| | |/ | |/| | |||||
| * | | Bug#35111 - Truncate a MyISAM partitioned table does not reset | Satya B | 2009-07-08 | 2 | -0/+7 |
| * | | Merge from 5.0 | Staale Smedseng | 2009-06-29 | 1 | -1/+1 |
| * | | auto-merge | Tatiana A. Nurnberg | 2009-06-05 | 1 | -0/+3 |
| |/ | |||||
| * | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-05-27 | 1 | -1/+1 |
| * | Bug#43940 64-bit windows myisamchk doesn't support key_buffer_size > 4G | Sergey Glukhov | 2009-05-27 | 1 | -5/+5 |
| * | Bug #39802 On Windows, 32-bit time_t should be enforced | Anurag Shekhar | 2009-05-13 | 1 | -3/+3 |
| * | Merge to 5.1-bugteam. | Sergey Vojtovich | 2009-04-30 | 1 | -2/+19 |
| |\ | |||||
| | * | BUG#42907 - Multi-term boolean fulltext query containing a | Sergey Vojtovich | 2009-04-23 | 1 | -2/+19 |
| * | | merging with mysql-5.1-bugteam | Narayanan V | 2009-04-30 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1 | Narayanan V | 2009-04-30 | 1 | -2/+2 |
| | |/ | |||||
| * | | Fix for BUG#40827 - Killing insert-select to MyISAM can cause table corruption | Satya B | 2009-04-30 | 1 | -4/+49 |
| |\ \ | |||||
| | * | | BUG#40827 - Killing insert-select to MyISAM can cause table corruption | Satya B | 2009-04-16 | 1 | -4/+49 |
| | |/ | |||||
| * | | Bug#43737: Select query return bad result | Martin Hansson | 2009-04-29 | 1 | -1/+2 |
| * | | merging | Alexey Botchkov | 2009-04-29 | 2 | -2/+13 |
| |/ | |||||
| * | merging with mysql-5.1-bugteam tree | Narayanan V | 2009-04-09 | 1 | -6/+15 |
| |\ | |||||
| | * | Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 | Narayanan V | 2009-04-08 | 1 | -6/+15 |
| * | | Bug#38848 myisam_use_mmap causes widespread myisam corruption on windows | Narayanan V | 2009-04-09 | 2 | -4/+6 |
| * | | merging with 5.0 bugteam tree | Anurag Shekhar | 2009-04-09 | 1 | -1/+1 |
| |/ | |||||
| * | merge to latest 5.1-bugteam | Satya B | 2009-04-07 | 1 | -27/+9 |
| |\ | |||||
| | * | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-04-07 | 1 | -27/+9 |
| * | | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-04-06 | 1 | -3/+4 |
| |/ | |||||
| * | Bug#29248 MyISAMchk & MyISAMpack failing with * wildcard on Windows platform | Ignacio Galarza | 2009-03-31 | 1 | -0/+2 |
| * | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-03-25 | 1 | -0/+26 |
* | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 2 | -10/+18 |
* | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 3 | -4/+4 |
|\ \ | |||||
| * | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 3 | -4/+4 |