diff options
| author | monty@mysql.com <> | 2005-10-27 22:45:18 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-27 22:45:18 +0300 |
| commit | a9b1ff40951a74666f3de90c7d79f40fc507ae16 (patch) | |
| tree | b6d33b8036e354e85e5951e6312d4bed8430b87c /mysql-test/include | |
| parent | faba744caf8c2f8da1b3b4e68d88ffd09a0e1601 (diff) | |
| download | mariadb-git-a9b1ff40951a74666f3de90c7d79f40fc507ae16.tar.gz | |
Add DROP TABLE before trying to create view (in mysqldump)
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/gis_generic.inc | 3 | ||||
| -rw-r--r-- | mysql-test/include/have_archive.inc | 6 | ||||
| -rw-r--r-- | mysql-test/include/have_geometry.inc | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/mysql-test/include/gis_generic.inc b/mysql-test/include/gis_generic.inc index 0bfb2bc7470..e5e7283e0e6 100644 --- a/mysql-test/include/gis_generic.inc +++ b/mysql-test/include/gis_generic.inc @@ -1,5 +1,4 @@ -source include/have_geometry.inc; ---source include/have_ndb.inc +--source include/have_geometry.inc # # Spatial objects diff --git a/mysql-test/include/have_archive.inc b/mysql-test/include/have_archive.inc index f7fb942e83e..262f66076a8 100644 --- a/mysql-test/include/have_archive.inc +++ b/mysql-test/include/have_archive.inc @@ -1,4 +1,4 @@ --- require r/have_archive.require -disable_query_log; +--require r/have_archive.require +--disable_query_log show variables like "have_archive"; -enable_query_log; +--enable_query_log diff --git a/mysql-test/include/have_geometry.inc b/mysql-test/include/have_geometry.inc index 169c3a41ee7..f0ec22af172 100644 --- a/mysql-test/include/have_geometry.inc +++ b/mysql-test/include/have_geometry.inc @@ -1,4 +1,4 @@ --- require r/have_geometry.require -disable_query_log; +--require r/have_geometry.require +--disable_query_log show variables like "have_geometry"; -enable_query_log; +--enable_query_log |