Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -0/+1 |
|\ | |||||
* \ | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -0/+25 |
|\ \ | |||||
| * \ | Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUND | Yasufumi Kinoshita | 2012-01-10 | 1 | -0/+25 |
| |\ \ | |||||
| | * | | Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUND | Yasufumi Kinoshita | 2012-01-10 | 1 | -0/+25 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-03-06 | 1 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
* | | | | MDEV-117 Assertion: prebuilt->sql_stat_start || trx->conc_state == 1 failed a... | Sergei Golubchik | 2012-03-01 | 1 | -0/+12 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -20/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -0/+5 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -0/+5 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -0/+5 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | * | | | | Back-ported the fix and the test case for bug #50257 from mariadb-5.3 code line. | Igor Babaev | 2012-01-13 | 1 | -3/+3 |
| | * | | | | Fixed LP bug #906322. | Igor Babaev | 2011-12-19 | 1 | -3/+3 |
| * | | | | | Backport of: | Sergey Petrunya | 2012-02-16 | 3 | -4/+4 |
* | | | | | | enable test cases for bugs fixed in xtradb. | Sergei Golubchik | 2012-01-16 | 1 | -4/+4 |
* | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 7 | -101/+62 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merging from mysql-5.1 to mysql-5.5. | Annamalai Gurusami | 2011-12-13 | 1 | -0/+11 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bug #13117023: Innodb increments handler_read_key when it should not | Annamalai Gurusami | 2011-12-13 | 1 | -0/+5 |
| * | | | | | Fix Bug #13083023 - 60229: BROKEN COMPATIBILITY: ERROR WHILE CREATE TABLE | Jimmy Yang | 2011-12-07 | 1 | -0/+26 |
| * | | | | | Bug#11759044 - 51325: DROPPING AN EMPTY INNODB TABLE TAKES A LONG TIME | Inaam Rana | 2011-12-07 | 1 | -0/+1 |
| * | | | | | merge bug#13390506 from mysql-5.1 | Inaam Rana | 2011-11-18 | 1 | -0/+13 |
| * | | | | | Merge from mysql-5.5.18-release | unknown | 2011-11-17 | 4 | -2/+914 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge mysql-5.1-security to mysql-5.5-security. | Marko Mäkelä | 2011-10-26 | 1 | -0/+887 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge mysql-5.1-security to mysql-5.5-security. | Marko Mäkelä | 2011-10-25 | 1 | -1/+15 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge mysql-5.1-security -> mysql-5.5-security (Fix Bug#12661768) | Vasil Dimov | 2011-10-25 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-10-12 | 9 | -19/+184 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Backport from trunk of: | Tor Didriksen | 2011-08-19 | 1 | -1/+10 |
| * | | | | | | | | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-11-10 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-11-10 | 1 | -0/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 9 | -78/+188 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Backport of WL#5953 from MySQL 5.6 | unknown | 2011-12-19 | 1 | -2/+2 |
| * | | | | | | | | | | | Merge with 5.1 & fixes to IGNORE handling | Michael Widenius | 2011-12-11 | 8 | -25/+293 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 8 | -24/+292 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | _ / | | | | | | | | | | | / | |||||
| | * | | | | | | | | | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Fixed compiler warnings and other bugs found by buildbot. | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | * | | | | | | | | | | Fix testcases: | Vladislav Vaintroub | 2011-11-29 | 1 | -0/+1 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 4 | -1/+111 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Merge from mysql-5.1.60-release | Karen Langford | 2011-11-17 | 2 | -1/+17 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | / | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||||
| | | | * | | | | | | Fix results after Bug#12661768 fix. | Marko Mäkelä | 2011-10-26 | 1 | -1/+1 |
| | | | | |_|_|_|/ | | | | |/| | | | | |||||
| | | | * | | | | | Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTOR | Marko Mäkelä | 2011-10-25 | 1 | -1/+15 |
| | | | | |_|_|/ | | | | |/| | | | |||||
| | | | * | | | | Fix Bug#12661768 UPDATE IGNORE CRASHES SERVER IF TABLE IS INNODB AND IT IS | Vasil Dimov | 2011-10-25 | 1 | -0/+2 |
| | | * | | | | | Bug #12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE: Add a test case. | Marko Mäkelä | 2011-11-10 | 1 | -0/+17 |
| | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEY | Marko Mäkelä | 2011-11-10 | 1 | -0/+77 |
| | | |/ / / | |||||
| | * | | | | Fixes of testcases after merge with MySQL 5.1.59 | Michael Widenius | 2011-11-23 | 3 | -27/+55 |
| | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 3 | -0/+129 |
| | |\ \ \ \ | | | |/ / / | |||||
| | * | | | | test fix. | unknown | 2011-07-21 | 1 | -1/+2 |
| | * | | | | Fixed PBXT test. | unknown | 2011-07-21 | 1 | -2/+1 |
| * | | | | | Set new default values for the optimizer switch flags 'derived_merge' | Igor Babaev | 2011-11-26 | 1 | -0/+6 |
* | | | | | | Fix some failing tests on Windows | Vladislav Vaintroub | 2012-01-06 | 1 | -1/+1 |
* | | | | | | rename debug variable to debug_dbug, to make test pass in release builds | Sergei Golubchik | 2011-12-15 | 5 | -13/+13 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 2 | -12/+12 |
|\ \ \ \ \ \ | |/ / / / / |