Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+7 |
|\ | |||||
| * | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+7 |
| |\ | |||||
| | * | Bug#57257 Replace(ExtractValue(...)) causes MySQL crash | Alexander Barkov | 2010-11-11 | 1 | -1/+7 |
* | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -0/+43 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -0/+43 |
| |\ \ | | |/ | |||||
| | * | Fix for bug#57283: inet_ntoa() crashes | Ramil Kalimullin | 2010-10-12 | 1 | -0/+1 |
| | * | Fix for bug#57272: crash in rpad() when using utf8 | Ramil Kalimullin | 2010-10-12 | 1 | -0/+42 |
* | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 1 | -2/+2 |
|/ / | |||||
* | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | Bug#50373 --secure-file-priv="" | Kristofer Pettersson | 2010-05-03 | 1 | -2/+1 |
* | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Bug #40625: Concat fails on DOUBLE values in a Stored | Gleb Shchepa | 2010-04-03 | 1 | -1/+1 |
* | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -54/+52 |
|\ \ | |/ | |||||
| * | Fix for compiler warnings: | Davi Arnaut | 2010-01-28 | 1 | -3/+3 |
| * | Bug#49491: Much overhead for MD5() and SHA1() on short strings | Davi Arnaut | 2010-01-26 | 1 | -15/+16 |
| * | Bug #50096: CONCAT_WS inside procedure returning wrong data | Gleb Shchepa | 2010-01-13 | 1 | -2/+2 |
| * | Bug#49141: Encode function is significantly slower in 5.1 compared to 5.0 | Davi Arnaut | 2009-12-04 | 1 | -37/+34 |
* | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | BUG#47995: Mark system functions as unsafe | Sven Sandberg | 2009-11-18 | 1 | -2/+3 |
* | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-09-10 | 1 | -1/+6 |
| |\ | |||||
| | * | Bug#46815 CONCAT_WS returning wrong data | Sergey Glukhov | 2009-09-10 | 1 | -1/+6 |
| | * | Automerge. | Alexey Kopytov | 2009-06-01 | 1 | -6/+8 |
| | |\ | |||||
* | | \ | 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 |
|\ \ \ \ | | |/ / | |/| | |