Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -0/+17 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -0/+17 |
| |\ | |||||
| | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+17 |
| | |\ | |||||
| | | * | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -0/+17 |
* | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -15/+79 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -3/+17 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+17 |
| | |\ \ | | | |/ | |||||
| | | * | BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave | unknown | 2010-07-29 | 1 | -3/+17 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -14/+57 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -14/+57 |
| | |\ \ | | | |/ | |||||
| | | * | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -4/+44 |
| | | |\ | |||||
| | | | * | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -4/+44 |
| | | * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -10/+13 |
| | | |/ | |||||
| * | | | Fixed bug #603186. | Igor Babaev | 2010-07-15 | 1 | -0/+7 |
* | | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -0/+6 |
* | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -0/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Changed the fixes for the following bugs: | Igor Babaev | 2010-05-25 | 1 | -2/+0 |
| | * | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -0/+1 |
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+3 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #50095 Multi statement including CREATE EVENT causes rotten binlog entry | unknown | 2010-03-28 | 1 | -0/+1 |
| | | * | Bug #45640: optimizer bug produces wrong results | Gleb Shchepa | 2010-02-06 | 1 | -0/+2 |
| | | * | Revert a patch for Bug#48231, which introduced valgrind warnings. | Alexander Nozdrin | 2010-02-02 | 1 | -25/+0 |
| | | * | Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; | unknown | 2010-01-30 | 1 | -0/+25 |
| * | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -0/+5 |
| * | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -0/+2 |
* | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -7/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -7/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -7/+0 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#43746: YACC return wrong query string when parse 'load data infile' sql s... | Tatiana A. Nurnberg | 2009-09-28 | 1 | -7/+0 |
* | | | | Subquery optimization backport: | Sergey Petrunya | 2010-02-16 | 1 | -1/+1 |
* | | | | BUG#31480: Incorrect result for nested subquery when executed via semi join | Sergey Petrunya | 2010-02-12 | 1 | -1/+1 |
* | | | | Subquery optimizations: non-semijoin materialization | Sergey Petrunya | 2010-01-28 | 1 | -1/+2 |
* | | | | Backport of subquery optimizations to 5.3. | Sergey Petrunya | 2010-01-17 | 1 | -1/+2 |
|/ / / | |||||
* | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+9 |
| |/ / | |||||
* | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -0/+2 |
|/ / | |||||
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | MWL#17: Table elimination | Sergey Petrunia | 2009-06-22 | 1 | -1/+1 |
* | | Manual merge. | Davi Arnaut | 2009-08-10 | 1 | -4/+4 |
|\ \ | |||||
* \ \ | merged 5.0-bugteam to 5.1-bugteam | Georgi Kodinov | 2009-05-27 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Bug #38159: Function parsing problem generates misleading error message | Georgi Kodinov | 2009-05-27 | 1 | -0/+2 |
| |/ / | |||||
| * | | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -1/+9 |
| |\ \ | |||||
| | * \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -3/+56 |
| | |\ \ | |||||
| | * \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -1/+10 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -1/+9 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-10-10 | 1 | -1/+9 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -1/+9 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -1/+9 |
| | | | | |\ \ \ \ | |||||
* | | | | | \ \ \ \ | Merge fix for bug 39559 and bugteam trunk. | Chad MILLER | 2009-04-10 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ |