Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 3 | -96/+288 |
|\ | |||||
| * | Manual merge. | Davi Arnaut | 2009-08-10 | 1 | -0/+29 |
| |\ | |||||
| | * | Bug#45010: invalid memory reads during parsing some strange statements | Davi Arnaut | 2009-08-07 | 1 | -0/+33 |
| | * | Merge from mysql-5.0. | Davi Arnaut | 2009-08-04 | 1 | -0/+0 |
| | |\ | |||||
| | | * | Merge main 5.0 into 5.0-build. | Joerg Bruehe | 2009-07-09 | 1 | -0/+22 |
| | | |\ | |||||
| * | | \ | Merge from mysql-5.1. | Davi Arnaut | 2009-08-04 | 1 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge main 5.1 into 5.1-build. | Joerg Bruehe | 2009-07-16 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merge fix | Daniel Fischer | 2009-07-03 | 1 | -0/+0 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Bug#44647 - fix file permissions. | Daniel Fischer | 2009-07-03 | 1 | -0/+0 |
| * | | | | | | Merge from mysql-5.0-bugteam. | Davi Arnaut | 2009-07-27 | 1 | -23/+30 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Bug#20023: mysql_change_user() resets the value of SQL_BIG_SELECTS | Davi Arnaut | 2009-07-27 | 1 | -12/+26 |
| | * | | | | | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -2/+2 |
| | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bug #45790 Potential DoS vector: Writing of user input to log | Staale Smedseng | 2009-07-01 | 1 | -0/+22 |
| | | |/ / | | |/| | | |||||
| * | | | | Bug#44495: Prepared Statement: CALL p(<x>) - `thd->protocol == &thd->protocol... | Davi Arnaut | 2009-07-15 | 1 | -0/+52 |
| | |_|/ | |/| | | |||||
| * | | | Bug #43397 mysql headers redefine pthread_mutex_init | Staale Smedseng | 2009-07-08 | 1 | -1/+1 |
| * | | | Fix for bug#42364 reverted. | Ramil Kalimullin | 2009-07-06 | 1 | -2/+0 |
| * | | | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table | Sergey Glukhov | 2009-07-03 | 1 | -0/+2 |
| | |/ | |/| | |||||
| * | | Workaround a compiler that does not support certain C99 features for C code. | Davi Arnaut | 2009-05-23 | 1 | -2/+2 |
| * | | Recommit of bug 43560 after merge with mysql-5.1-bugteam | Staale Smedseng | 2009-05-20 | 1 | -15/+127 |
| * | | Bug#23471 prepared for commit in 5.1 gca branch | Bernt M. Johnsen | 2009-05-05 | 1 | -1/+51 |
| |\ \ | | |/ | |||||
| | * | Bug#23471 prepared for commit in 5.0 gca branch | Bernt M. Johnsen | 2009-05-05 | 1 | -1/+19 |
| * | | merging | Alexey Botchkov | 2009-04-30 | 1 | -58/+0 |
| |\ \ | | |/ | |||||
| | * | mysql_client_test fixed. | Alexey Botchkov | 2009-04-30 | 1 | -58/+0 |
| | * | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -6/+246 |
| | |\ | |||||
| | | * | Manual merge | Kristofer Pettersson | 2009-03-06 | 1 | -6/+272 |
| | | |\ | |||||
| | | * | | Bug#40363 Bug 20023 is not fixed on 5.0 | Kristofer Pettersson | 2009-03-05 | 1 | -0/+173 |
* | | | | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -1/+5 |
* | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 2 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -6/+73 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 2 | -3/+3 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 2 | -176/+176 |
* | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -6/+73 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -6/+73 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Auto-merge | Ramil Kalimullin | 2009-02-26 | 1 | -6/+9 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Fix for bug#19829:make test Failed in mysql_client_test | Ramil Kalimullin | 2009-02-26 | 1 | -6/+9 |
| | * | | | | | Automerge. | Alexey Kopytov | 2009-02-19 | 1 | -0/+64 |
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | | | |||||
| | | * | | | Fix for bug #41078: With CURSOR_TYPE_READ_ONLY mysql_stmt_fetch() ... | Alexey Kopytov | 2009-02-19 | 1 | -0/+64 |
| | | |/ / | |||||
* | | | | | Fix two missing DBUG_RETURN. | unknown | 2009-04-21 | 1 | -0/+2 |
* | | | | | Fixed test written by windows to get it working under linux (line endings) | unknown | 2009-04-03 | 1 | -142/+142 |
|/ / / / | |||||
* | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -0/+118 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge from 5.0-bugteam | Davi Arnaut | 2009-01-15 | 1 | -0/+60 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#36326: nested transaction and select | Davi Arnaut | 2009-01-13 | 1 | -0/+60 |
| * | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-12-11 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | fix for pushbuild failure on 64 linux | Sergey Glukhov | 2008-12-11 | 1 | -1/+1 |
| | * | | disable bug37956 test if geometry package is not enabled | Sergey Glukhov | 2008-12-11 | 1 | -0/+4 |
| * | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-12-10 | 1 | -0/+54 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#37956 memory leak and / or crash with geometry and prepared statements! | Sergey Glukhov | 2008-12-10 | 1 | -0/+54 |
* | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -5/+8 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -52/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -7/+251 |
| |\ \ \ \ |