summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-2574-133/+49
* merge.Sergei Golubchik2010-11-2522-73/+195
|\
| * Fixed LP bug #668644.Igor Babaev2010-11-082-2/+72
| * 5.2 mergeSergei Golubchik2010-10-284-5/+197
| |\
| | * 5.1.51 mergeSergei Golubchik2010-10-194-5/+197
| | |\
| * | | Merge MariaDB 5.2 -> MariaDB 5.3Sergey Petrunya2010-10-141-3/+3
| * | | Merge 5.2->5.3Sergey Petrunya2010-10-1055-17/+10904
| |\ \ \ | | |/ /
| | * | Enable tests that were previously disabled waiting for XtraDB merge.unknown2010-09-031-1/+0
| | * | Fixed failing testsMichael Widenius2010-08-282-0/+4
| | * | Merge with MySQL 5.1.50Michael Widenius2010-08-276-0/+326
| | |\ \
| | * | | generalization of mtr to support suite.pm extensions:Sergei Golubchik2010-08-1713-12/+13
| | * | | Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-048-31/+41
| | * | | Disable some tests that is waiting for next merge with xtradbMichael Widenius2010-08-021-0/+2
| | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-0242-0/+10542
| | |\ \ \ | |/ / / /
| * | | | Fixed compiler warningsMichael Widenius2010-05-272-1/+6
| * | | | Resolve bzr conflictsMichael Widenius2010-05-261-0/+48
| * | | | Merge with MySQL 5.1.47Michael Widenius2010-05-2688-4706/+5323
| |\ \ \ \
| * \ \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-289-14/+246
| |\ \ \ \ \
| * \ \ \ \ \ Merge with MySQL 5.1.42Michael Widenius2010-01-157-1/+107
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-308-80/+206
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-1610-80/+209
| | |\ \ \ \ \ \ \
| * | | | | | | | | Merge XtraDB 8 into MariaDB.unknown2009-11-134-105/+0
| |/ / / / / / / /
| * | | | | | | | Don't test innodb-use-sys-malloc under Valgrind.unknown2009-09-121-0/+3
* | | | | | | | | test result updated to match [incorrect] mysql result.Sergei Golubchik2010-11-051-1/+1
* | | | | | | | | mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-058-0/+173
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Bug #57255 Cascade Delete results in "Got error -1 from storage engine".Jimmy Yang2010-10-062-0/+46
| * | | | | | | | | merged mysql-5.1 into mysql-5.1-bugteamGeorgi Kodinov2010-10-054-1/+52
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge from mysql-5.1-bugteam to mysql-5.1-securityJimmy Yang2010-09-012-0/+88
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ mergeGeorgi Kodinov2010-08-202-8/+59
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #55826: create table .. select crashes with when Georgi Kodinov2010-08-202-0/+28
| | * | | | | | | | | | Fix Bug #55277 - Failing assertion: auto_inc > 0Sunny Bains2010-08-052-0/+25
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-10-042-0/+14
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#56716 InnoDB locks a record gap without locking the tableMarko Mäkelä2010-10-042-0/+14
| * | | | | | | | | | | merge from 5.1-mtrBjorn Munch2010-10-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Small test fix after 56753Bjorn Munch2010-09-301-2/+2
| | * | | | | | | | | | merge from 5.1Bjorn Munch2010-09-295-0/+325
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
* | | | | | | | | | | | Merge from 5.1-bugteamMagne Mahre2010-09-162-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Bug#39932 "create table fails if column for FK is in differentMagne Mahre2010-09-012-0/+38
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-303-24/+28
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-251-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge from mysql-5.5-bugfixing to mysql-5.5-runtimeJon Olav Hauglid2010-08-181-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | WL#5370 Keep forward-compatibility when changing unknown2010-08-181-3/+6
| * | | | | | | | | | | | | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.Jon Olav Hauglid2010-08-183-24/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge mysql-5.5-bugfixing -> mysql-5.5-innodbVasil Dimov2010-08-181-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ merge from trunk-mtrBjorn Munch2010-08-051-4/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ merge from trunkBjorn Munch2010-07-234-0/+167
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ merge from trunkBjorn Munch2010-07-1454-147/+6677
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Adjust innodb_gis.resultVasil Dimov2010-08-171-1/+1
| | * | | | | | | | | | | | | | | | Adjust innodb_mysql.resultVasil Dimov2010-08-171-19/+19
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Part of fix for bug#52044 "FLUSH TABLES WITH READ LOCK andDmitry Lenev2010-08-061-1/+2
| |/ / / / / / / / / / / / / / /