Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -18/+45 |
|\ | |||||
| * | Bug#45168: assertion with convert() and empty set value | Martin Hansson | 2009-06-16 | 1 | -3/+2 |
| * | Automerge. | Alexey Kopytov | 2009-06-01 | 1 | -6/+8 |
| |\ | |||||
| | * | Manual merge. | Alexey Kopytov | 2009-06-01 | 1 | -6/+8 |
| | |\ | |||||
| | | * | Bug #44767: invalid memory reads in password() and | Alexey Kopytov | 2009-05-27 | 1 | -6/+8 |
| * | | | Automerge. | Alexey Kopytov | 2009-05-21 | 1 | -1/+15 |
| |\ \ \ | |||||
| | * \ \ | Automerge. | Alexey Kopytov | 2009-05-21 | 1 | -1/+15 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Bug #44796: valgrind: too many my_longlong10_to_str_8bit | Alexey Kopytov | 2009-05-20 | 1 | -1/+15 |
| | | |/ | |||||
| * | | | Fix for bug#44743: Join in combination with concat does not always work | Ramil Kalimullin | 2009-05-21 | 1 | -1/+8 |
| |/ / | |||||
| * | | Auto-merge. | Ramil Kalimullin | 2009-05-13 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Fix for bug#44774: load_file function produces valgrind warnings | Ramil Kalimullin | 2009-05-12 | 1 | -2/+2 |
| * | | Bug#44365 valgrind warnings with encrypt() function | Sergey Glukhov | 2009-04-23 | 1 | -2/+2 |
| * | | Bug#44358 valgrind errors with decode() function | Sergey Glukhov | 2009-04-23 | 1 | -2/+2 |
| * | | merged bug 35087 to 5.1-bugteam | Georgi Kodinov | 2009-04-17 | 1 | -4/+8 |
| |\ \ | | |/ | |||||
| | * | Bug #35087: Inserting duplicate values at one time with DES_ENCRYPT leads | Georgi Kodinov | 2009-04-17 | 1 | -4/+8 |
| | * | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -4/+1 |
| | |\ | |||||
* | | | | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35. | unknown | 2009-05-22 | 1 | -3/+3 |
* | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -7/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -4/+1 |
| |\ \ \ | |||||
| * \ \ \ | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -7/+7 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -7/+7 |
* | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -4/+1 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -4/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | merge of bug 42434 to 5.1-bugteam | Georgi Kodinov | 2009-03-11 | 1 | -4/+1 |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | |||||
| | | * | | Bug #42434: license of mysys MD5 implementation is not GPL-compatible | Georgi Kodinov | 2009-03-09 | 1 | -4/+1 |
| | | |/ | |||||
| * | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -3/+10 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -3/+10 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | merged 41437 to 5.1-bugteam | Georgi Kodinov | 2009-01-09 | 1 | -0/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug #41437: Value stored in 'case' lacks charset, causes segfault | Georgi Kodinov | 2009-01-09 | 1 | -0/+6 |
| * | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2008-12-09 | 1 | -3/+4 |
| |\ \ \ | | |/ / | |||||
* | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -0/+6 |
|\ \ \ | |/ / | |||||
| * | | merge 5.0-bugteam --> 5.1-bugteam | Gleb Shchepa | 2008-07-11 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | warning elimination | Gleb Shchepa | 2008-07-11 | 1 | -1/+1 |
| * | | merge 5.0-bugteam -> 5.1-bugteam | Gleb Shchepa | 2008-07-11 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | warning elimination | Gleb Shchepa | 2008-07-11 | 1 | -1/+1 |
| * | | Bug#35848: UUID() returns UUIDs with the wrong time | Tatiana A. Nurnberg | 2008-07-10 | 1 | -12/+53 |
| |\ \ | | |/ | |||||
| | * | Bug#35848: UUID() returns UUIDs with the wrong time | Tatiana A. Nurnberg | 2008-07-10 | 1 | -12/+53 |
| * | | Merge host.loc:/work/bugs/5.0-bugteam-36488 | unknown | 2008-05-16 | 1 | -0/+6 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #36488: regexp returns false matches, concatenating | unknown | 2008-05-13 | 1 | -0/+6 |
* | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -16/+16 |
|\ \ \ | |/ / | |||||
| * | | Fix for Bug#30217: Views: changes in metadata behaviour | unknown | 2008-02-22 | 1 | -16/+16 |
* | | | Windows fixes | unknown | 2008-01-10 | 1 | -104/+6 |
* | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -4/+4 |
| |\ \ | |||||
| | * \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-10-10 | 1 | -4/+4 |
| | |\ \ | |||||
| | | * | | Moved randomize and my_rnd under mysys | unknown | 2007-10-09 | 1 | -4/+4 |
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2007-12-14 | 1 | -42/+57 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Doxygenization of comments. | unknown | 2007-10-11 | 1 | -42/+57 |
| |/ / / | |||||
* | | | | Fix for a BUG#31898: 16M memory allocations for user variables | unknown | 2007-11-12 | 1 | -5/+55 |