summaryrefslogtreecommitdiff
path: root/strings
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ 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
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | 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
* | | | | | | | | | post-merge fixes.Sergei Golubchik2011-07-022-88/+178
* | | | | | | | | | 5.5-mergeSergei Golubchik2011-07-0266-2501/+442
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | auto-mergeTatjana Azundris Nuernberg2011-05-121-18/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #11792200 - DIVIDING LARGE NUMBERS CAUSES STACK CORRUPTIONSTor Didriksen2011-03-031-18/+22
| * | | | | | | | | | auto-merge Bug#11762799/Bug#55436Tatjana Azundris Nuernberg2011-05-121-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | 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
| | | | | |_|/ / / | | | | |/| | | |
| * | | | | | | | Merging from mysql-5.1Alexander Barkov2011-03-011-1/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#11766725 (Bug#59901) EXTRACTVALUE STILL BROKEN AFTER FIX FOR BUG #44332Alexander Barkov2011-03-011-1/+6
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merging Copyright update from 5.1Alexander Barkov2011-01-1950-51/+51
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Updating Copyright informationAlexander Barkov2011-01-1974-75/+75
| * | | | | | | Merging from 5.1.Alexander Barkov2011-01-181-6/+17
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#44332 my_xml_scan reads behind the end of bufferAlexander Barkov2011-01-181-6/+17
| | |/ / / / /
| | * | | | | MergeKent Boortz2010-12-291-0/+22
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | - Added/updated copyright headersKent Boortz2010-12-281-0/+22
| * | | | | | Bug #59241 invalid memory read in do_div_mod with doubly assigned variablesTor Didriksen2011-01-141-3/+1
| * | | | | | merge mysql-5.5->mysql-5.5-bugteamGeorgi Kodinov2010-12-162-13/+2
| |\ \ \ \ \ \
| | * | | | | | Bug#55980 Character sets: supplementary character _bin ordering is wrongAlexander Nozdrin2010-11-242-13/+2
| * | | | | | | Bug#58321 No warning when characters outside BMP0 is converted to UCS2Alexander Barkov2010-12-151-1/+4
| * | | | | | | Merging patch for BUG#58246 into mysql-5.5-bugteam.Mats Kindahl2010-12-011-5/+62
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merging patch for BUG#58246 with mysql-5.1-bugteam.Mats Kindahl2010-12-012-12/+9
| | |\ \ \ \ \ \
| | * | | | | | | BUG#58246: INSTALL PLUGIN not secure & crashableMats Kindahl2010-12-011-5/+62
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merging from mysql-5.1-bugteamAlexander Barkov2010-11-261-5/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8Alexander Barkov2010-11-261-5/+5
| * | | | | | | Bug#57737 Character sets: search fails with like, contraction, indexAlexander Barkov2010-11-263-324/+198