Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MWL#67: MRR backport | Sergey Petrunya | 2009-12-22 | 1 | -3/+5 |
* | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -0/+20 |
* | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 2 | -1/+21 |
|\ | |||||
| * | Merge | Igor Babaev | 2009-11-09 | 1 | -0/+19 |
| |\ | |||||
| | * | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -0/+19 |
| | |\ | |||||
| | | * | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+19 |
| | | |\ | |||||
| | | | * | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -0/+19 |
| | | | |\ | |||||
| | | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -0/+13 |
| * | | | | | Merge of the latest 5.1 changes. | Igor Babaev | 2009-10-26 | 1 | -1/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Automatic merge with 5.1 | Michael Widenius | 2009-10-28 | 1 | -1/+2 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 2 | -0/+7 |
|/ / / | |||||
* | | | Added client functions: | Michael Widenius | 2009-10-02 | 2 | -0/+4 |
* | | | MWL#17: Table elimination: fixes for windows | Sergey Petrunya | 2009-09-16 | 1 | -0/+1 |
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | MWL#17: Table-elimination | Sergey Petrunya | 2009-09-01 | 1 | -2/+1 |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 12 | -66/+108 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 4 | -10/+33 |
| |\ \ | |||||
| | * \ | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 4 | -4/+5 |
| | |\ \ | |||||
| | * | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 4 | -10/+33 |
| * | | | | Auto-merge | Ignacio Galarza | 2009-07-31 | 2 | -2/+4 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails. | Ignacio Galarza | 2009-07-31 | 2 | -2/+4 |
| * | | | | Bug#45800 crash when replacing into a merge table and there is a duplicate | V Narayanan | 2009-07-30 | 1 | -0/+1 |
| * | | | | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-07-24 | 1 | -1/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge to mysql-5.0-bugteam | Satya B | 2009-07-24 | 1 | -1/+9 |
| | |\ \ \ | |||||
| | * | | | | Fix for BUG#18828 - If InnoDB runs out of undo slots, | Satya B | 2009-07-17 | 1 | -1/+2 |
| * | | | | | Merge from 5.0 | Staale Smedseng | 2009-07-23 | 1 | -1/+9 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Bug #45770 errors reading server SSL files are printed, but | Staale Smedseng | 2009-07-23 | 1 | -1/+9 |
| | |/ / / | |||||
| | * | | | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -1/+1 |
| * | | | | automerge | Georgi Kodinov | 2009-07-16 | 1 | -9/+0 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Bug #45287: phase 1 : 32 bit compilation warnings | Georgi Kodinov | 2009-07-15 | 1 | -9/+0 |
| * | | | Automerge. | Alexey Kopytov | 2009-07-12 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * | | | Bug #45796: invalid memory reads and writes when altering merge | Alexey Kopytov | 2009-07-10 | 1 | -1/+2 |
| * | | | | Bug #43397 mysql headers redefine pthread_mutex_init | Staale Smedseng | 2009-07-08 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | merging with mysql-5.0-bugteam | V Narayanan | 2009-06-19 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#43572 Handle failures from hash_init | V Narayanan | 2009-06-19 | 1 | -1/+1 |
| | * | | MySQL 5.0 backport of Chad Miller's patch for Bug#34309: | Davi Arnaut | 2009-05-30 | 1 | -1/+0 |
| | * | | Updates to build with community features enabled for community builds. | MySQL Build Team | 2009-05-20 | 1 | -3/+0 |
| | * | | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 2 | -0/+4 |
| | |\ \ | |||||
| | | * \ | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 5 | -76/+65 |
| | | |\ \ | |||||
| | | * \ \ | Merge from Tim's 5.0.76-release tree to make 5.0.77 . | Chad MILLER | 2009-01-21 | 3 | -0/+13 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -0/+4 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Buq#32167 another privilege bypass with DATA/INDEX DIRECTORY. | Alexey Botchkov | 2008-07-31 | 1 | -0/+1 |
| | | * | | | | | Merge fix for bug#38180 from mysql-5.0.66a-release | Jonathan Perkin | 2008-07-18 | 1 | -0/+1 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 4 | -49/+59 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 4 | -64/+10 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 5 | -36/+43 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 3 | -6/+10 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Push history-limiting code until after the code that adds new | unknown | 2007-11-14 | 1 | -0/+1 |