Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -4/+12 | |
|\ | ||||||
| * | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-30 | 1 | -3/+0 | |
| * | BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave | unknown | 2010-07-29 | 1 | -4/+15 | |
* | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -38/+29 | |
|\ \ | |/ | ||||||
| * | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -28/+20 | |
| |\ | ||||||
| | * | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -29/+21 | |
| * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -10/+9 | |
| |/ | ||||||
* | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -0/+1 | |
|\ \ | |/ | ||||||
| * | Bug#50755: Crash if stored routine def contains version comments | Davi Arnaut | 2010-04-01 | 1 | -0/+1 | |
* | | Changed the fixes for the following bugs: | Igor Babaev | 2010-05-25 | 1 | -1/+0 | |
* | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+1 | |
|\ \ | |/ | ||||||
| * | Bug #45640: optimizer bug produces wrong results | Gleb Shchepa | 2010-02-06 | 1 | -0/+1 | |
* | | Fix some compiler warnings seen in Buildbot. | unknown | 2010-03-10 | 1 | -4/+7 | |
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -1/+7 | |
|\ \ | ||||||
| * | | MWL#17: Table elimination | Sergey Petrunya | 2009-07-08 | 1 | -1/+5 | |
| * | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-22 | 1 | -1/+3 | |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -26/+87 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | Manual merge. | Davi Arnaut | 2009-08-10 | 1 | -3/+6 | |
| |\ | ||||||
| | * | Bug#45010: invalid memory reads during parsing some strange statements | Davi Arnaut | 2009-08-07 | 1 | -7/+9 | |
| | | | ||||||
| | \ | ||||||
| *-. \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -8/+7 | |
| |\ \ \ | | | |/ | ||||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-17 | 1 | -6/+6 | |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-10 | 1 | -17/+17 | |
| | |/ | ||||||
| * | | merged 5.0-bugteam to 5.1-bugteam | Georgi Kodinov | 2009-05-27 | 1 | -0/+10 | |
| |\ \ | ||||||
| | * | | Bug #38159: Function parsing problem generates misleading error message | Georgi Kodinov | 2009-05-27 | 1 | -0/+16 | |
| | |/ | ||||||
| | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -2/+2 | |
| | | |\ | ||||||
| | | * \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -12/+31 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge from mysql-5.0.66-release | Jonathan Perkin | 2008-07-17 | 1 | -16/+3 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -2/+1 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -1/+1 | |
| | | |\ \ \ \ \ | ||||||
| | | | * \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ | ||||||
| * | | | \ \ \ \ \ | Merge fix for bug 39559 and bugteam trunk. | Chad MILLER | 2009-04-10 | 1 | -22/+69 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Bug#39559: dump of stored procedures / functions with C-style \ | Chad MILLER | 2009-04-09 | 1 | -22/+69 | |
| * | | | | | | | | | | Merge Bug#43230 into mysql-5.1-bugteam | Davi Arnaut | 2009-04-03 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Bug#43230: SELECT ... FOR UPDATE can hang with FLUSH TABLES WITH READ LOCK in... | Davi Arnaut | 2009-04-03 | 1 | -0/+1 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
* | | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -2/+2 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
* | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Bug#39843 DELETE requires write access to table in subquery in where clause | Kristofer Pettersson | 2009-03-05 | 1 | -0/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge from mysql-5.1.30-release | unknown | 2008-11-27 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 | |
| * | | | | | | | | | Fix warnings and bug spotted by gcc-4.3. | Davi Arnaut | 2008-12-16 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -21/+31 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2008-10-15 | 1 | -3/+8 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | ||||||
| * | | | | | | Bug#37075: offset of limit clause might be truncated on 32-bits server w/o bi... | Davi Arnaut | 2008-10-15 | 1 | -4/+18 | |
* | | | | | | | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc | Gleb Shchepa | 2008-10-08 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |