Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -0/+53 |
|\ | |||||
| * | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+53 |
* | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -5/+78 |
|/ | |||||
* | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -0/+2 |
|\ | |||||
| * | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -0/+2 |
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -26/+128 |
|\ \ | |/ |/| | |||||
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1. | Sergey Vojtovich | 2009-08-11 | 1 | -0/+6 |
| |\ | |||||
| | * | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 1 | -14/+26 |
| | |\ | |||||
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -0/+6 |
| * | | | Bug# 30946: mysqldump silently ignores --default-character-set | Gleb Shchepa | 2009-07-31 | 1 | -0/+60 |
| * | | | Bug#46265: Can not disable warning about unsafe statements for binary logging | Davi Arnaut | 2009-07-31 | 1 | -1/+2 |
| * | | | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -6/+25 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Bug #38816: kill + flush tables with read lock + stored | Gleb Shchepa | 2009-07-24 | 1 | -6/+25 |
| | * | | merged 5.0-main -> 5.0-bugteam | Georgi Kodinov | 2009-05-15 | 1 | -0/+17 |
| | |\ \ | |||||
| | | * | | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -2/+2 |
| | | * | | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -2/+29 |
| | | |\ \ | |||||
| | | * \ \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -3/+13 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -0/+7 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -7/+11 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -0/+17 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Push history-limiting code until after the code that adds new | unknown | 2007-11-14 | 1 | -0/+14 |
| | | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -0/+3 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-04-26 | 1 | -0/+3 |
| | | | | | |\ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | BUG#42851: Spurious "Statement is not safe to log in statement | Luis Soares | 2009-06-27 | 1 | -1/+3 |
| * | | | | | | | | | | | | Bug #34002 uninitialized Rows_examined for some admin queries | Staale Smedseng | 2009-06-25 | 1 | -0/+1 |
| * | | | | | | | | | | | | Fix for a valgrind warning due to use of a uninitialized | Davi Arnaut | 2009-06-08 | 1 | -1/+1 |
| * | | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -2/+2 |
| * | | | | | | | | | | | | Bug#44658 Create procedure makes server crash when user does not have ALL pri... | Kristofer Pettersson | 2009-05-29 | 1 | -10/+19 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Manual merge. | Ramil Kalimullin | 2009-05-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Fix for bug#42009: SELECT into variable gives different results to direct SELECT | Ramil Kalimullin | 2009-05-10 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Fix for bug#42009: SELECT into variable gives different results to direct SELECT | Ramil Kalimullin | 2009-02-24 | 1 | -1/+1 |
| * | | | | | | | | | | | BUG#42640 mysqld crashes when unsafe statements are executed (STRICT_TRANS_TA... | Guangbao Ni | 2009-04-03 | 1 | -1/+5 |
* | | | | | | | | | | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Manual merge. | Ramil Kalimullin | 2009-03-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Auto-merge | Ramil Kalimullin | 2009-03-25 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fix for bug#35383: binlog playback and replication breaks | Ramil Kalimullin | 2009-03-25 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Bug#43748: crash when non-super user tries to kill the replication threads | Tatiana A. Nurnberg | 2009-03-25 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Bug#43748: crash when non-super user tries to kill the replication threads | Tatiana A. Nurnberg | 2009-03-25 | 1 | -0/+7 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | merged 5.0-bugteam -> 5.1-bugteam | Georgi Kodinov | 2009-03-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Bug#43461: invalid comparison with string literal in default.c | Davi Arnaut | 2009-03-19 | 1 | -1/+1 |
| | * | | | | | | | | | | | Manual merge | Kristofer Pettersson | 2009-03-06 | 1 | -1/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | BUG#37051 Replication rules not evaluated correctly | He Zhenxing | 2009-03-05 | 1 | -1/+5 |
| | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Bug#40363 Bug 20023 is not fixed on 5.0 | Kristofer Pettersson | 2009-03-05 | 1 | -0/+6 |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | BUG#41980 SBL, INSERT .. SELECT .. LIMIT = ERROR, even when @@SQL_LOG_BIN is 0 ! | Guangbao Ni | 2009-03-05 | 1 | -1/+3 |
| | * | | | | | | | | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam. | Alexey Kopytov | 2009-02-13 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | |