Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use PSI wrappers in aria and other non-MySQL code | Sergei Golubchik | 2011-07-13 | 1 | -1/+0 |
* | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -52/+190 |
|\ | |||||
| * | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -4/+4 |
| |\ | |||||
| | * | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -4/+4 |
| * | | Preliminary patch for Bug#11848763 / 60025 | Alexander Nozdrin | 2011-05-06 | 1 | -1/+1 |
| * | | Bug#11926811 / Bug#60625 Illegal mix of collations | Alexander Barkov | 2011-04-08 | 1 | -3/+4 |
| * | | Merging from mysql-5.1 | Alexander Barkov | 2011-03-03 | 1 | -3/+59 |
| |\ \ | | |/ | |||||
| | * | Bug 11766519 - 59648: MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0' FA... | Alexander Barkov | 2011-03-03 | 1 | -3/+59 |
| * | | Merging from 5.1 | Alexander Barkov | 2011-03-03 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | BUG#11766519 (bug#59648): MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0... | Alexander Barkov | 2011-03-03 | 1 | -0/+2 |
| * | | Bug#31384 DATE_ADD() and DATE_SUB() return binary data | Alexander Barkov | 2011-02-10 | 1 | -7/+7 |
| * | | Merging from 5.1. | Alexander Barkov | 2011-01-17 | 1 | -9/+3 |
| |\ \ | | |/ | |||||
| | * | Bug#58371 Assertion failed: !s.uses_buffer_owned_by(this) with format string ... | Alexander Barkov | 2011-01-17 | 1 | -9/+3 |
| * | | Merge of fix for Bug#58165. | Martin Hansson | 2011-01-13 | 1 | -22/+23 |
| |\ \ | | |/ | |||||
| | * | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail and | Martin Hansson | 2011-01-13 | 1 | -22/+23 |
| * | | merge mysql-5.5->mysql-5.5-bugteam | Georgi Kodinov | 2010-12-16 | 1 | -1/+7 |
| |\ \ | |||||
| | * \ | Merging from mysql-5.1-security | Alexander Barkov | 2010-11-11 | 1 | -1/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#57257 Replace(ExtractValue(...)) causes MySQL crash | Alexander Barkov | 2010-11-11 | 1 | -1/+7 |
| | * | | merge | Georgi Kodinov | 2010-10-29 | 1 | -2/+3 |
| | |\ \ | |||||
| | * \ \ | Merge. | Ramil Kalimullin | 2010-10-13 | 1 | -0/+42 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | merge | Georgi Kodinov | 2010-11-26 | 1 | -0/+35 |
| |\ \ \ \ | |||||
| | * | | | | Bug#57737 Character sets: search fails with like, contraction, index | Alexander Barkov | 2010-11-26 | 1 | -0/+35 |
| | | |_|/ | | |/| | | |||||
| * | | | | merge | Georgi Kodinov | 2010-11-26 | 1 | -0/+42 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | 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 |
| * | | | Bug#57209 valgrind + Assertion failed: dst > buf | Tor Didriksen | 2010-10-08 | 1 | -2/+3 |
| | |/ | |/| | |||||
* | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -2/+2 |
* | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -151/+13 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 |
| |\ \ | | |/ | |||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -54/+52 |
| |\ \ \ | |||||
| * \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -2/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -18/+45 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | 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 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | 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 mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 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 |
* | | | | | | | | | | | | | | | | Bug#55912 FORMAT with locale set fails for numbers < 1000 | Alexander Barkov | 2010-08-20 | 1 | -4/+11 |