Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Georgi Kodinov | 2010-10-27 | 2 | -0/+46 |
|\ | |||||
| * | Auto-merge from mysql-5.5-bugteam. | Alexander Nozdrin | 2010-10-13 | 11 | -46/+178 |
| |\ | |||||
| * \ | Merge from mysql-5.1-security to mysql-5.5-security | Jimmy Yang | 2010-10-06 | 2 | -0/+46 |
| |\ \ | |||||
| | * | | Fix Bug #57255 Cascade Delete results in "Got error -1 from storage engine". | Jimmy Yang | 2010-10-06 | 2 | -0/+46 |
* | | | | Merge Bug #56680 from mysql-5.1. | Marko Mäkelä | 2010-10-19 | 2 | -0/+251 |
|\ \ \ \ | |||||
| * | | | | Bug #56680 wrong InnoDB results from a case-insensitive covering index | Marko Mäkelä | 2010-10-19 | 2 | -0/+232 |
* | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodb | Vasil Dimov | 2010-10-18 | 2 | -0/+52 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix Bug#57252 disabling innobase_stats_on_metadata disables ANALYZE | Vasil Dimov | 2010-10-18 | 2 | -0/+52 |
| * | | | | Merge mysql-5.1-bugteam -> mysql-5.1-innodb | Vasil Dimov | 2010-10-15 | 5 | -3/+54 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | merged mysql-5.1 into mysql-5.1-bugteam | Georgi Kodinov | 2010-10-05 | 4 | -1/+52 |
| | |\ \ \ | |||||
| | | * \ \ | Merge from mysql-5.1-bugteam to mysql-5.1-security | Jimmy Yang | 2010-09-01 | 2 | -0/+88 |
| | | |\ \ \ | |||||
| | | * \ \ \ | merge | Georgi Kodinov | 2010-08-20 | 2 | -8/+59 |
| | | |\ \ \ \ | |||||
| | * | \ \ \ \ | Merge mysql-5.1-innodb -> mysql-5.1-bugteam | Vasil Dimov | 2010-10-04 | 2 | -0/+14 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge from 5.1-mtr | Bjorn Munch | 2010-10-03 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Small test fix after 56753 | Bjorn Munch | 2010-09-30 | 1 | -2/+2 |
| | | * | | | | | | | merge from 5.1 | Bjorn Munch | 2010-09-29 | 5 | -0/+325 |
| | | |\ \ \ \ \ \ \ | |||||
* | | | \ \ \ \ \ \ \ | Merge mysql-5.5-bugteam -> mysql-5.5-innodb | Vasil Dimov | 2010-10-15 | 6 | -33/+165 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteam | Jon Olav Hauglid | 2010-10-07 | 6 | -33/+165 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.c | Davi Arnaut | 2010-10-06 | 6 | -33/+165 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge Bug#56716 from 5.1 | Marko Mäkelä | 2010-10-04 | 2 | -0/+14 |
* | | | | | | | | | | | Merge from mysql-5.1-innodb to mysql-5.5-innodb. | Jimmy Yang | 2010-10-14 | 2 | -0/+1137 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Tune the test for Bug#56143 too many foreign keys causes output of show creat... | Vasil Dimov | 2010-10-14 | 1 | -8/+558 |
| * | | | | | | | | | | Fix Bug#56143 too many foreign keys causes output of show create table to bec... | Vasil Dimov | 2010-10-13 | 2 | -0/+589 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Bug#56716 InnoDB locks a record gap without locking the table | Marko Mäkelä | 2010-10-04 | 2 | -0/+14 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Bug#56632 - The warning code related to KEY_BLOCK_SIZE and ROW_FORMAT when i... | klewis@mysql.com | 2010-10-12 | 2 | -0/+510 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | bug#56318: adjust the result files. | Calvin Sun | 2010-10-07 | 5 | -13/+13 |
* | | | | | | | | Merge mysql-5.5-innodb from bk-internal to my local tree | Vasil Dimov | 2010-10-04 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge Bug#56716 from 5.1 | Marko Mäkelä | 2010-10-04 | 2 | -0/+14 |
* | | | | | | | | Merge mysql-5.5-innodb -> mysql-5.5-bugteam | Vasil Dimov | 2010-10-01 | 3 | -207/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Temporarily backout the Information Schema System Table Information Schema | Jimmy Yang | 2010-09-16 | 3 | -207/+0 |
* | | | | | | | | merge | Georgi Kodinov | 2010-09-29 | 4 | -1/+50 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | merge from 5.5-merge | Georgi Kodinov | 2010-09-02 | 4 | -24/+110 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| * | | | | | | | | merge | Georgi Kodinov | 2010-08-20 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | merge | Georgi Kodinov | 2010-08-20 | 2 | -0/+27 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Bug #55826: create table .. select crashes with when | Georgi Kodinov | 2010-08-20 | 2 | -0/+28 |
| | * | | | | | | | | Fix Bug #55277 - Failing assertion: auto_inc > 0 | Sunny Bains | 2010-08-05 | 2 | -0/+25 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Fix Bug #55277 - Failing assertion: auto_inc > 0 | Sunny Bains | 2010-08-16 | 2 | -1/+24 |
* | | | | | | | | | Merge from 5.1-bugteam | Magne Mahre | 2010-09-16 | 2 | -0/+23 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Bug#39932 "create table fails if column for FK is in different | Magne Mahre | 2010-09-01 | 2 | -0/+38 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-30 | 3 | -24/+28 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Auto-merge from mysql-5.5-merge. | Alexander Nozdrin | 2010-08-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge from mysql-5.5-bugfixing to mysql-5.5-runtime | Jon Olav Hauglid | 2010-08-18 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | WL#5370 Keep forward-compatibility when changing | 2010-08-18 | 1 | -3/+6 | |
| * | | | | | | | | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. | Jon Olav Hauglid | 2010-08-18 | 3 | -24/+20 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge mysql-5.5-bugfixing -> mysql-5.5-innodb | Vasil Dimov | 2010-08-18 | 1 | -4/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | merge from trunk-mtr | Bjorn Munch | 2010-08-05 | 1 | -4/+0 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| | | | * | | | | | | merge from trunk | Bjorn Munch | 2010-07-23 | 4 | -0/+167 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | merge from trunk | Bjorn Munch | 2010-07-14 | 54 | -147/+6677 |
| | | | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Adjust innodb_gis.result | Vasil Dimov | 2010-08-17 | 1 | -1/+1 |
| | * | | | | | | | | | | Adjust innodb_mysql.result | Vasil Dimov | 2010-08-17 | 1 | -19/+19 |
| | |/ / / / / / / / / |