Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic merge | Michael Widenius | 2011-09-26 | 1 | -17/+16 |
|\ | |||||
| * | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -17/+16 |
* | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -1/+1 |
|/ | |||||
* | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -8/+9 |
|\ | |||||
| * | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -8/+9 |
* | | Fixed LP bug #825035. | Igor Babaev | 2011-08-16 | 1 | -0/+1 |
* | | Fixed LP bug #794901. | Igor Babaev | 2011-07-16 | 1 | -1/+1 |
* | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -18/+70 |
|\ \ | |||||
| * \ | Merge | Igor Babaev | 2011-05-20 | 1 | -18/+70 |
| |\ \ | |||||
| | * \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -18/+70 |
| | |\ \ | |||||
| | | * \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -18/+70 |
| | | |\ \ | |||||
| | | | * | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -18/+70 |
* | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -7/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | db_low_byte_first is gone | Sergei Golubchik | 2011-05-20 | 1 | -3/+0 |
| * | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -4/+9 |
* | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | BUG#59338 Inconsistency in binlog for statements that don't change any rows S... | Alfranio Correia | 2011-01-28 | 1 | -1/+1 |
| | | |/ / / | |||||
| * | | | | | Merge Mariadb 5.1->5.2 | unknown | 2011-04-12 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug fix for lp:732124 union + limit returns wrong result | Michael Widenius | 2011-03-09 | 1 | -1/+1 |
* | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -6/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -6/+8 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -6/+8 |
| * | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -0/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -3/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -3/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Bug#56423: Different count with SELECT and CREATE SELECT queries | Martin Hansson | 2010-10-07 | 1 | -3/+1 |
* | | | | | | Added TRASH() to table->record[0] to find out if we access not initialzed data. | Michael Widenius | 2010-11-27 | 1 | -3/+7 |
* | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -6/+8 |
|/ / / / / | |||||
* | | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -13/+112 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -13/+112 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge | Georgi Kodinov | 2010-08-20 | 1 | -0/+11 |
| | |\ \ \ | |||||
| | * | | | | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -13/+109 |
| | * | | | | Bug #54106 assert in Protocol::end_statement, | Jon Olav Hauglid | 2010-08-09 | 1 | -0/+3 |
* | | | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -1/+2 |
* | | | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * | | | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -0/+11 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | BUG#55625 RBR breaks on failing 'CREATE TABLE' | Alfranio Correia | 2010-08-02 | 1 | -0/+11 |
| | |/ / / | |||||
* | | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 1 | -2/+1 |
| * | | | | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ... | Michael Widenius | 2010-08-04 | 1 | -2/+3 |
* | | | | | merge with 5.1 | Sergei Golubchik | 2010-07-25 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -3/+3 |
* | | | | | Fixed bug #607566. | Igor Babaev | 2010-07-19 | 1 | -3/+6 |
* | | | | | Fixed bug #603186. | Igor Babaev | 2010-07-15 | 1 | -2/+13 |
| |_|/ / |/| | | | |||||
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |