Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic merge | Michael Widenius | 2011-05-19 | 1 | -1/+2 |
|\ | |||||
| * | Added HA_ERR_DISK_FULL handler error | Michael Widenius | 2011-05-18 | 1 | -1/+2 |
* | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -1/+2 |
|/ | |||||
* | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 6 | -7/+191 |
|\ | |||||
| * | Fixed all reported bugs for dynamic columns. | Michael Widenius | 2011-05-11 | 1 | -0/+6 |
| * | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 6 | -7/+185 |
* | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 11 | -113/+180 |
|\ \ | |/ |/| | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 11 | -90/+159 |
| |\ | |||||
| | * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 11 | -89/+156 |
| | |\ | |||||
| | | * | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 6 | -132/+115 |
| | | * | Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-16 | 2 | -7/+26 |
| | | * | Merge from mysql-5.1.55-release | unknown | 2011-02-08 | 2 | -2/+2 |
| | | |\ | |||||
| | | * \ | merge to 5.1. | Georgi Kodinov | 2011-02-02 | 2 | -0/+18 |
| | | |\ \ | |||||
| | | | * | | Fixes for Bug #55755 and Bug #52315 part 2 | Georgi Kodinov | 2011-02-02 | 2 | -0/+18 |
* | | | | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" | Michael Widenius | 2011-04-28 | 1 | -0/+1 |
* | | | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 14 | -16/+33 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge MWL#116 after-review fixes. | unknown | 2011-03-31 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | MWL#116: After-review fixes. | unknown | 2011-03-31 | 1 | -0/+2 |
* | | | | | | | | | merge mwl#55 | Vladislav Vaintroub | 2011-03-11 | 2 | -1/+67 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 14 | -16/+33 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 2 | -1/+67 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 14 | -17/+33 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 14 | -16/+33 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 13 | -14/+26 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Updating header copyright/README in source for 2011 | Karen Langford | 2011-01-25 | 2 | -2/+2 |
| | | | |/ / | | | |/| | | |||||
| | | * | | | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB files | Davi Arnaut | 2011-01-07 | 1 | -1/+3 |
| | | * | | | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB files | Davi Arnaut | 2011-01-07 | 1 | -0/+1 |
| | | * | | | Merge | Kent Boortz | 2010-12-29 | 4 | -6/+6 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 5 | -842/+7 |
| | | * | | | Bug #58426 Crashing tests not failing as they are supposed to on Solaris 10 d... | Tor Didriksen | 2010-12-13 | 1 | -1/+2 |
| | | * | | | Fix for bug#48451: my_seek and my_tell ignore MY_WME flag | Ramil Kalimullin | 2010-12-09 | 1 | -1/+2 |
| | | * | | | Merging patch for BUG#58246 with mysql-5.1-bugteam. | Mats Kindahl | 2010-12-01 | 2 | -3/+3 |
| | | |\ \ \ | |||||
| | | | * | | | Bug#51817: incorrect assumption: thd->query at 0x2ab2a8360360 is an invalid p... | Davi Arnaut | 2010-11-26 | 1 | -1/+1 |
| | | | * | | | Bug#57994: Compiler flag change build error : my_redel.c | Davi Arnaut | 2010-11-20 | 1 | -1/+1 |
| | | | * | | | Bug#57994: Compiler flag change build error : my_redel.c | Davi Arnaut | 2010-11-17 | 1 | -2/+2 |
| | | * | | | | BUG#58246: INSTALL PLUGIN not secure & crashable | Mats Kindahl | 2010-12-01 | 4 | -0/+5 |
| | | |/ / / | |||||
| | | * | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 2 | -1/+8 |
| | | * | | | Bug#57210: remove pstack | Davi Arnaut | 2010-11-09 | 1 | -1/+0 |
| | * | | | | Merge with 5.1 | Michael Widenius | 2011-01-30 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Flush DBUG log in case of DBUG_ASSERT() | Michael Widenius | 2011-01-30 | 1 | -1/+1 |
| | * | | | | | fixes for solaris 10 | Sergei Golubchik | 2011-01-26 | 1 | -0/+4 |
| | |/ / / / | |||||
| | * | | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -1/+2 |
* | | | | | | MRR interface: change range_info's type from char* to range_id_t typedef. The... | Sergey Petrunya | 2011-03-04 | 1 | -1/+3 |
* | | | | | | Merge in new handler and handlersocket code into 5.3 main | Michael Widenius | 2011-02-22 | 3 | -1/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added HANDLER support for MEMORY tables | Michael Widenius | 2011-01-11 | 1 | -0/+4 |
| * | | | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 2 | -1/+4 |
* | | | | | | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc... | Michael Widenius | 2011-02-18 | 2 | -1/+5 |
* | | | | | | | Added support for NO_RECORD record format (don't store any row data) for Aria. | Sergei Golubchik | 2011-01-14 | 1 | -1/+1 |