summaryrefslogtreecommitdiff
path: root/strings
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.18 mergeSergei Golubchik2011-11-0332-106/+141
|\
| * mergeDaniel Fischer2011-09-231-5/+9
| |\
| | * Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORYTor Didriksen2011-09-211-5/+9
| * | merge from 5.5.16Daniel Fischer2011-09-211-9/+45
| |\ \ | | |/ | |/|
| | * Manual merge from mysql-5.5.Ramil Kalimullin2011-08-091-1/+3
| | |\
| | * | Bug #12319710: INVALID MEMORY READ AND/OR CRASH IN MY_UCA_CHARCMP Georgi Kodinov2011-07-221-9/+45
| * | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORYTor Didriksen2011-09-201-2/+5
| * | | merge 5.1 => 5.5Tor Didriksen2011-08-291-1/+8
| |\ \ \ | | |_|/ | |/| |
| | * | 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
| | |\ \
| * | | | Bug#12537160 ASSERTION FAILED: STOP0 <= &TO->BUF[TO->LEN] WITH LARGE NUMBER.Tor Didriksen2011-07-181-1/+3
| | |_|/ | |/| |
| * | | Updated/added copyright headersKent Boortz2011-06-3050-97/+118
| |\ \ \ | | |/ /
| | * | Updated/added copyright headersKent Boortz2011-06-3076-163/+295
| | |\ \
| | | * | Updated/added copyright headersKent Boortz2011-06-3011-24/+35
* | | | | merge with 5.3Sergei Golubchik2011-10-1953-438/+726
|\ \ \ \ \
| * \ \ \ \ 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
| |\ \ \ \ \ \ \ | | |/ / / / / /