diff options
| author | unknown <monty@mysql.com> | 2005-10-27 22:45:18 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-10-27 22:45:18 +0300 |
| commit | fd0ed478d3dd5919f3d659bb9b5b915a148941d4 (patch) | |
| tree | b6d33b8036e354e85e5951e6312d4bed8430b87c /mysql-test/t/archive_gis.test | |
| parent | 84d072dcbf3911a5f94042849e312526e93e17af (diff) | |
| download | mariadb-git-fd0ed478d3dd5919f3d659bb9b5b915a148941d4.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)
client/mysqldump.c:
Add DROP TABLE to be able to re-run mysqldump if it fails after 'table-named-as-view' is created
mysql-test/include/gis_generic.inc:
Remove dependency of ndb
mysql-test/include/have_archive.inc:
Fix syntax
mysql-test/include/have_geometry.inc:
Fix syntax
mysql-test/r/mysqldump.result:
New test results after adding 'drop table'
mysql-test/t/archive_gis.test:
gis_generic tests for have_geometry.inc
mysql-test/t/bdb_gis.test:
gis_generic tests for have_geometry.inc
mysql-test/t/innodb_gis.test:
gis_generic tests for have_geometry.inc
mysql-test/t/ndb_gis.test:
gis_generic tests for have_geometry.inc
sql/item_func.cc:
Simplify code (as signal_divide_by_null sets 'null_value')
Diffstat (limited to 'mysql-test/t/archive_gis.test')
| -rw-r--r-- | mysql-test/t/archive_gis.test | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/t/archive_gis.test b/mysql-test/t/archive_gis.test index feb3fb22f00..ffbad923173 100644 --- a/mysql-test/t/archive_gis.test +++ b/mysql-test/t/archive_gis.test @@ -1,4 +1,3 @@ -source include/have_geometry.inc; -source include/have_archive.inc; +--source include/have_archive.inc SET storage_engine=archive; --- source include/gis_generic.inc +--source include/gis_generic.inc |