diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-07 16:22:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-07 16:22:36 +0100 |
| commit | 2682a280c8095a367fc8cbe2c1323ba4340f75e8 (patch) | |
| tree | 4c6aeb798dcb963b0df31cf3da1e823a70d67608 /mysql-test/include | |
| parent | e83dd9b517239dedb727263c7eeda89ada6d4c57 (diff) | |
| download | mariadb-git-2682a280c8095a367fc8cbe2c1323ba4340f75e8.tar.gz | |
allow suite.pm to skip combinations that originate from test/include files.
storage/innobase/handler/handler0alter.cc:
for NEWDATE key_type says unsigned, thus col->prtype says unsigned,
but field->flags says signed. Use the same flag for value retrieval
that was used for value storage.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_innodb.combinations | 12 | ||||
| -rw-r--r-- | mysql-test/include/have_innodb.opt | 2 | ||||
| -rw-r--r-- | mysql-test/include/innodb_rollback_on_timeout.inc | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/mysql-test/include/have_innodb.combinations b/mysql-test/include/have_innodb.combinations new file mode 100644 index 00000000000..5051719d92a --- /dev/null +++ b/mysql-test/include/have_innodb.combinations @@ -0,0 +1,12 @@ +[innodb_plugin] +ignore-builtin-innodb +plugin-load=$HA_INNODB_SO +innodb + +[xtradb_plugin] +ignore-builtin-innodb +plugin-load=$HA_XTRADB_SO +innodb + +[xtradb] +innodb diff --git a/mysql-test/include/have_innodb.opt b/mysql-test/include/have_innodb.opt deleted file mode 100644 index 4fb96229a7b..00000000000 --- a/mysql-test/include/have_innodb.opt +++ /dev/null @@ -1,2 +0,0 @@ ---loose-innodb ---plugin-load=$HA_XTRADB_SO diff --git a/mysql-test/include/innodb_rollback_on_timeout.inc b/mysql-test/include/innodb_rollback_on_timeout.inc index 6be47397e4b..274bbe12566 100644 --- a/mysql-test/include/innodb_rollback_on_timeout.inc +++ b/mysql-test/include/innodb_rollback_on_timeout.inc @@ -1,3 +1,4 @@ +--source include/have_innodb.inc # # Bug #24200: Provide backwards compatibility mode for 4.x "rollback on # transaction timeout" |