diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2015-08-26 02:09:57 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2015-08-26 02:09:57 +0300 |
| commit | cf154cc9d23aa050157d891443a16c90260fbd74 (patch) | |
| tree | 5eec123dae6ecfc501fb271d2e775812eb629d50 /storage/myisam | |
| parent | 871259f171637dbcdae95115f82374ff0edfcd86 (diff) | |
| download | mariadb-git-cf154cc9d23aa050157d891443a16c90260fbd74.tar.gz | |
MDEV-8676 Some storage_engine tests fail on 10.1
- foreign_keys: adjusted according to code changes;
- type_spatial: adjusted according to code changes;
- type_spatial_indexes (for MyISAM): disabled till MDEV-8675 is fixed
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mysql-test/storage_engine/disabled.def | 1 | ||||
| -rw-r--r-- | storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/mysql-test/storage_engine/disabled.def b/storage/myisam/mysql-test/storage_engine/disabled.def new file mode 100644 index 00000000000..c2bfd926381 --- /dev/null +++ b/storage/myisam/mysql-test/storage_engine/disabled.def @@ -0,0 +1 @@ +type_spatial_indexes : MDEV-8675 Different results of GIS functions on NULL vs NOT NULL columns diff --git a/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff b/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff index 205e7314fda..cf24f2c3e61 100644 --- a/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff +++ b/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff @@ -56,7 +56,7 @@ +3 b DROP TABLE t1; -ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails -+# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED) ++# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED_2) +# ------------ UNEXPECTED RESULT ------------ +# The statement|command succeeded unexpectedly. +# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. |