Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+775 |
|\ | |||||
| * | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -3/+3 |
| |\ | |||||
| | * | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -3/+3 |
| * | | various fixes for buildbot failures | Sergei Golubchik | 2011-06-10 | 1 | -1/+1 |
| * | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -40/+22 |
| |\ \ | |||||
| * \ \ | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -6/+14 |
| |\ \ \ | | |/ / | |||||
| | * | | many changes to my_getsystime.c: | Sergei Golubchik | 2011-05-19 | 1 | -2/+5 |
| * | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -0/+775 |
| |\ \ \ | |||||
| | * | | | Fixed all reported bugs for dynamic columns. | Michael Widenius | 2011-05-11 | 1 | -2/+13 |
| | * | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+764 |
| * | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -37/+91 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -37/+91 |
| | |\ \ | |||||
| | | * \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -37/+91 |
| | | |\ \ | |||||
| * | | | | | Fix LP BUG#715738 | unknown | 2011-03-24 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | 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 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | 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 |
| | |\ \ \ | |||||
* | | | | | | 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 |
| |\ \ \ |