Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Automerge mariadb 5.1 -> mariadb 5.2 | unknown | 2010-05-05 | 1 | -0/+4 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Fix missing bounds check in string conversion. | unknown | 2010-04-29 | 1 | -0/+4 | |
* | | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 3 | -11/+14 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 2 | -5/+5 | |
* | | | | merged | Sergei Golubchik | 2010-03-15 | 3 | -17/+2 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 3 | -17/+2 | |
| |\ \ \ | | |/ / | ||||||
| | * | | manual merge 5.0-bugteam --> 5.1-bugteam (bug 49955) | Gleb Shchepa | 2010-01-11 | 1 | -2/+2 | |
| | |\ \ | | | |/ | ||||||
| | | * | Bug #49955: ld error message: undefined reference to `strmov_overlapp' | Gleb Shchepa | 2010-01-11 | 1 | -2/+2 | |
| | * | | merge | Georgi Kodinov | 2009-12-24 | 1 | -5/+1 | |
| | |\ \ | | | |/ | ||||||
| | | * | Bug #48866: mysql.test fails under Fedora 12 | Georgi Kodinov | 2009-12-16 | 1 | -5/+1 | |
| | * | | Recommit of patch for bug#49028 for 5.1. | Mattias Jonsson | 2009-12-14 | 1 | -10/+0 | |
* | | | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 1 | -127/+536 | |
* | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 22 | -1234/+1242 | |
|/ / / | ||||||
* | | | Applied patch from to fix some problems with Croatian character set and LIKE ... | Michael Widenius | 2009-12-03 | 1 | -5/+13 | |
* | | | Fixed link problem when compiling without uca | Michael Widenius | 2009-12-01 | 1 | -89/+81 | |
* | | | Added more general support for sorting 2 characters as one (contractions) | Michael Widenius | 2009-11-30 | 3 | -67/+313 | |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 2 | -2/+5 | |
|\ \ \ | |/ / | ||||||
| * | | A post fix for BUG#45645 Mysql server close all connection and restart using ... | Alexander Barkov | 2009-10-20 | 1 | -1/+2 | |
| * | | Bug#45645 Mysql server close all connection and restart using lower function | Alexander Barkov | 2009-10-19 | 1 | -0/+2 | |
| * | | Bug#46448 trailing spaces are not ignored when user collation maps space != 0x20 | V Narayanan | 2009-10-12 | 1 | -2/+2 | |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 3 | -23/+9 | |
|\ \ \ | |/ / | ||||||
| * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 3 | -23/+9 | |
| |\ \ | | |/ | ||||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 3 | -19/+9 | |
| | * | Bug #46042: backported the fix for the valgrind warning from 5.1 | Georgi Kodinov | 2009-07-16 | 1 | -3/+3 | |
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -4/+4 | |
|\ \ \ | ||||||
| * | | | Fix most Compiler warnings seen in buildbot. | unknown | 2009-09-03 | 1 | -3/+3 | |
| * | | | Trivial fixes for windows compile failures | Sergey Petrunya | 2009-09-01 | 1 | -1/+1 | |
* | | | | Fix windows build: add strmov_overlapp.c to CMakeLists.txt | Sergey Petrunya | 2009-09-10 | 1 | -1/+1 | |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 5 | -16/+17 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Backporting "WL#3332 Korean Enhancements" and | Alexander Barkov | 2009-07-24 | 1 | -5/+5 | |
| * | | Merge from 5.0 | Staale Smedseng | 2009-06-29 | 1 | -3/+3 | |
| |\ \ | | |/ | ||||||
| | * | Merge from 5.0-bt | Staale Smedseng | 2009-06-29 | 1 | -3/+3 | |
| * | | Addendum to Bug #45286: backport macro name form other tree | Tatiana A. Nurnberg | 2009-06-06 | 1 | -3/+2 | |
| * | | automerge | Georgi Kodinov | 2009-06-05 | 1 | -1/+4 | |
| |\ \ | | |/ | ||||||
| | * | Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSX | Georgi Kodinov | 2009-06-05 | 1 | -1/+4 | |
| * | | Bug#43827 Server closes connections and restarts | Alexander Barkov | 2009-06-04 | 1 | -0/+1 | |
| * | | Bug#44352 UPPER/LOWER function doesn't work correctly | Alexander Barkov | 2009-05-05 | 2 | -8/+8 | |
* | | | Merge XtraDB 6 with latest MariaDB 5.1 | unknown | 2009-08-03 | 2 | -4/+30 | |
|\ \ \ | ||||||
| * | | | Cherry-pick revid:psergey@askmonty.org-20090608135546-ut1yrzbah4gdw6e6 | unknown | 2009-06-15 | 2 | -4/+30 | |
* | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l... | Michael Widenius | 2009-07-02 | 7 | -94/+49 | |
|/ / / | ||||||
* | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 3 | -5/+5 | |
|\ \ \ | ||||||
| * | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 3 | -5/+5 | |
* | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 3 | -5/+6 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | merged 5.0-bugteam -> 5.1-bugteam | Georgi Kodinov | 2009-03-24 | 1 | -1/+2 | |
| |\ \ | | |/ | ||||||
| | * | merging with mysql-5.0-bugteam | Narayanan V | 2009-03-20 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Bug#42937 strings/CHARSET_INFO.txt not included in source distributions | Narayanan V | 2009-03-11 | 1 | -1/+1 | |
| * | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 2 | -4/+4 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 5 | -11/+11 | |
| | |/ | ||||||
* | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 3 | -3/+22 | |
|\ \ \ | |/ / | ||||||
| * | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-05 | 1 | -1/+1 | |
| |\ \ |