Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | | | | | | | | | | merge mysql-5.0-security->mysql-5.1-security | Georgi Kodinov | 2011-04-07 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / | | | | | |/| | | | | | | | | ||||||
| | | | | * | | | | | | | | | merge mysql-5.0->mysql-5.0-security | Georgi Kodinov | 2011-04-07 | 26 | -357/+226 | |
| | | | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | \ \ \ \ \ \ \ \ \ | merged mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-04-07 | 87 | -612/+1222 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | merge mysql-5.0-security->mysql-5.1-security | Georgi Kodinov | 2011-03-21 | 1 | -0/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | merge | Georgi Kodinov | 2011-03-21 | 1 | -0/+1 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | | | | | Bug #59815: Missing License information with enterprise GPL packages | Georgi Kodinov | 2011-02-08 | 1 | -0/+1 | |
| | | | | * | | | | | | | | | | | | merge 5.0->5.0-security | Georgi Kodinov | 2011-03-21 | 4 | -2210/+22 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | \ \ \ \ \ \ \ \ \ \ \ \ | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-03-21 | 6 | -2256/+52 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge 5.5->5.5-security | Georgi Kodinov | 2011-04-07 | 141 | -2231/+2953 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIES | Tor Didriksen | 2011-03-24 | 5 | -7/+41 | |
| | | * | | | | | | | | | | | | | | | | | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2011-03-21 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge 5.1->5.1-security | Georgi Kodinov | 2011-03-21 | 6 | -2256/+52 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / | | | | |/| | / / / / / / / / / / / / / / | | | | | | |/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-03-21 | 54 | -2557/+630 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | Fixed the test cleanup code post-merge | Georgi Kodinov | 2011-03-17 | 2 | -0/+2 | |
| | | * | | | | | | | | | | | | | | | | | | Fixed a post-merge embedded compilation error | Georgi Kodinov | 2011-03-17 | 1 | -0/+2 | |
| | | * | | | | | | | | | | | | | | | | | | merge 5.1-security->5.5-security | Georgi Kodinov | 2011-03-17 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | merge 5.1->5.1-security | Georgi Kodinov | 2011-03-17 | 87 | -29/+417 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merged mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-03-17 | 167 | -186/+1501 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | auto-merge | Georgi Kodinov | 2011-03-15 | 3 | -0/+42 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Bug #11765023: 57934: DOS POSSIBLE SINCE BINARY CASTING DOESN'T | Georgi Kodinov | 2011-03-15 | 3 | -0/+42 | |
| | | | * | | | | | | | | | | | | | | | | | | | automerge | Kristofer Pettersson | 2011-03-11 | 71 | -642/+2051 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | automerge | Kristofer Pettersson | 2011-03-14 | 3 | -9/+46 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | BUG#11766234: ASSERT (TABLE_REF->TABLE || TABLE_REF->VIEW) | Jorgen Loland | 2011-03-14 | 3 | -9/+46 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Certain fields in the protcol required a strict formatting. If | Kristofer Pettersson | 2011-03-14 | 1 | -32/+144 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Null merge 5.1 to 5.5. | Kristofer Pettersson | 2011-03-11 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | Certain fields in the protcol required a strict formatting. If | Kristofer Pettersson | 2011-03-11 | 1 | -22/+145 | |
| | | * | | | | | | | | | | | | | | | | | | | | | merge 5.1-security->5.5-security | Georgi Kodinov | 2011-03-09 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | Fixed a wrong error code in gis.test | Georgi Kodinov | 2011-03-09 | 2 | -3/+2 | |
| | | * | | | | | | | | | | | | | | | | | | | | | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2011-03-09 | 2 | -0/+3 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | merge 5.0-security->5.1-security | Georgi Kodinov | 2011-03-09 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | merge 5.0->5.0-security | Georgi Kodinov | 2011-03-09 | 1 | -7/+16 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge 5.1->5.1-security | Georgi Kodinov | 2011-03-09 | 68 | -641/+2020 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-03-09 | 202 | -1826/+5013 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge. | Sergey Vojtovich | 2011-03-03 | 3 | -1/+32 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | BUG#11764339 - valgrind errors, random data when returning | Sergey Vojtovich | 2011-03-03 | 3 | -1/+32 | |
| | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge from mysql-5.1-security | Magne Mahre | 2011-02-24 | 2 | -4/+13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Bug#11767480 - SPATIAL INDEXES ON NON-SPATIAL COLUMNS CAUSE CRASHES. | Magne Mahre | 2011-02-24 | 3 | -6/+96 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Null merge | Magne Mahre | 2011-02-24 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Raise version number after cloning 5.1.56 | Jonathan Perkin | 2011-02-11 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Raise version number after cloning 5.5.10 | Jonathan Perkin | 2011-02-11 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | BUG#12354268 | Luis Soares | 2011-05-06 | 3 | -1/+41 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | BUG#12354268 | Luis Soares | 2011-05-06 | 3 | -1/+41 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | BUG#12354268: MYSQLBINLOG --BASE64-OUTPUT=DECODE-ROWS DOES NOT | Luis Soares | 2011-05-05 | 3 | -1/+41 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 10 | -59/+69 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' | Luis Soares | 2011-05-06 | 10 | -61/+70 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | BUG#12425924 | Luis Soares | 2011-05-06 | 2 | -2/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | BUG#12425924: SEMI-SYNC RELATED VALGRIND WARNINGS IN 5.5 CODEBASE | Luis Soares | 2011-05-04 | 2 | -2/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Automerged (cherrypicked) cset from 5.6: | Luis Soares | 2011-05-04 | 1 | -0/+3 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Automerged (cherrypicked) cset from 5.6: | Luis Soares | 2011-05-04 | 1 | -2/+2 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2011-05-04 | 5 | -56/+186 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / / / / / / / |