diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-06 10:34:16 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-07 10:39:12 +0200 |
commit | 1789e0ff03a4b405ae2c9802f182e128427b29fd (patch) | |
tree | d9d74ab914f1d5c1ea33a25659cf63022d78692a /mysql-test/suite/innodb_gis | |
parent | 5815c8ee85955ce90b078f90f534f18c569db5ad (diff) | |
download | mariadb-git-1789e0ff03a4b405ae2c9802f182e128427b29fd.tar.gz |
Remove useless debug instrumentation row_print_geometry_data
Diffstat (limited to 'mysql-test/suite/innodb_gis')
-rw-r--r-- | mysql-test/suite/innodb_gis/r/geometry.result | 35 | ||||
-rw-r--r-- | mysql-test/suite/innodb_gis/r/types.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/innodb_gis/t/geometry.test | 37 | ||||
-rw-r--r-- | mysql-test/suite/innodb_gis/t/types.test | 7 |
4 files changed, 14 insertions, 68 deletions
diff --git a/mysql-test/suite/innodb_gis/r/geometry.result b/mysql-test/suite/innodb_gis/r/geometry.result index 60c5f80f69b..780efc11bce 100644 --- a/mysql-test/suite/innodb_gis/r/geometry.result +++ b/mysql-test/suite/innodb_gis/r/geometry.result @@ -1,21 +1,5 @@ SET default_storage_engine=InnoDB; SET innodb_strict_mode=OFF; -SET SESSION debug="+d,row_print_geometry_data"; -SHOW VARIABLES LIKE '%engine%'; -Variable_name Value -default_storage_engine InnoDB -default_tmp_storage_engine InnoDB -disabled_storage_engines -internal_tmp_disk_storage_engine InnoDB -USE test; -DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon; -DROP TABLE IF EXISTS gis_multi_point, gis_multi_line, gis_multi_polygon; -DROP TABLE IF EXISTS gis_geometrycollection, gis_geometry; -DROP TABLE IF EXISTS tab,tab2,tab3,parent,emp2; -DROP PROCEDURE IF EXISTS geominout; -DROP PROCEDURE IF EXISTS geom_insert; -DROP TRIGGER IF EXISTS geom_trigger; -DROP PROCEDURE IF EXISTS geom_cursor; CREATE TABLE gis_point (fid INTEGER NOT NULL PRIMARY KEY, g POINT) ENGINE=InnoDB; CREATE TABLE gis_line (fid INTEGER NOT NULL PRIMARY KEY, g LINESTRING) ENGINE=InnoDB; CREATE TABLE gis_polygon (fid INTEGER NOT NULL PRIMARY KEY, g POLYGON) ENGINE=InnoDB; @@ -1136,15 +1120,10 @@ COMMIT; SELECT COUNT(*) FROM tab3; COUNT(*) 0 -DROP TABLE IF EXISTS gis_point, gis_line, gis_polygon, gis_multi_point; -DROP TABLE IF EXISTS gis_multi_line, gis_multi_polygon; -DROP TABLE IF EXISTS gis_geometrycollection, gis_geometry; -DROP TABLE IF EXISTS tab,tab2,tab3,parent,emp2; -Warnings: -Note 1051 Unknown table 'test.emp2' -DROP PROCEDURE IF EXISTS geominout; -DROP PROCEDURE IF EXISTS geom_insert; -DROP TRIGGER IF EXISTS geom_trigger; -Warnings: -Note 1360 Trigger does not exist -DROP PROCEDURE IF EXISTS geom_cursor; +DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point; +DROP TABLE gis_multi_line, gis_multi_polygon; +DROP TABLE gis_geometrycollection, gis_geometry; +DROP TABLE tab,tab2,tab3,parent; +DROP PROCEDURE geominout; +DROP PROCEDURE geom_insert; +DROP PROCEDURE geom_cursor; diff --git a/mysql-test/suite/innodb_gis/r/types.result b/mysql-test/suite/innodb_gis/r/types.result index 7d823927df1..12e1eb44cd7 100644 --- a/mysql-test/suite/innodb_gis/r/types.result +++ b/mysql-test/suite/innodb_gis/r/types.result @@ -1,6 +1,3 @@ -SET SESSION debug="+d,row_print_geometry_data"; -Warnings: -Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead CREATE TABLE t_wl6455 ( i INT, g GEOMETRY NOT NULL) ENGINE=InnoDB; SHOW CREATE TABLE t_wl6455; Table Create Table diff --git a/mysql-test/suite/innodb_gis/t/geometry.test b/mysql-test/suite/innodb_gis/t/geometry.test index 6450e82e2e4..2d030f90dc9 100644 --- a/mysql-test/suite/innodb_gis/t/geometry.test +++ b/mysql-test/suite/innodb_gis/t/geometry.test @@ -9,37 +9,15 @@ # All Geometric functions. #******************************************************** --source include/have_geometry.inc ---source include/not_embedded.inc ---source include/have_debug.inc --source include/have_innodb.inc SET default_storage_engine=InnoDB; SET innodb_strict_mode=OFF; -# Turn on the geometry data print. -SET SESSION debug="+d,row_print_geometry_data"; - -SHOW VARIABLES LIKE '%engine%'; - # # Spatial objects # -USE test; - ---disable_warnings -DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon; -DROP TABLE IF EXISTS gis_multi_point, gis_multi_line, gis_multi_polygon; -DROP TABLE IF EXISTS gis_geometrycollection, gis_geometry; -DROP TABLE IF EXISTS tab,tab2,tab3,parent,emp2; -DROP PROCEDURE IF EXISTS geominout; -DROP PROCEDURE IF EXISTS geom_insert; -DROP TRIGGER IF EXISTS geom_trigger; -DROP PROCEDURE IF EXISTS geom_cursor; - - ---enable_warnings - CREATE TABLE gis_point (fid INTEGER NOT NULL PRIMARY KEY, g POINT) ENGINE=InnoDB; CREATE TABLE gis_line (fid INTEGER NOT NULL PRIMARY KEY, g LINESTRING) ENGINE=InnoDB; CREATE TABLE gis_polygon (fid INTEGER NOT NULL PRIMARY KEY, g POLYGON) ENGINE=InnoDB; @@ -694,11 +672,10 @@ COMMIT; SELECT COUNT(*) FROM tab3; -DROP TABLE IF EXISTS gis_point, gis_line, gis_polygon, gis_multi_point; -DROP TABLE IF EXISTS gis_multi_line, gis_multi_polygon; -DROP TABLE IF EXISTS gis_geometrycollection, gis_geometry; -DROP TABLE IF EXISTS tab,tab2,tab3,parent,emp2; -DROP PROCEDURE IF EXISTS geominout; -DROP PROCEDURE IF EXISTS geom_insert; -DROP TRIGGER IF EXISTS geom_trigger; -DROP PROCEDURE IF EXISTS geom_cursor; +DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point; +DROP TABLE gis_multi_line, gis_multi_polygon; +DROP TABLE gis_geometrycollection, gis_geometry; +DROP TABLE tab,tab2,tab3,parent,emp2; +DROP PROCEDURE geominout; +DROP PROCEDURE geom_insert; +DROP PROCEDURE geom_cursor; diff --git a/mysql-test/suite/innodb_gis/t/types.test b/mysql-test/suite/innodb_gis/t/types.test index 65f65e5ae1f..fab0db5f755 100644 --- a/mysql-test/suite/innodb_gis/t/types.test +++ b/mysql-test/suite/innodb_gis/t/types.test @@ -6,13 +6,6 @@ # Restarting is not supported in embedded --source include/not_embedded.inc --source include/have_innodb.inc ---source include/have_debug.inc - -# Avoid CrashReporter popup on Mac ---source include/not_crashrep.inc - -# Turn on the geometry data print. -SET SESSION debug="+d,row_print_geometry_data"; # Test GEOMETRY datatype. CREATE TABLE t_wl6455 ( i INT, g GEOMETRY NOT NULL) ENGINE=InnoDB; |