Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -5/+8 |
|\ | |||||
| * | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -5/+8 |
* | | merge with 5.1 | Sergei Golubchik | 2010-09-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix valgrind failure with Unique class | Sergey Petrunya | 2010-09-14 | 1 | -1/+1 |
* | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -1/+1 |
* | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -15/+49 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -14/+49 |
| |\ | |||||
| | * | Bug #53493 : add_to_status does not handle the longlong fields in STATUS_VAR | Georgi Kodinov | 2010-07-14 | 1 | -7/+10 |
| | * | The following statements support the CURRENT_USER() where a user is needed. | unknown | 2010-07-04 | 1 | -0/+31 |
| | * | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -7/+8 |
* | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -2/+17 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -2/+17 |
| |\ \ | | |/ | |||||
| | * | Revert Bug#48321 due to build breakage and failing tests. | Davi Arnaut | 2010-06-28 | 1 | -16/+0 |
| | * | The following statements support the CURRENT_USER() where a user is needed. | unknown | 2010-06-27 | 1 | -0/+16 |
| | * | Bug#41660: Sort-index_merge for non-first join table may | Martin Hansson | 2010-06-24 | 1 | -0/+3 |
| | * | merge | Georgi Kodinov | 2010-06-04 | 1 | -0/+5 |
| | |\ | |||||
| | | * | Bug #52315: utc_date() crashes when system time > year 2037 | Georgi Kodinov | 2010-06-04 | 1 | -0/+5 |
| | * | | Bug #49756 Rows_examined is always 0 in the slow query log for | Staale Smedseng | 2010-05-12 | 1 | -2/+9 |
* | | | | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 1 | -0/+21 |
* | | | | --plugin_maturity command-line option | Sergei Golubchik | 2010-06-16 | 1 | -1/+0 |
* | | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s... | Sergei Golubchik | 2010-06-05 | 1 | -0/+146 |
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -2/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | BUG#39053 - UNISTALL PLUGIN does not allow the storage engine | Sergey Vojtovich | 2010-04-14 | 1 | -1/+5 |
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#48525: trigger changes "Column 'id' cannot be null" behaviour | Tatiana A. Nurnberg | 2010-03-29 | 1 | -0/+1 |
| | * | | revert 48525 | Tatiana A. Nurnberg | 2010-02-22 | 1 | -1/+0 |
| | * | | Bug#48525: trigger changes "Column 'id' cannot be null" behaviour | Tatiana A. Nurnberg | 2010-02-18 | 1 | -0/+1 |
| | * | | Bug#49534: multitable IGNORE update with sql_safe_updates | Martin Hansson | 2010-02-10 | 1 | -1/+1 |
* | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -3/+5 |
* | | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -0/+2 |
* | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+2 |
* | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -1/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -1/+1 |
| | * | | BUG#46364 MyISAM transbuffer problems (NTM problem) | Alfranio Correia | 2010-01-20 | 1 | -0/+1 |
| | * | | Auto-merged. | Evgeny Potemkin | 2009-12-02 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#48508: Crash on prepared statement re-execution. | Evgeny Potemkin | 2009-12-01 | 1 | -0/+2 |
* | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -4/+70 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -4/+69 |
| |\ \ \ | |||||
| | * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -4/+69 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | manual merge of 28141 | Tatiana A. Nurnberg | 2009-10-20 | 1 | -0/+6 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd... | Tatiana A. Nurnberg | 2009-10-19 | 1 | -0/+6 |
| | | * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -2/+5 |
| | | * | | Bug#47280 - strange results from count(*) with order by multiple | Jorgen Loland | 2009-10-14 | 1 | -1/+26 |
| | | * | | auto-merge | Ingo Struewing | 2009-10-01 | 1 | -0/+5 |
| | | |\ \ | |||||
| | | | * | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+5 |
| | | * | | | Bug#46958: Assertion in Diagnostics_area::set_ok_status, | Martin Hansson | 2009-09-28 | 1 | -1/+2 |
| | | |/ / | |||||
| | | * | | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table | Sergey Glukhov | 2009-09-10 | 1 | -0/+25 |