diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-30 22:57:18 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-30 22:57:18 +0200 |
| commit | efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e (patch) | |
| tree | 9eb3b78e20ecf4bd9e5cd587db50d51c1f06d336 /mysql-test/include | |
| parent | a7f87effa57f6486c23bf5b340c8474a635dcf71 (diff) | |
| parent | 6378bdbf47af72b2f899853586faa5a2d2f0fee1 (diff) | |
| download | mariadb-git-efcfb195e3fc4a2b87bfcb9ad136d46b9961f49e.tar.gz | |
Merge with 5.1
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/gis_keys.inc | 1 | ||||
| -rw-r--r-- | mysql-test/include/have_federated_plugin.inc | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/include/gis_keys.inc b/mysql-test/include/gis_keys.inc index ad00c7e1ef9..cc8ec68f7d1 100644 --- a/mysql-test/include/gis_keys.inc +++ b/mysql-test/include/gis_keys.inc @@ -33,6 +33,7 @@ EXPLAIN SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)'); SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)'); +--replace_column 9 # EXPLAIN SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)'); SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)'); diff --git a/mysql-test/include/have_federated_plugin.inc b/mysql-test/include/have_federated_plugin.inc deleted file mode 100644 index 5c7549de53f..00000000000 --- a/mysql-test/include/have_federated_plugin.inc +++ /dev/null @@ -1,5 +0,0 @@ -if (`select plugin_library IS NULL from information_schema.plugins where plugin_name LIKE '%federated%'`) -{ - --skip federated plugin not available -} - |