Skip to content

Commit ff6cfe6

Browse files
author
brian@zim.(none)
committed
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.
1 parent 22644b5 commit ff6cfe6

10 files changed

+1990
-1443
lines changed

mysql-test/include/gis_generic.inc

+39-256
Large diffs are not rendered by default.

mysql-test/r/archive.result

+1,227-2
Large diffs are not rendered by default.

mysql-test/r/archive_gis.result

+37-270
Large diffs are not rendered by default.

mysql-test/r/bdb_gis.result

+37-267
Large diffs are not rendered by default.

mysql-test/r/innodb_gis.result

+37-267
Large diffs are not rendered by default.

mysql-test/r/ndb_gis.result

+606-379
Large diffs are not rendered by default.

mysql-test/t/archive.test

+5
Original file line numberDiff line numberDiff line change
@@ -1347,6 +1347,11 @@ SELECT * FROM t2;
13471347
# Just test syntax, we will never know if the output is right or wrong
13481348
# Must be the last test
13491349
INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
1350+
1351+
# Adding test for alter table
1352+
ALTER TABLE t2 DROP COLUMN fld6;
1353+
SHOW CREATE TABLE t2;
1354+
SELECT * from t2;
13501355
#
13511356
# Cleanup, test is over
13521357
#

mysql-test/t/archive_gis.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source include/have_geometry.inc;
22
source include/have_archive.inc;
33
SET storage_engine=archive;
4-
--source include/gis_generic.inc
4+
-- source include/gis_generic.inc

mysql-test/t/ndb_gis.test

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source include/have_geometry.inc;
22
--source include/have_ndb.inc
33
SET storage_engine=ndbcluster;
4+
--source include/gis_generic.inc
45
set engine_condition_pushdown = on;
56
--source include/gis_generic.inc

sql/ha_archive.cc

-1
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,6 @@ int ha_archive::free_share(ARCHIVE_SHARE *share)
453453
*/
454454
static const char *ha_archive_exts[] = {
455455
ARZ,
456-
ARN,
457456
ARM,
458457
NullS
459458
};

0 commit comments

Comments
 (0)