Fixes for storage_engine tests diverged from the main line

mysql-test/suite/storage_engine/alter_table_online.test

@@ -112,7 +112,7 @@ if ($mysql_errname!=ER_CANT_DO_ONLINE)
 --let $alter_definition = MODIFY b BIGINT $default_col_opts
 --source alter_table.inc
 
---let $alternative_engine = `SELECT engine FROM information_schema.engines WHERE engine != '$storage_engine' AND support IN ('YES','DEFAULT')`
+--let $alternative_engine = `SELECT engine FROM information_schema.engines WHERE engine IN ('MEMORY','MyISAM') AND engine != '$storage_engine' ORDER BY engine LIMIT 1`
 
 --let $error_codes = ER_CANT_DO_ONLINE
 --let $online = 1

mysql-test/suite/storage_engine/type_spatial.result

@@ -414,20 +414,20 @@ FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second
 first	second	w	c	o	e	d	t	i	r
 120	120	1	1	0	1	0	1	1	0
 120	121	0	0	1	0	0	0	1	0
-120	122	0	1	NULL	0	NULL	0	NULL	0
-120	123	0	1	NULL	0	NULL	0	NULL	0
+120	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+120	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 121	120	0	0	1	0	0	0	1	0
 121	121	1	1	0	1	0	1	1	0
-121	122	0	1	NULL	0	NULL	0	NULL	0
-121	123	0	1	NULL	0	NULL	0	NULL	0
-122	120	1	0	NULL	0	NULL	0	NULL	0
-122	121	1	0	NULL	0	NULL	0	NULL	0
-122	122	1	1	NULL	1	NULL	0	NULL	0
-122	123	1	1	NULL	1	NULL	0	NULL	0
-123	120	1	0	NULL	0	NULL	0	NULL	0
-123	121	1	0	NULL	0	NULL	0	NULL	0
-123	122	1	1	NULL	1	NULL	0	NULL	0
-123	123	1	1	NULL	1	NULL	0	NULL	0
+121	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+121	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 USE gis_ogs;
 # Lakes

mysql-test/suite/storage_engine/type_spatial_indexes.result

@@ -414,20 +414,20 @@ FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second
 first	second	w	c	o	e	d	t	i	r
 120	120	1	1	0	1	0	1	1	0
 120	121	0	0	1	0	0	0	1	0
-120	122	0	1	NULL	0	NULL	0	NULL	0
-120	123	0	1	NULL	0	NULL	0	NULL	0
+120	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+120	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 121	120	0	0	1	0	0	0	1	0
 121	121	1	1	0	1	0	1	1	0
-121	122	0	1	NULL	0	NULL	0	NULL	0
-121	123	0	1	NULL	0	NULL	0	NULL	0
-122	120	1	0	NULL	0	NULL	0	NULL	0
-122	121	1	0	NULL	0	NULL	0	NULL	0
-122	122	1	1	NULL	1	NULL	0	NULL	0
-122	123	1	1	NULL	1	NULL	0	NULL	0
-123	120	1	0	NULL	0	NULL	0	NULL	0
-123	121	1	0	NULL	0	NULL	0	NULL	0
-123	122	1	1	NULL	1	NULL	0	NULL	0
-123	123	1	1	NULL	1	NULL	0	NULL	0
+121	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+121	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 USE gis_ogs;
 # Lakes
@@ -1114,20 +1114,20 @@ FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second
 first	second	w	c	o	e	d	t	i	r
 120	120	1	1	0	1	0	1	1	0
 120	121	0	0	1	0	0	0	1	0
-120	122	0	1	NULL	0	NULL	0	NULL	0
-120	123	0	1	NULL	0	NULL	0	NULL	0
+120	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+120	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 121	120	0	0	1	0	0	0	1	0
 121	121	1	1	0	1	0	1	1	0
-121	122	0	1	NULL	0	NULL	0	NULL	0
-121	123	0	1	NULL	0	NULL	0	NULL	0
-122	120	1	0	NULL	0	NULL	0	NULL	0
-122	121	1	0	NULL	0	NULL	0	NULL	0
-122	122	1	1	NULL	1	NULL	0	NULL	0
-122	123	1	1	NULL	1	NULL	0	NULL	0
-123	120	1	0	NULL	0	NULL	0	NULL	0
-123	121	1	0	NULL	0	NULL	0	NULL	0
-123	122	1	1	NULL	1	NULL	0	NULL	0
-123	123	1	1	NULL	1	NULL	0	NULL	0
+121	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+121	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+122	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+123	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 USE gis_ogs;
 # Lakes

storage/innobase/mysql-test/storage_engine/parts/optimize_table.rdiff

---- suite/storage_engine/parts/optimize_table.result	2012-07-12 22:16:39.343572304 +0400
-+++ suite/storage_engine/parts/optimize_table.reject	2012-07-15 20:07:01.632130348 +0400
+--- suite/storage_engine/parts/optimize_table.result	2013-07-18 22:55:38.000000000 +0400
++++ suite/storage_engine/parts/optimize_table.reject	2013-08-05 19:45:19.000000000 +0400
 @@ -9,18 +9,22 @@
  INSERT INTO t1 (a,b) VALUES (3,'c'),(4,'d');
  ALTER TABLE t1 OPTIMIZE PARTITION p1;
  Table	Op	Msg_type	Msg_text
-+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
++test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
  test.t1	optimize	status	OK
  INSERT INTO t2 (a,b) VALUES (4,'d');
  ALTER TABLE t2 OPTIMIZE PARTITION p0 NO_WRITE_TO_BINLOG;
  Table	Op	Msg_type	Msg_text
-+test.t2	optimize	note	Table does not support optimize, doing recreate + analyze instead
++test.t2	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
  test.t2	optimize	status	OK
  INSERT INTO t1 (a,b) VALUES (6,'f');
  ALTER TABLE t1 OPTIMIZE PARTITION ALL LOCAL;
  Table	Op	Msg_type	Msg_text
-+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
++test.t1	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
  test.t1	optimize	status	OK
  INSERT INTO t2 (a,b) VALUES (5,'e');
  ALTER TABLE t2 OPTIMIZE PARTITION p1,p0;
  Table	Op	Msg_type	Msg_text
-+test.t2	optimize	note	Table does not support optimize, doing recreate + analyze instead
++test.t2	optimize	note	Table does not support optimize on partitions. All partitions will be rebuilt and analyzed.
  test.t2	optimize	status	OK
  DROP TABLE t1, t2;
  DROP TABLE IF EXISTS t1,t2;

storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff

---- suite/storage_engine/parts/repair_table.result	2013-01-23 01:35:44.388267080 +0400
-+++ suite/storage_engine/parts/repair_table.reject	2013-01-23 01:44:40.337529283 +0400
-@@ -9,27 +9,27 @@
- INSERT INTO t2 (a,b) SELECT a, b FROM t1;
- ALTER TABLE t1 REPAIR PARTITION p0;
- Table	Op	Msg_type	Msg_text
--test.t1	repair	status	OK
-+test.t1	repair	note	The storage engine for the table doesn't support repair
- INSERT INTO t1 (a,b) VALUES (3,'c');
- ALTER TABLE t1 REPAIR PARTITION NO_WRITE_TO_BINLOG p0, p1;
- Table	Op	Msg_type	Msg_text
--test.t1	repair	status	OK
-+test.t1	repair	note	The storage engine for the table doesn't support repair
- INSERT INTO t2 (a,b) VALUES (5,'e'),(6,'f');
- ALTER TABLE t2 REPAIR PARTITION LOCAL p1;
- Table	Op	Msg_type	Msg_text
--test.t2	repair	status	OK
-+test.t2	repair	note	The storage engine for the table doesn't support repair
- INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h');
- ALTER TABLE t1 REPAIR PARTITION LOCAL ALL EXTENDED;
- Table	Op	Msg_type	Msg_text
--test.t1	repair	status	OK
-+test.t1	repair	note	The storage engine for the table doesn't support repair
+--- suite/storage_engine/parts/repair_table.result	2013-07-18 22:55:38.000000000 +0400
++++ suite/storage_engine/parts/repair_table.reject	2013-08-05 19:54:09.000000000 +0400
+@@ -25,7 +25,7 @@
  INSERT INTO t1 (a,b) VALUES (10,'j');
  ALTER TABLE t1 REPAIR PARTITION p1 QUICK USE_FRM;
  Table	Op	Msg_type	Msg_text
@@ -29,39 +9,7 @@
  INSERT INTO t2 (a,b) VALUES (12,'l');
  ALTER TABLE t2 REPAIR PARTITION NO_WRITE_TO_BINLOG ALL QUICK EXTENDED USE_FRM;
  Table	Op	Msg_type	Msg_text
--test.t2	repair	status	OK
-+test.t2	repair	note	The storage engine for the table doesn't support repair
- DROP TABLE t1, t2;
- DROP TABLE IF EXISTS t1,t2;
- CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
-@@ -37,35 +37,35 @@
- CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
- REPAIR TABLE t1;
- Table	Op	Msg_type	Msg_text
--test.t1	repair	status	OK
-+test.t1	repair	note	The storage engine for the table doesn't support repair
- INSERT INTO t1 (a,b) VALUES (3,'c');
- INSERT INTO t2 (a,b) VALUES (4,'d');
- REPAIR NO_WRITE_TO_BINLOG TABLE t1, t2;
- Table	Op	Msg_type	Msg_text
--test.t1	repair	status	OK
--test.t2	repair	status	OK
-+test.t1	repair	note	The storage engine for the table doesn't support repair
-+test.t2	repair	note	The storage engine for the table doesn't support repair
- INSERT INTO t2 (a,b) VALUES (5,'e'),(6,'f');
- REPAIR LOCAL TABLE t2;
- Table	Op	Msg_type	Msg_text
--test.t2	repair	status	OK
-+test.t2	repair	note	The storage engine for the table doesn't support repair
- INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h');
- INSERT INTO t2 (a,b) VALUES (9,'i');
- REPAIR LOCAL TABLE t2, t1 EXTENDED;
- Table	Op	Msg_type	Msg_text
--test.t2	repair	status	OK
--test.t1	repair	status	OK
-+test.t2	repair	note	The storage engine for the table doesn't support repair
-+test.t1	repair	note	The storage engine for the table doesn't support repair
- INSERT INTO t1 (a,b) VALUES (10,'j');
+@@ -58,8 +58,8 @@
  INSERT INTO t2 (a,b) VALUES (11,'k');
  REPAIR TABLE t1, t2 QUICK USE_FRM;
  Table	Op	Msg_type	Msg_text
@@ -72,25 +20,7 @@
  INSERT INTO t1 (a,b) VALUES (12,'l');
  INSERT INTO t2 (a,b) VALUES (13,'m');
  REPAIR NO_WRITE_TO_BINLOG TABLE t1, t2 QUICK EXTENDED USE_FRM;
- Table	Op	Msg_type	Msg_text
--test.t1	repair	status	OK
--test.t2	repair	status	OK
-+test.t1	repair	note	The storage engine for the table doesn't support repair
-+test.t2	repair	note	The storage engine for the table doesn't support repair
- FLUSH TABLE t1;
- INSERT INTO t1 (a,b) VALUES (14,'n');
- ERROR HY000: Failed to read from the .par file
-@@ -93,127 +93,21 @@
- CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
- REPAIR TABLE t1;
- Table	Op	Msg_type	Msg_text
--test.t1	repair	status	OK
-+test.t1	repair	note	The storage engine for the table doesn't support repair
- INSERT INTO t1 (a,b) VALUES (7,'g'),(8,'h');
- REPAIR TABLE t1 EXTENDED;
- Table	Op	Msg_type	Msg_text
--test.t1	repair	status	OK
-+test.t1	repair	note	The storage engine for the table doesn't support repair
+@@ -101,119 +101,13 @@
  INSERT INTO t1 (a,b) VALUES (10,'j');
  REPAIR TABLE t1 USE_FRM;
  Table	Op	Msg_type	Msg_text

storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff

---- suite/storage_engine/type_spatial_indexes.result	2013-01-23 01:25:45.367797786 +0400
-+++ suite/storage_engine/type_spatial_indexes.reject	2013-01-23 01:46:17.560307029 +0400
+--- suite/storage_engine/type_spatial_indexes.result	2013-08-05 18:08:49.000000000 +0400
++++ suite/storage_engine/type_spatial_indexes.reject	2013-08-05 18:25:24.000000000 +0400
 @@ -702,699 +702,15 @@
  DROP DATABASE IF EXISTS gis_ogs;
  CREATE DATABASE gis_ogs;
@@ -416,20 +416,20 @@
 -first	second	w	c	o	e	d	t	i	r
 -120	120	1	1	0	1	0	1	1	0
 -120	121	0	0	1	0	0	0	1	0
--120	122	0	1	NULL	0	NULL	0	NULL	0
--120	123	0	1	NULL	0	NULL	0	NULL	0
+-120	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-120	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 -121	120	0	0	1	0	0	0	1	0
 -121	121	1	1	0	1	0	1	1	0
--121	122	0	1	NULL	0	NULL	0	NULL	0
--121	123	0	1	NULL	0	NULL	0	NULL	0
--122	120	1	0	NULL	0	NULL	0	NULL	0
--122	121	1	0	NULL	0	NULL	0	NULL	0
--122	122	1	1	NULL	1	NULL	0	NULL	0
--122	123	1	1	NULL	1	NULL	0	NULL	0
--123	120	1	0	NULL	0	NULL	0	NULL	0
--123	121	1	0	NULL	0	NULL	0	NULL	0
--123	122	1	1	NULL	1	NULL	0	NULL	0
--123	123	1	1	NULL	1	NULL	0	NULL	0
+-121	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-121	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 -DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 -USE gis_ogs;
 -# Lakes

storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff

---- type_spatial.result	2013-01-23 01:25:39.143876032 +0400
-+++ type_spatial.reject	2013-01-23 02:51:14.535315418 +0400
+--- suite/storage_engine/type_spatial.result	2013-08-05 17:52:53.000000000 +0400
++++ suite/storage_engine/type_spatial.reject	2013-08-05 17:56:37.000000000 +0400
 @@ -2,699 +2,15 @@
  DROP DATABASE IF EXISTS gis_ogs;
  CREATE DATABASE gis_ogs;
@@ -416,20 +416,20 @@
 -first	second	w	c	o	e	d	t	i	r
 -120	120	1	1	0	1	0	1	1	0
 -120	121	0	0	1	0	0	0	1	0
--120	122	0	1	NULL	0	NULL	0	NULL	0
--120	123	0	1	NULL	0	NULL	0	NULL	0
+-120	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-120	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 -121	120	0	0	1	0	0	0	1	0
 -121	121	1	1	0	1	0	1	1	0
--121	122	0	1	NULL	0	NULL	0	NULL	0
--121	123	0	1	NULL	0	NULL	0	NULL	0
--122	120	1	0	NULL	0	NULL	0	NULL	0
--122	121	1	0	NULL	0	NULL	0	NULL	0
--122	122	1	1	NULL	1	NULL	0	NULL	0
--122	123	1	1	NULL	1	NULL	0	NULL	0
--123	120	1	0	NULL	0	NULL	0	NULL	0
--123	121	1	0	NULL	0	NULL	0	NULL	0
--123	122	1	1	NULL	1	NULL	0	NULL	0
--123	123	1	1	NULL	1	NULL	0	NULL	0
+-121	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-121	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 -DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 -USE gis_ogs;
 -# Lakes

storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff

---- type_spatial_indexes.result	2013-01-23 01:25:45.367797786 +0400
-+++ type_spatial_indexes.reject	2013-01-23 02:51:15.247306467 +0400
+--- suite/storage_engine/type_spatial_indexes.result	2013-08-05 18:08:49.000000000 +0400
++++ suite/storage_engine/type_spatial_indexes.reject	2013-08-05 18:27:47.000000000 +0400
 @@ -2,1399 +2,31 @@
  DROP DATABASE IF EXISTS gis_ogs;
  CREATE DATABASE gis_ogs;
@@ -416,20 +416,20 @@
 -first	second	w	c	o	e	d	t	i	r
 -120	120	1	1	0	1	0	1	1	0
 -120	121	0	0	1	0	0	0	1	0
--120	122	0	1	NULL	0	NULL	0	NULL	0
--120	123	0	1	NULL	0	NULL	0	NULL	0
+-120	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-120	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 -121	120	0	0	1	0	0	0	1	0
 -121	121	1	1	0	1	0	1	1	0
--121	122	0	1	NULL	0	NULL	0	NULL	0
--121	123	0	1	NULL	0	NULL	0	NULL	0
--122	120	1	0	NULL	0	NULL	0	NULL	0
--122	121	1	0	NULL	0	NULL	0	NULL	0
--122	122	1	1	NULL	1	NULL	0	NULL	0
--122	123	1	1	NULL	1	NULL	0	NULL	0
--123	120	1	0	NULL	0	NULL	0	NULL	0
--123	121	1	0	NULL	0	NULL	0	NULL	0
--123	122	1	1	NULL	1	NULL	0	NULL	0
--123	123	1	1	NULL	1	NULL	0	NULL	0
+-121	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-121	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 -DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 -USE gis_ogs;
 -# Lakes
@@ -1126,20 +1126,20 @@
 -first	second	w	c	o	e	d	t	i	r
 -120	120	1	1	0	1	0	1	1	0
 -120	121	0	0	1	0	0	0	1	0
--120	122	0	1	NULL	0	NULL	0	NULL	0
--120	123	0	1	NULL	0	NULL	0	NULL	0
+-120	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-120	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 -121	120	0	0	1	0	0	0	1	0
 -121	121	1	1	0	1	0	1	1	0
--121	122	0	1	NULL	0	NULL	0	NULL	0
--121	123	0	1	NULL	0	NULL	0	NULL	0
--122	120	1	0	NULL	0	NULL	0	NULL	0
--122	121	1	0	NULL	0	NULL	0	NULL	0
--122	122	1	1	NULL	1	NULL	0	NULL	0
--122	123	1	1	NULL	1	NULL	0	NULL	0
--123	120	1	0	NULL	0	NULL	0	NULL	0
--123	121	1	0	NULL	0	NULL	0	NULL	0
--123	122	1	1	NULL	1	NULL	0	NULL	0
--123	123	1	1	NULL	1	NULL	0	NULL	0
+-121	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-121	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-122	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	120	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	121	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	122	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+-123	123	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 -DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 -USE gis_ogs;
 -# Lakes