Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Fixed lp:909051 Options --debug and --disable-debug are known but ambiguous i... | Michael Widenius | 2011-12-27 | 1 | -4/+4 | |
* | | | | | | | merge | Sergei Golubchik | 2011-11-03 | 3 | -22/+22 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 3 | -22/+22 | |
* | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 32 | -106/+141 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | merge | Daniel Fischer | 2011-09-23 | 1 | -5/+9 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORY | Tor Didriksen | 2011-09-21 | 1 | -5/+9 | |
| * | | | | | | | merge from 5.5.16 | Daniel Fischer | 2011-09-21 | 1 | -9/+45 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Manual merge from mysql-5.5. | Ramil Kalimullin | 2011-08-09 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Bug #12319710: INVALID MEMORY READ AND/OR CRASH IN MY_UCA_CHARCMP | Georgi Kodinov | 2011-07-22 | 1 | -9/+45 | |
| * | | | | | | | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORY | Tor Didriksen | 2011-09-20 | 1 | -2/+5 | |
| * | | | | | | | | merge 5.1 => 5.5 | Tor Didriksen | 2011-08-29 | 1 | -1/+8 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | | | ||||||
| | * | | | | | | BUG#12911710 - VALGRIND FAILURE IN ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INS... | Tor Didriksen | 2011-08-29 | 1 | -1/+8 | |
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 2 | -3/+9 | |
| | |\ \ \ \ \ \ | ||||||
| * | | | | | | | | Bug#12537160 ASSERTION FAILED: STOP0 <= &TO->BUF[TO->LEN] WITH LARGE NUMBER. | Tor Didriksen | 2011-07-18 | 1 | -1/+3 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 50 | -97/+118 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 76 | -163/+295 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 11 | -24/+35 | |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 53 | -438/+726 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| * | | | | | | | 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 | |
| | | | | |_|/ / / | | | | |/| | | | |