Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed typo that caused compiler warning | Michael Widenius | 2011-05-04 | 1 | -1/+1 |
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 74 | -590/+1157 |
|\ | |||||
| * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 74 | -591/+1157 |
| |\ | |||||
| | * | Bug#11766725 (Bug#59901) EXTRACTVALUE STILL BROKEN AFTER FIX FOR BUG #44332 | Alexander Barkov | 2011-03-01 | 1 | -1/+6 |
| | * | Updating Copyright information | Alexander Barkov | 2011-01-19 | 74 | -75/+75 |
| | * | Bug#44332 my_xml_scan reads behind the end of buffer | Alexander Barkov | 2011-01-18 | 1 | -6/+17 |
* | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 67 | -195/+208 |
|\ \ \ | |||||
| * \ \ | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 67 | -195/+208 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 3 | -16/+70 |
| | |\ \ | | | |/ | |||||
| | | * | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+22 |
| | | |\ | |||||
| | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -0/+22 |
| | | * | | Merging patch for BUG#58246 with mysql-5.1-bugteam. | Mats Kindahl | 2010-12-01 | 2 | -12/+9 |
| | | |\ \ | |||||
| | | | * | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8 | Alexander Barkov | 2010-11-26 | 1 | -5/+5 |
| | | | * | | Bug #49752: 2469.126.2 unintentionally breaks authentication against | Tatiana A. Nurnberg | 2010-11-11 | 1 | -7/+4 |
| | | * | | | BUG#58246: INSTALL PLUGIN not secure & crashable | Mats Kindahl | 2010-12-01 | 1 | -5/+62 |
| | | |/ / | |||||
| | * | | | Added missing header file strings_def.h to dist | Michael Widenius | 2011-02-03 | 1 | -0/+1 |
| | * | | | Merge with 5.1 | Michael Widenius | 2011-01-30 | 65 | -180/+138 |
| | |\ \ \ | |||||
| | | * | | | Flush DBUG log in case of DBUG_ASSERT() | Michael Widenius | 2011-01-30 | 65 | -178/+136 |
| | |/ / / | |||||
| | * | | | Fixed some mysql-test-run failures and compile warnings/errors | Michael Widenius | 2011-01-20 | 1 | -1/+1 |
* | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
* | | | | Removed compiler warning | Michael Widenius | 2010-12-05 | 1 | -1/+1 |
* | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 1 | -4/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 1 | -4/+8 |
* | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -3/+4 |
* | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 17 | -355/+50 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Fixed build & test failures in buildbot | Michael Widenius | 2010-08-28 | 2 | -6/+6 |
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 15 | -349/+44 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45012 my_like_range_cp932 generates invalid string | Alexander Barkov | 2010-07-26 | 9 | -335/+36 |
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -2/+1 |
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -1/+1 |
| | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -82/+0 |
| | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 7 | -84/+18 |
* | | | | Merge with 5.2 | Michael Widenius | 2010-08-09 | 2 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
* | | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 2 | -10/+11 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -1/+1 |
* | | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+2 |
* | | | | 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 |