Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge with Sergei's tree to get in latest microsecond patches and also fixes ... | Michael Widenius | 2011-06-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -1/+1 | |
| * | | | | | | | | | Fixed build failure on OpenSolaris | Michael Widenius | 2011-06-09 | 1 | -2/+2 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -2/+2 | |
| * | | | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -7/+7 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| | * | | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -7/+7 | |
| * | | | | | | | | 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 | |
| | |\ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | 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 | |
* | | | | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 2 | -88/+178 | |
* | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 66 | -2501/+442 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | auto-merge | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -18/+22 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Bug #11792200 - DIVIDING LARGE NUMBERS CAUSES STACK CORRUPTIONS | Tor Didriksen | 2011-03-03 | 1 | -18/+22 | |
| * | | | | | | | | | | auto-merge Bug#11762799/Bug#55436 | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| | * | | | | | | | | auto-merge Bug#11762799/Bug#55436 | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -2/+3 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | auto-merge conservative fix for Bug#55436/Bug#11762799 | Tatiana Azundris Nurnberg | 2011-05-05 | 1 | -2/+3 | |
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | ||||||
| | | | * | | | | | | Bug#55436: buffer overflow in debug binary of dbug_buff in Field_new_decimal:... | Tatiana A. Nurnberg | 2010-11-11 | 1 | -2/+3 | |
| | | | | |_|/ / / | | | | |/| | | | | ||||||
| * | | | | | | | | Merging from mysql-5.1 | Alexander Barkov | 2011-03-01 | 1 | -1/+6 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Bug#11766725 (Bug#59901) EXTRACTVALUE STILL BROKEN AFTER FIX FOR BUG #44332 | Alexander Barkov | 2011-03-01 | 1 | -1/+6 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | Merging Copyright update from 5.1 | Alexander Barkov | 2011-01-19 | 50 | -51/+51 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Updating Copyright information | Alexander Barkov | 2011-01-19 | 74 | -75/+75 | |
| * | | | | | | | Merging from 5.1. | Alexander Barkov | 2011-01-18 | 1 | -6/+17 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Bug#44332 my_xml_scan reads behind the end of buffer | Alexander Barkov | 2011-01-18 | 1 | -6/+17 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+22 | |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||||
| | | * | | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -0/+22 | |
| * | | | | | | Bug #59241 invalid memory read in do_div_mod with doubly assigned variables | Tor Didriksen | 2011-01-14 | 1 | -3/+1 | |
| * | | | | | | merge mysql-5.5->mysql-5.5-bugteam | Georgi Kodinov | 2010-12-16 | 2 | -13/+2 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Bug#55980 Character sets: supplementary character _bin ordering is wrong | Alexander Nozdrin | 2010-11-24 | 2 | -13/+2 | |
| * | | | | | | | Bug#58321 No warning when characters outside BMP0 is converted to UCS2 | Alexander Barkov | 2010-12-15 | 1 | -1/+4 | |
| * | | | | | | | Merging patch for BUG#58246 into mysql-5.5-bugteam. | Mats Kindahl | 2010-12-01 | 1 | -5/+62 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Merging patch for BUG#58246 with mysql-5.1-bugteam. | Mats Kindahl | 2010-12-01 | 2 | -12/+9 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | BUG#58246: INSTALL PLUGIN not secure & crashable | Mats Kindahl | 2010-12-01 | 1 | -5/+62 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
| * | | | | | | | Merging from mysql-5.1-bugteam | Alexander Barkov | 2010-11-26 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8 | Alexander Barkov | 2010-11-26 | 1 | -5/+5 | |
| * | | | | | | | Bug#57737 Character sets: search fails with like, contraction, index | Alexander Barkov | 2010-11-26 | 3 | -324/+198 |