Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 5.2 -> 5.3 | unknown | 2012-11-01 | 1 | -1/+1 |
|\ | |||||
| * | Do not build pbxt. | unknown | 2012-10-31 | 1 | -1/+1 |
* | | Merge with 5.2 | Michael Widenius | 2011-12-14 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Merge with 5.1 | Michael Widenius | 2011-12-13 | 1 | -4/+4 |
| |\ | |||||
| | * | Fix GCC build failure in PBXT in some cases/platforms. | unknown | 2011-12-12 | 1 | -4/+4 |
* | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
* | | | 5.2->5.3 merge | Sergei Golubchik | 2011-11-12 | 2 | -4/+1 |
|\ \ \ | |/ / | |||||
| * | | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes). | unknown | 2011-10-27 | 9 | -20/+47 |
| |\ \ | | |/ | |||||
| | * | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 9 | -20/+47 |
* | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 9 | -19/+49 |
* | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | remove redundant declarations | Sergei Golubchik | 2011-10-04 | 1 | -1/+0 |
* | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -1/+1 |
* | | | Merge 5.2 -> 5.3 | Sergey Petrunya | 2011-06-24 | 1 | -30/+9 |
|\ \ \ | |/ / | |||||
| * | | Change in PBXT to only use pth_set_priority() (not setpriority()) to set prio... | Michael Widenius | 2011-06-13 | 1 | -30/+9 |
* | | | Fix compile errors and warnings and test errors introduced by microseconds push. | Vladislav Vaintroub | 2011-05-28 | 3 | -56/+6 |
* | | | merge | Vladislav Vaintroub | 2011-05-27 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.1 to get in fix wrong setpriority() call | Michael Widenius | 2011-05-26 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Disable call to setpriority() in pbxt. This caused mysqld to run with nice pr... | Michael Widenius | 2011-05-26 | 1 | -0/+2 |
* | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 5 | -1/+12 |
|\ \ \ | |/ / | |||||
| * | | Fix PBXT bugs found while testing with Application Verifier : | Vladislav Vaintroub | 2011-05-14 | 4 | -0/+12 |
| * | | LPBUG#782269 : Fixed double initialization of condition variables in PBXT. | Vladislav Vaintroub | 2011-05-13 | 1 | -1/+0 |
* | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge Mariadb 5.1->5.2 | unknown | 2011-04-12 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | fixed the preload.test pbxt bug | Vladimir Kolesnikov | 2011-04-07 | 1 | -0/+1 |
* | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 3 | -6/+22 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.1 to get fixes for tests and compiler warnings | Michael Widenius | 2011-03-01 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Get rid of compiler warnings | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 3 | -4/+20 |
| |\ \ | | |/ | |||||
| | * | Automatic merge with 5.1-merge to get in Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-26 | 2 | -2/+5 |
| | |\ | |||||
| | | * | Fixed compiler and build error: | Michael Widenius | 2011-02-25 | 1 | -0/+2 |
| | | * | Fixed build failures | Michael Widenius | 2011-02-23 | 1 | -2/+3 |
| | * | | MBUG#688404 : Fix pbxt crashes on Windows 64 in debug build | Vladislav Vaintroub | 2011-02-25 | 1 | -2/+15 |
| | |/ | |||||
* | | | Merge MWL#116, PBXT part into mariadb-5.2-rpl | unknown | 2011-01-31 | 4 | -47/+146 |
|\ \ \ | |/ / |/| | | |||||
| * | | MWL#116: Efficient group commit: PBXT part | unknown | 2010-10-15 | 4 | -47/+146 |
* | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
* | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 2 | -8/+9 |
|\ \ \ | |/ / | |||||
| * | | Fixed compiler warnings and a compilation failure on windows | Michael Widenius | 2010-11-27 | 2 | -5/+5 |
| * | | Patch from Sergey Petrunya: | Michael Widenius | 2010-11-26 | 1 | -3/+4 |
* | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 2 | -13/+18 |
|\ \ \ | |/ / | |||||
| * | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 2 | -13/+18 |
| |/ | |||||
* | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 20 | -84/+636 |
|\ \ | |/ | |||||
| * | Merge with 1.0.11-7 Pre-GA - 2010-09-09 | Michael Widenius | 2010-09-28 | 20 | -83/+663 |
* | | oqgraph and sphinx on windows | Sergei Golubchik | 2010-09-15 | 1 | -0/+3 |
* | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+2 |
|\ \ | |/ |