diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-28 08:51:53 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-28 12:09:18 +0200 |
| commit | 55b96d27089ee809dd0a4c9b3e0e3adb5a731bd4 (patch) | |
| tree | 1030a4338db0ca04b3ea0b2e22297e7a974fba14 /mysql-test/suite/innodb | |
| parent | d1a11568c7c187b8fb62be92a3276ec0f1a89df9 (diff) | |
| download | mariadb-git-55b96d27089ee809dd0a4c9b3e0e3adb5a731bd4.tar.gz | |
bump the VERSION to 10.1.6 and related changes
fix two #if MYSQL_VERSION_ID > 100105
Diffstat (limited to 'mysql-test/suite/innodb')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb.test | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index f8020e080e6..34ed2ef3110 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -2484,7 +2484,7 @@ INSERT INTO t2 VALUES(1); DELETE FROM t1 WHERE id = 1; ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `c1` FOREIGN KEY (`v`) REFERENCES `t1` (`id`)) DROP TABLE t1; -ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails +ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `c1` FOREIGN KEY (`v`) REFERENCES `t1` (`id`)) SET FOREIGN_KEY_CHECKS=0; DROP TABLE t1; SET FOREIGN_KEY_CHECKS=1; diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index 793f407d5d8..61eec8d4155 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -634,7 +634,7 @@ ERROR 42S02: Table 'test.bug29807' doesn't exist in engine drop table t1; drop table bug29807; Warnings: -Warning 155 Table 'test.bug29807' doesn't exist in engine +Warning 1932 Table 'test.bug29807' doesn't exist in engine CREATE TABLE t1 (a INT) ENGINE=InnoDB; CREATE TABLE t2 (a INT) ENGINE=InnoDB; switch to connection c1 diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index 47bbc90f955..bef13f5f418 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1551,7 +1551,7 @@ INSERT INTO t2 VALUES(1); --error 1451 DELETE FROM t1 WHERE id = 1; ---error 1217 +--error 1451 DROP TABLE t1; SET FOREIGN_KEY_CHECKS=0; |