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/include | |
| 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/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 |