summaryrefslogtreecommitdiff
path: root/strings
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.2.Michael Widenius2011-12-1142-154/+189
|\
| * Merge with MariaDB 5.1Michael Widenius2011-11-2442-154/+189
| |\
| | * Merge with MySQL 5.1.60Michael Widenius2011-11-231-8/+13
| | |\
| | | * merge 5.0-security => 5.1 securityTor Didriksen2011-10-141-8/+13
| | | |\
| | | | * Bug#12563865 ROUNDED,TMP_BUF,DECIMAL_VALUE STACK CORRUPTION IN ALL VERSIONS >...Tor Didriksen2011-10-141-8/+13
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2142-146/+176
| | |\ \ \ | | | |/ /
| | | * | BUG#12911710 - VALGRIND FAILURE IN ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INS...Tor Didriksen2011-08-291-1/+8
| | | * | Updated/added copyright headersKent Boortz2011-07-032-3/+9
| | | |\ \
| | | | * \ auto-merge Bug#11762799/Bug#55436Tatjana Azundris Nuernberg2011-05-121-2/+3
| | | | |\ \
| | | | | * \ auto-merge conservative fix for Bug#55436/Bug#11762799Tatiana Azundris Nurnberg2011-05-051-2/+3
| | | | | |\ \
| | | | | | * | Bug#55436: buffer overflow in debug binary of dbug_buff in Field_new_decimal:...Tatiana A. Nurnberg2010-11-111-2/+3
| | | * | | | | Updated/added copyright headersKent Boortz2011-06-3076-163/+295
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Updated/added copyright headersKent Boortz2011-06-3011-24/+35
* | | | | | | | Merge with Sergei's tree to get in latest microsecond patches and also fixes ...Michael Widenius2011-06-111-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge with 5.1-microSergei Golubchik2011-06-071-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-1/+1
* | | | | | | | | | Fixed build failure on OpenSolarisMichael Widenius2011-06-091-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge with dynamic column codeMichael Widenius2011-05-121-7/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-7/+7
* | | | | | | | Fixed typo that caused compiler warningMichael Widenius2011-05-041-1/+1
* | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-0374-590/+1157
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-0274-591/+1157
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#11766725 (Bug#59901) EXTRACTVALUE STILL BROKEN AFTER FIX FOR BUG #44332Alexander Barkov2011-03-011-1/+6
| | | |/ / / | | |/| | |
| | * | | | Updating Copyright informationAlexander Barkov2011-01-1974-75/+75
| | * | | | Bug#44332 my_xml_scan reads behind the end of bufferAlexander Barkov2011-01-181-6/+17
| | | |_|/ | | |/| |
* | | | | merge 5.2Vladislav Vaintroub2011-03-1067-195/+208
|\ \ \ \ \
| * \ \ \ \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2867-195/+208
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-203-16/+70
| | |\ \ \ \ | | | |/ / /
| | | * | | MergeKent Boortz2010-12-291-0/+22
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | - Added/updated copyright headersKent Boortz2010-12-281-0/+22
| | | * | | Merging patch for BUG#58246 with mysql-5.1-bugteam.Mats Kindahl2010-12-012-12/+9
| | | |\ \ \
| | | | * | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8Alexander Barkov2010-11-261-5/+5
| | | | * | | Bug #49752: 2469.126.2 unintentionally breaks authentication againstTatiana A. Nurnberg2010-11-111-7/+4
| | | | | |/ | | | | |/|
| | | * | | BUG#58246: INSTALL PLUGIN not secure & crashableMats Kindahl2010-12-011-5/+62
| | | |/ /
| | * | | Added missing header file strings_def.h to distMichael Widenius2011-02-031-0/+1
| | * | | Merge with 5.1Michael Widenius2011-01-3065-180/+138
| | |\ \ \
| | | * | | Flush DBUG log in case of DBUG_ASSERT()Michael Widenius2011-01-3065-178/+136
| | |/ / /
| | * | | Fixed some mysql-test-run failures and compile warnings/errorsMichael Widenius2011-01-201-1/+1
* | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-2/+0
|/ / / /
* | | | mergeVladislav Vaintroub2010-12-061-2/+0
|\ \ \ \ | |/ / /
| * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-2/+0
* | | | Removed compiler warningMichael Widenius2010-12-051-1/+1
* | | | Merge MariaDB 5.1->5.2unknown2010-11-191-4/+8
|\ \ \ \ | |/ / /
| * | | MWL#74: Shared libmysqld.so library.unknown2010-11-171-4/+8
* | | | Automatic mergeMichael Widenius2010-10-011-3/+4
|\ \ \ \
| * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-3/+4
* | | | | merge with 5.1Sergei Golubchik2010-09-1117-355/+50
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fixed build & test failures in buildbotMichael Widenius2010-08-282-6/+6
View Lorry Controller Status