Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -2/+10 |
|\ | |||||
| * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -0/+1 |
| * | Bug#47649 crash during CALL procedure | Sergey Glukhov | 2009-12-23 | 1 | -2/+9 |
* | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -6/+18 |
|\ \ | |/ | |||||
| * | merge | Kristofer Pettersson | 2009-11-20 | 1 | -6/+18 |
| |\ | |||||
| | * | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -6/+18 |
* | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -18/+22 |
|\ \ \ | |||||
| * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -18/+22 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #47412: Valgrind warnings / user can read uninitalized memory using | Georgi Kodinov | 2009-10-26 | 1 | -14/+17 |
| | |/ | |||||
| | * | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -4/+5 |
* | | | Fixes after comments from last push: | Michael Widenius | 2009-11-30 | 1 | -1/+1 |
* | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -1/+2 |
|/ / | |||||
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -7/+5 |
|\ \ | |/ |/| | |||||
| * | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -7/+5 |
* | | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ... | Kristofer Pettersson | 2009-07-29 | 1 | -2/+2 |
* | | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -4/+2 |
|\ \ | |||||
| * | | Bug #38816: kill + flush tables with read lock + stored | Gleb Shchepa | 2009-07-24 | 1 | -4/+2 |
| * | | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -2/+31 |
| |\ \ | |||||
| | * | | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -5/+5 |
| | * | | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -8/+13 |
| | |\ \ | |||||
| | * \ \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -3/+10 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -0/+4 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -1/+7 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -2/+31 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Push history-limiting code until after the code that adds new | unknown | 2007-11-14 | 1 | -0/+29 |
| | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-04-26 | 1 | -2/+2 |
| | | | | |\ \ \ \ \ \ | |||||
* | | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -1/+2 |
* | | | | | | | | | | | | Bug#43962 "Packets out of order" calling a SHOW TABLE STATUS | Sergey Glukhov | 2009-04-30 | 1 | -0/+1 |
* | | | | | | | | | | | | merging | Alexey Botchkov | 2009-04-29 | 1 | -13/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | merging | Alexey Botchkov | 2009-04-28 | 1 | -13/+14 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Bug#25058 ignored return codes in memory allocation functions | Alexey Botchkov | 2008-11-21 | 1 | -13/+14 |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Auto merge | He Zhenxing | 2009-04-08 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -1/+2 |
* | | | | | | | | | | | Manual merge. | Ramil Kalimullin | 2009-03-25 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fix for bug#35383: binlog playback and replication breaks | Ramil Kalimullin | 2009-03-25 | 1 | -0/+5 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -8/+8 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
* | | | | | | | | | merged 5.1-5.1.29-rc -> 5.1-bugteam | Georgi Kodinov | 2008-10-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc | Gleb Shchepa | 2008-10-07 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / / | | _ / / / / / / / | | / / / / / / / | |||||
| * | | | | | | | | merge | Ramil Kalimullin | 2008-10-02 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge | Ramil Kalimullin | 2008-10-02 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Fix for bug#39182: Binary log producing incompatible character set query | Ramil Kalimullin | 2008-10-01 | 1 | -0/+3 |
* | | | | | | | | | | merging | Alexey Botchkov | 2008-09-30 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Bug#37949 Crash if argument to SP is a subquery that returns more than one row | Alexey Botchkov | 2008-09-29 | 1 | -1/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam | Marc Alff | 2008-08-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Bug#38296 (low memory crash with many conditions in a query) | Marc Alff | 2008-08-11 | 1 | -1/+1 |
* | | | | | | | | | Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam | Marc Alff | 2008-07-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on | Marc Alff | 2008-07-14 | 1 | -1/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | |