MDEV-4028 - Converted rdiff files to uniform

MDEV-11 - Modifed tests and result files to use explicit column lists
          in INSERT and SELECT statements

7 files changed, 56 insertions, 56 deletions

diff --git a/storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff b/storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff
index c24594c5024..00cda7c4435 100644
--- a/storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff
+++ b/storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff
@@ -8,7 +8,7 @@
 -SELECT LAST_INSERT_ID();
 -LAST_INSERT_ID()
 -1
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -a	1
 -a	2
diff --git a/storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff b/storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff
index 62895fa928f..9e6cddf03f0 100644
--- a/storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff
+++ b/storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff
@@ -1,5 +1,5 @@
---- suite/storage_engine/insert_delayed.result	2012-07-12 20:04:07.143544998 +0400
-+++ suite/storage_engine/insert_delayed.reject	2012-07-15 17:49:34.551810189 +0400
+--- suite/storage_engine/insert_delayed.result	2013-01-23 01:23:49.461254916 +0400
++++ suite/storage_engine/insert_delayed.reject	2013-01-23 01:47:05.975698364 +0400
 @@ -5,7 +5,16 @@
  connect  con0,localhost,root,,;
  SET lock_wait_timeout = 1;
@@ -14,7 +14,7 @@
 +# -------------------------------------------
  INSERT DELAYED INTO t1 SET a=4, b='d';
 +ERROR HY000: DELAYED option not supported for table 't1'
- INSERT DELAYED INTO t1 SELECT 5, 'e';
+ INSERT DELAYED INTO t1 (a,b) SELECT 5, 'e';
  ERROR HY000: Lock wait timeout exceeded; try restarting transaction
  disconnect con0;
 @@ -20,6 +29,4 @@
diff --git a/storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff b/storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff
index aab866fde83..7ddc57e0ead 100644
--- a/storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff
+++ b/storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff
@@ -1,12 +1,12 @@
---- suite/storage_engine/parts/repair_table.result	2012-07-15 01:22:58.861853325 +0400
-+++ suite/storage_engine/parts/repair_table.reject	2012-07-15 20:07:11.268009209 +0400
+--- 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 VALUES (3,'c');
+ 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
@@ -21,7 +21,7 @@
  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 VALUES (10,'j');
+ INSERT INTO t1 (a,b) VALUES (10,'j');
  ALTER TABLE t1 REPAIR PARTITION p1 QUICK USE_FRM;
  Table	Op	Msg_type	Msg_text
 -test.t1	repair	status	OK
@@ -112,7 +112,7 @@
 -test.t1	check	error	Size of datafile is: 26         Should be: 39
 -test.t1	check	error	Partition p0 returned error
 -test.t1	check	error	Corrupt
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -8	h
 -10	j
@@ -136,7 +136,7 @@
 -test.t1	check	warning	Found 3 key parts. Should be: 2
 -test.t1	check	error	Partition p0 returned error
 -test.t1	check	error	Corrupt
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -8	h
 -10	j
@@ -160,7 +160,7 @@
 -test.t1	check	error	Size of datafile is: 39         Should be: 52
 -test.t1	check	error	Partition p1 returned error
 -test.t1	check	error	Corrupt
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -8	h
 -10	j
@@ -187,7 +187,7 @@
 -test.t1	check	warning	Found 4 key parts. Should be: 3
 -test.t1	check	error	Partition p1 returned error
 -test.t1	check	error	Corrupt
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -8	h
 -10	j
diff --git a/storage/innobase/mysql-test/storage_engine/repair_table.rdiff b/storage/innobase/mysql-test/storage_engine/repair_table.rdiff
index 9c51fea47ff..ae5b863eae1 100644
--- a/storage/innobase/mysql-test/storage_engine/repair_table.rdiff
+++ b/storage/innobase/mysql-test/storage_engine/repair_table.rdiff
@@ -57,7 +57,7 @@
 -test.t1	check	Error	Incorrect file format 't1'
 -test.t1	check	error	Corrupt
 +test.t1	check	status	OK
- SELECT * FROM t1;
+ SELECT a,b FROM t1;
 -ERROR HY000: Incorrect file format 't1'
 +a	b
 +1	a
@@ -107,7 +107,7 @@
 -Table	Op	Msg_type	Msg_text
 -test.t1	check	error	Size of datafile is: 39         Should be: 65
 -test.t1	check	error	Corrupt
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -ERROR HY000: Incorrect key file for table 't1'; try to repair it
 -# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). 
 -# If you got a difference in error message, just add it to rdiff file
@@ -122,7 +122,7 @@
 -test.t1	check	warning	Table is marked as crashed and last repair failed
 -test.t1	check	error	Size of datafile is: 39         Should be: 65
 -test.t1	check	error	Corrupt
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed
 -# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). 
 -# If you got a difference in error message, just add it to rdiff file
diff --git a/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff b/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff
index 7fce0a108e9..53241fe331e 100644
--- a/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff
+++ b/storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff
@@ -2,19 +2,19 @@
 +++ suite/storage_engine/type_char_indexes.reject	2012-07-15 17:51:55.810034331 +0400
 @@ -98,7 +98,7 @@
  SET SESSION optimizer_switch = 'engine_condition_pushdown=on';
- EXPLAIN SELECT * FROM t1 WHERE c > 'a';
+ EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
  id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 -#	#	#	range	c_v	c_v	#	#	#	Using index condition
 +#	#	#	range	c_v	c_v	#	#	#	Using where
- SELECT * FROM t1 WHERE c > 'a';
+ SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
  c	c20	v16	v128
  b	char3	varchar1a	varchar1b
 @@ -135,7 +135,7 @@
  r3a
- EXPLAIN SELECT * FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16;
+ EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16;
  id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 -#	#	#	range	#	v16	#	#	#	#
 +#	#	#	ALL	#	NULL	#	#	#	#
- SELECT * FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16;
+ SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16;
  c	c20	v16	v128
  a	char1	varchar1a	varchar1b
diff --git a/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff b/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff
index 9a9566deafb..9061900182e 100644
--- a/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff
+++ b/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff
@@ -1,5 +1,5 @@
---- suite/storage_engine/type_spatial_indexes.result	2012-07-12 04:52:40.840023344 +0400
-+++ suite/storage_engine/type_spatial_indexes.reject	2012-07-15 19:27:32.761911079 +0400
+--- 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
 @@ -702,699 +702,15 @@
  DROP DATABASE IF EXISTS gis_ogs;
  CREATE DATABASE gis_ogs;
@@ -79,43 +79,43 @@
 -Field	Type	Null	Key	Default	Extra
 -fid	int(11)	YES		NULL	
 -g	geometry	NO		NULL	
--INSERT INTO gis_point VALUES 
+-INSERT INTO gis_point (fid,g) VALUES 
 -(101, PointFromText('POINT(10 10)')),
 -(102, PointFromText('POINT(20 10)')),
 -(103, PointFromText('POINT(20 20)')),
 -(104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)'))));
--INSERT INTO gis_line VALUES
+-INSERT INTO gis_line (fid,g) VALUES
 -(105, LineFromText('LINESTRING(0 0,0 10,10 0)')),
 -(106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')),
 -(107, LineStringFromWKB(AsWKB(LineString(Point(10, 10), Point(40, 10)))));
--INSERT INTO gis_polygon VALUES
+-INSERT INTO gis_polygon (fid,g) VALUES
 -(108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')),
 -(109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')),
 -(110, PolyFromWKB(AsWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0))))));
--INSERT INTO gis_multi_point VALUES
+-INSERT INTO gis_multi_point (fid,g) VALUES
 -(111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')),
 -(112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')),
 -(113, MPointFromWKB(AsWKB(MultiPoint(Point(3, 6), Point(4, 10)))));
--INSERT INTO gis_multi_line VALUES
+-INSERT INTO gis_multi_line (fid,g) VALUES
 -(114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')),
 -(115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')),
 -(116, MLineFromWKB(AsWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7))))));
--INSERT INTO gis_multi_polygon VALUES
+-INSERT INTO gis_multi_polygon (fid,g) VALUES
 -(117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')),
 -(118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')),
 -(119, MPolyFromWKB(AsWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3)))))));
--INSERT INTO gis_geometrycollection VALUES
+-INSERT INTO gis_geometrycollection (fid,g) VALUES
 -(120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')),
 -(121, GeometryFromWKB(AsWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))))),
 -(122, GeomFromText('GeometryCollection()')),
 -(123, GeomFromText('GeometryCollection EMPTY'));
--INSERT into gis_geometry SELECT * FROM gis_point;
--INSERT into gis_geometry SELECT * FROM gis_line;
--INSERT into gis_geometry SELECT * FROM gis_polygon;
--INSERT into gis_geometry SELECT * FROM gis_multi_point;
--INSERT into gis_geometry SELECT * FROM gis_multi_line;
--INSERT into gis_geometry SELECT * FROM gis_multi_polygon;
--INSERT into gis_geometry SELECT * FROM gis_geometrycollection;
+-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_point;
+-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_line;
+-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_polygon;
+-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_point;
+-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_line;
+-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_multi_polygon;
+-INSERT into gis_geometry (fid,g) SELECT fid,g FROM gis_geometrycollection;
 -SELECT fid, AsText(g) FROM gis_point;
 -fid	AsText(g)
 -101	POINT(10 10)
@@ -433,7 +433,7 @@
 -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
--INSERT INTO lakes VALUES ( 
+-INSERT INTO lakes (fid,name,shore) VALUES ( 
 -101, 'BLUE LAKE', 
 -PolyFromText( 
 -'POLYGON( 
@@ -442,68 +442,68 @@
 -  )', 
 -101));
 -# Road Segments
--INSERT INTO road_segments VALUES(102, 'Route 5', NULL, 2, 
+-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(102, 'Route 5', NULL, 2, 
 -LineFromText( 
 -'LINESTRING( 0 18, 10 21, 16 23, 28 26, 44 31 )' ,101));
--INSERT INTO road_segments VALUES(103, 'Route 5', 'Main Street', 4, 
+-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(103, 'Route 5', 'Main Street', 4, 
 -LineFromText( 
 -'LINESTRING( 44 31, 56 34, 70 38 )' ,101));
--INSERT INTO road_segments VALUES(104, 'Route 5', NULL, 2, 
+-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(104, 'Route 5', NULL, 2, 
 -LineFromText( 
 -'LINESTRING( 70 38, 72 48 )' ,101));
--INSERT INTO road_segments VALUES(105, 'Main Street', NULL, 4, 
+-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(105, 'Main Street', NULL, 4, 
 -LineFromText( 
 -'LINESTRING( 70 38, 84 42 )' ,101));
--INSERT INTO road_segments VALUES(106, 'Dirt Road by Green Forest', NULL, 
+-INSERT INTO road_segments (fid,name,aliases,num_lanes,centerline) VALUES(106, 'Dirt Road by Green Forest', NULL, 
 -1, 
 -LineFromText( 
 -'LINESTRING( 28 26, 28 0 )',101));
 -# DividedRoutes 
--INSERT INTO divided_routes VALUES(119, 'Route 75', 4, 
+-INSERT INTO divided_routes (fid,name,num_lanes,centerlines) VALUES(119, 'Route 75', 4, 
 -MLineFromText( 
 -'MULTILINESTRING((10 48,10 21,10 0), 
 -  (16 0,16 23,16 48))', 101));
 -# Forests 
--INSERT INTO forests VALUES(109, 'Green Forest', 
+-INSERT INTO forests (fid,name,boundary) VALUES(109, 'Green Forest', 
 -MPolyFromText( 
 -'MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26), 
 -  (52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))', 
 -101));
 -# Bridges 
--INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( 
+-INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( 
 -'POINT( 44 31 )', 101));
 -# Streams 
--INSERT INTO streams VALUES(111, 'Cam Stream', 
+-INSERT INTO streams (fid,name,centerline) VALUES(111, 'Cam Stream', 
 -LineFromText( 
 -'LINESTRING( 38 48, 44 41, 41 36, 44 31, 52 18 )', 101));
--INSERT INTO streams VALUES(112, NULL, 
+-INSERT INTO streams (fid,name,centerline) VALUES(112, NULL, 
 -LineFromText( 
 -'LINESTRING( 76 0, 78 4, 73 9 )', 101));
 -# Buildings 
--INSERT INTO buildings VALUES(113, '123 Main Street', 
+-INSERT INTO buildings (fid,name,position,footprint) VALUES(113, '123 Main Street', 
 -PointFromText( 
 -'POINT( 52 30 )', 101), 
 -PolyFromText( 
 -'POLYGON( ( 50 31, 54 31, 54 29, 50 29, 50 31) )', 101));
--INSERT INTO buildings VALUES(114, '215 Main Street', 
+-INSERT INTO buildings (fid,name,position,footprint) VALUES(114, '215 Main Street', 
 -PointFromText( 
 -'POINT( 64 33 )', 101), 
 -PolyFromText( 
 -'POLYGON( ( 66 34, 62 34, 62 32, 66 32, 66 34) )', 101));
 -# Ponds 
--INSERT INTO ponds VALUES(120, NULL, 'Stock Pond', 
+-INSERT INTO ponds (fid,name,type,shores) VALUES(120, NULL, 'Stock Pond', 
 -MPolyFromText( 
 -'MULTIPOLYGON( ( ( 24 44, 22 42, 24 40, 24 44) ), 
 -  ( ( 26 44, 26 40, 28 42, 26 44) ) )', 101));
 -# Named Places 
--INSERT INTO named_places VALUES(117, 'Ashton', 
+-INSERT INTO named_places (fid,name,boundary) VALUES(117, 'Ashton', 
 -PolyFromText( 
 -'POLYGON( ( 62 48, 84 48, 84 30, 56 30, 56 34, 62 48) )', 101));
--INSERT INTO named_places VALUES(118, 'Goose Island', 
+-INSERT INTO named_places (fid,name,boundary) VALUES(118, 'Goose Island', 
 -PolyFromText( 
 -'POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )', 101));
 -# Map Neatlines 
--INSERT INTO map_neatlines VALUES(115, 
+-INSERT INTO map_neatlines (fid,neatline) VALUES(115, 
 -PolyFromText( 
 -'POLYGON( ( 0 0, 0 48, 84 48, 84 0, 0 0 ) )', 101));
 -SELECT Dimension(shore) 
diff --git a/storage/innobase/mysql-test/storage_engine/vcol.rdiff b/storage/innobase/mysql-test/storage_engine/vcol.rdiff
index 2226062834e..23b26a52228 100644
--- a/storage/innobase/mysql-test/storage_engine/vcol.rdiff
+++ b/storage/innobase/mysql-test/storage_engine/vcol.rdiff
@@ -12,7 +12,7 @@
 -Warnings:
 -Warning	1906	The value specified for computed column 'b' in table 't1' ignored
 -Warning	1906	The value specified for computed column 'b' in table 't1' ignored
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -1	2
 -2	3
@@ -29,7 +29,7 @@
 -Warnings:
 -Warning	1906	The value specified for computed column 'b' in table 't1' ignored
 -Warning	1906	The value specified for computed column 'b' in table 't1' ignored
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -1	2
 -2	3
@@ -46,7 +46,7 @@
 -Warnings:
 -Warning	1906	The value specified for computed column 'b' in table 't1' ignored
 -Warning	1906	The value specified for computed column 'b' in table 't1' ignored
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -1	2
 -2	3
@@ -63,7 +63,7 @@
 -Warnings:
 -Warning	1906	The value specified for computed column 'b' in table 't1' ignored
 -Warning	1906	The value specified for computed column 'b' in table 't1' ignored
--SELECT * FROM t1;
+-SELECT a,b FROM t1;
 -a	b
 -1	2
 -2	3