MDEV-4028 - Converted rdiff files to uniform

MDEV-11 - Modifed tests and result files to use explicit column lists in INSERT and SELECT statements
author: Elena Stepanova <elenst@ubuntu11.home> 2013-02-03 02:53:57 +0400
committer: Elena Stepanova <elenst@ubuntu11.home> 2013-02-03 02:53:57 +0400
commit: 7f444caa0ad6b2eddc730de3cd9c94bfb9037b51 (patch)
tree: 2ce4331394ace7fff468791666e8f03286720990 /mysql-test/suite/storage_engine
parent: 1701ee335740c970696fab081cfeac582991076d (diff)
download: mariadb-git-7f444caa0ad6b2eddc730de3cd9c94bfb9037b51.tar.gz
128 files changed, 1019 insertions, 982 deletions
diff --git a/mysql-test/suite/storage_engine/1st.result b/mysql-test/suite/storage_engine/1st.result
index 6b686c2b2b4..192a8f8f39b 100644
--- a/mysql-test/suite/storage_engine/1st.result
+++ b/mysql-test/suite/storage_engine/1st.result
@@ -4,7 +4,7 @@ SHOW CREATE TABLE t1;
 SHOW COLUMNS IN t1;
 INSERT INTO t1 VALUES (1,'a');
 INSERT INTO t1 (a,b) VALUES (2,'b');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	b
diff --git a/mysql-test/suite/storage_engine/1st.test b/mysql-test/suite/storage_engine/1st.test
index af7a4503948..c9ebd8b75e4 100644
--- a/mysql-test/suite/storage_engine/1st.test
+++ b/mysql-test/suite/storage_engine/1st.test
@@ -14,7 +14,7 @@
 # - CREATE TABLE .. (column1 <column options>, column2 <column options>) ENGINE=<storage_engine>;
 # - INSERT INTO TABLE .. VALUES (val1,val2);
 # - DROP TABLE ..
-# - SELECT * FROM ..
+# - SELECT a,b FROM ..
 # - SHOW CREATE TABLE ..
 # - SHOW COLUMNS IN ...
 #
@@ -62,10 +62,10 @@ if (!$mysql_errname)
     --source unexpected_result.inc
   }
 
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   if ($mysql_errname)
   {
-    --let $functionality = SELECT * FROM ..
+    --let $functionality = SELECT a,b FROM ..
     --source unexpected_result.inc
   }
 
diff --git a/mysql-test/suite/storage_engine/alter_table.result b/mysql-test/suite/storage_engine/alter_table.result
index 6d868a27a36..09696e0e6b6 100644
--- a/mysql-test/suite/storage_engine/alter_table.result
+++ b/mysql-test/suite/storage_engine/alter_table.result
@@ -105,7 +105,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 2	2
 4	3
diff --git a/mysql-test/suite/storage_engine/alter_table.test b/mysql-test/suite/storage_engine/alter_table.test
index 023d8927e16..f99792f5766 100644
--- a/mysql-test/suite/storage_engine/alter_table.test
+++ b/mysql-test/suite/storage_engine/alter_table.test
@@ -111,7 +111,7 @@ SHOW CREATE TABLE t1;
 --source alter_table.inc
 --source mask_engine.inc
 SHOW CREATE TABLE t1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 DROP TABLE t1;
 
 # Character set, collate
diff --git a/mysql-test/suite/storage_engine/alter_tablespace.result b/mysql-test/suite/storage_engine/alter_tablespace.result
index 5d8709b2357..71ef910b222 100644
--- a/mysql-test/suite/storage_engine/alter_tablespace.result
+++ b/mysql-test/suite/storage_engine/alter_tablespace.result
@@ -4,15 +4,15 @@ ALTER TABLE t1 DISCARD TABLESPACE;
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t1 (a) VALUES (1),(2);
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 ALTER TABLE t1 DISCARD TABLESPACE;
-SELECT * FROM t1;
+SELECT a FROM t1;
 ERROR HY000: Got error -1 from storage engine
 ALTER TABLE t1 IMPORT TABLESPACE;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test
index 6c429bb98ea..508639c7dc5 100644
--- a/mysql-test/suite/storage_engine/alter_tablespace.test
+++ b/mysql-test/suite/storage_engine/alter_tablespace.test
@@ -30,7 +30,7 @@ if (!$mysql_errname)
   --source create_table.inc
   INSERT INTO t1 (a) VALUES (1),(2);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a FROM t1;
 
 # http://dev.mysql.com/doc/mysql-enterprise-backup/3.5/en/partial.restoring.single.html 
 # To get a "clean" backup we need to either use innobackup, or to monitor show engine innodb status,
@@ -64,7 +64,7 @@ EOF
   --source alter_table.inc
 
   --let $error_codes = ER_GET_ERRNO
-  SELECT * FROM t1;
+  SELECT a FROM t1;
   --source check_errors.inc
   if ($mysql_errname != ER_GET_ERRNO)
   {
@@ -76,7 +76,7 @@ EOF
   --let $alter_definition = IMPORT TABLESPACE
   --source alter_table.inc
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a FROM t1;
 
   # Adding a warning suppression based on what InnoDB currently does
   # when it attempts to access a table without an *.ibd file
diff --git a/mysql-test/suite/storage_engine/autoinc_secondary.result b/mysql-test/suite/storage_engine/autoinc_secondary.result
index ad2b43bc6fe..28b0a406fff 100644
--- a/mysql-test/suite/storage_engine/autoinc_secondary.result
+++ b/mysql-test/suite/storage_engine/autoinc_secondary.result
@@ -4,7 +4,7 @@ INSERT INTO t1 (b) VALUES ('a'),('b'),('b'),('c'),('a');
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 1
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	b
@@ -17,7 +17,7 @@ INSERT INTO t1 (a) VALUES ('a'),('b'),('b'),('c'),('a');
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 1
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 a	1
 a	2
@@ -30,7 +30,7 @@ INSERT INTO t1 (a) VALUES ('a'),('b'),('b'),('c'),('a');
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 1
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 a	1
 a	5
diff --git a/mysql-test/suite/storage_engine/autoinc_secondary.test b/mysql-test/suite/storage_engine/autoinc_secondary.test
index 8b95f1d859e..25fc0f7cfa1 100644
--- a/mysql-test/suite/storage_engine/autoinc_secondary.test
+++ b/mysql-test/suite/storage_engine/autoinc_secondary.test
@@ -25,7 +25,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (b) VALUES ('a'),('b'),('b'),('c'),('a');
   SELECT LAST_INSERT_ID();
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
@@ -45,7 +45,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a) VALUES ('a'),('b'),('b'),('c'),('a');
   SELECT LAST_INSERT_ID();
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
@@ -65,7 +65,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a) VALUES ('a'),('b'),('b'),('c'),('a');
   SELECT LAST_INSERT_ID();
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
diff --git a/mysql-test/suite/storage_engine/autoinc_vars.result b/mysql-test/suite/storage_engine/autoinc_vars.result
index a9fd8c8d06c..aca21dfd1c4 100644
--- a/mysql-test/suite/storage_engine/autoinc_vars.result
+++ b/mysql-test/suite/storage_engine/autoinc_vars.result
@@ -5,7 +5,7 @@ INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b'),(NULL,'c');
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 1
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	b
@@ -15,7 +15,7 @@ INSERT INTO t1 (a,b) VALUES (NULL,'d'),(NULL,'e'),(NULL,'f');
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 200
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	b
@@ -28,7 +28,7 @@ INSERT INTO t1 (a,b) VALUES (NULL,'g'),(NULL,'h'),(NULL,'i');
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 850
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	b
@@ -48,6 +48,6 @@ ERROR 22003: Out of range value for column 'a' at row 1
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 850
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/autoinc_vars.test b/mysql-test/suite/storage_engine/autoinc_vars.test
index ceafcd7138f..b154fd794d0 100644
--- a/mysql-test/suite/storage_engine/autoinc_vars.test
+++ b/mysql-test/suite/storage_engine/autoinc_vars.test
@@ -25,7 +25,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b'),(NULL,'c');
   SELECT LAST_INSERT_ID();
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   # auto_increment_increment
 
@@ -34,13 +34,13 @@ if (!$mysql_errname)
   INSERT INTO t1 (a,b) VALUES (NULL,'d'),(NULL,'e'),(NULL,'f');
   SELECT LAST_INSERT_ID();
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   SET auto_increment_increment = 50;
   INSERT INTO t1 (a,b) VALUES (NULL,'g'),(NULL,'h'),(NULL,'i');
   SELECT LAST_INSERT_ID();
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
@@ -60,7 +60,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a) VALUES (NULL);
   SELECT LAST_INSERT_ID();
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a FROM t1;
   DROP TABLE t1;
 }
 
diff --git a/mysql-test/suite/storage_engine/autoincrement.result b/mysql-test/suite/storage_engine/autoincrement.result
index bc51a2a82af..44cb8650441 100644
--- a/mysql-test/suite/storage_engine/autoincrement.result
+++ b/mysql-test/suite/storage_engine/autoincrement.result
@@ -8,7 +8,7 @@ t1	CREATE TABLE `t1` (
   KEY `a` (`a`)
 ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
 INSERT INTO t1 (b) VALUES ('a'),('b');
-SELECT * FROM t1 ORDER BY a;
+SELECT a,b FROM t1 ORDER BY a;
 a	b
 1	a
 2	b
@@ -16,7 +16,7 @@ SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 1
 INSERT INTO t1 (a,b) VALUES (NULL,'c'),(0,'d');
-SELECT * FROM t1 ORDER BY a;
+SELECT a,b FROM t1 ORDER BY a;
 a	b
 1	a
 2	b
@@ -27,7 +27,7 @@ LAST_INSERT_ID()
 3
 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 INSERT INTO t1 (a,b) VALUES (NULL,'e');
-SELECT * FROM t1 ORDER BY a;
+SELECT a,b FROM t1 ORDER BY a;
 a	b
 1	a
 2	b
@@ -38,7 +38,7 @@ SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()
 5
 INSERT INTO t1 (a,b) VALUES (0,'f');
-SELECT * FROM t1 ORDER BY a;
+SELECT a,b FROM t1 ORDER BY a;
 a	b
 0	f
 1	a
@@ -61,7 +61,7 @@ SHOW TABLE STATUS FROM test LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
 t1	#	#	#	#	#	#	#	#	#	8	#	#	#	#	#	#	#
 INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j');
-SELECT * FROM t1 ORDER BY a;
+SELECT a,b FROM t1 ORDER BY a;
 a	b
 0	f
 1	a
@@ -84,7 +84,7 @@ SHOW TABLE STATUS FROM test LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
 t1	#	#	#	#	#	#	#	#	#	21	#	#	#	#	#	#	#
 INSERT INTO t1 (a,b) VALUES (NULL,'l');
-SELECT * FROM t1 ORDER BY a;
+SELECT a,b FROM t1 ORDER BY a;
 a	b
 0	f
 1	a
@@ -105,7 +105,7 @@ SHOW TABLE STATUS FROM test LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
 t1	#	#	#	#	#	#	#	#	#	22	#	#	#	#	#	#	#
 INSERT INTO t1 (a,b) VALUES (-5,'m');
-SELECT * FROM t1 ORDER BY a;
+SELECT a,b FROM t1 ORDER BY a;
 a	b
 -5	m
 0	f
@@ -123,7 +123,7 @@ a	b
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN> AUTO_INCREMENT, b <CHAR_COLUMN>, <CUSTOM_INDEX>(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> AUTO_INCREMENT = 100;
 INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 100	a
 101	b
diff --git a/mysql-test/suite/storage_engine/autoincrement.test b/mysql-test/suite/storage_engine/autoincrement.test
index fb07ea55c57..ddb0ab1b464 100644
--- a/mysql-test/suite/storage_engine/autoincrement.test
+++ b/mysql-test/suite/storage_engine/autoincrement.test
@@ -26,22 +26,22 @@ if (!$mysql_errname)
   # Automatic values
 
   INSERT INTO t1 (b) VALUES ('a'),('b');
-  SELECT * FROM t1 ORDER BY a;
+  SELECT a,b FROM t1 ORDER BY a;
   SELECT LAST_INSERT_ID();
 
   INSERT INTO t1 (a,b) VALUES (NULL,'c'),(0,'d');
-  SELECT * FROM t1 ORDER BY a;
+  SELECT a,b FROM t1 ORDER BY a;
   SELECT LAST_INSERT_ID();
 
   let $sql_mode = `SELECT @@sql_mode`;
   SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 
   INSERT INTO t1 (a,b) VALUES (NULL,'e');
-  SELECT * FROM t1 ORDER BY a;
+  SELECT a,b FROM t1 ORDER BY a;
   SELECT LAST_INSERT_ID();
 
   INSERT INTO t1 (a,b) VALUES (0,'f');
-  SELECT * FROM t1 ORDER BY a;
+  SELECT a,b FROM t1 ORDER BY a;
   SELECT LAST_INSERT_ID();
 
   --replace_result $sql_mode <INITIAL_SQL_MODE>
@@ -63,7 +63,7 @@ if (!$mysql_errname)
 
 
   INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j');
-  SELECT * FROM t1 ORDER BY a;
+  SELECT a,b FROM t1 ORDER BY a;
   SELECT LAST_INSERT_ID();
 
   --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
@@ -77,7 +77,7 @@ if (!$mysql_errname)
   SHOW TABLE STATUS FROM test LIKE 't1';
 
   INSERT INTO t1 (a,b) VALUES (NULL,'l');
-  SELECT * FROM t1 ORDER BY a;
+  SELECT a,b FROM t1 ORDER BY a;
   SELECT LAST_INSERT_ID();
 
   --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
@@ -87,7 +87,7 @@ if (!$mysql_errname)
   # but won't check what happens to the sequence after that, since the behavior is undefined
 
   INSERT INTO t1 (a,b) VALUES (-5,'m');
-  SELECT * FROM t1 ORDER BY a;
+  SELECT a,b FROM t1 ORDER BY a;
 
   DROP TABLE t1;
 }
@@ -106,7 +106,7 @@ if (!$mysql_errname)
 {
   INSERT INTO t1 (a,b) VALUES (NULL,'a'),(NULL,'b');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   SELECT LAST_INSERT_ID();
   DROP TABLE t1;
 }
diff --git a/mysql-test/suite/storage_engine/col_opt_default.result b/mysql-test/suite/storage_engine/col_opt_default.result
index 2d0a8508b99..d1f3e9d98c6 100644
--- a/mysql-test/suite/storage_engine/col_opt_default.result
+++ b/mysql-test/suite/storage_engine/col_opt_default.result
@@ -4,7 +4,7 @@ SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	int(11)	#		0	
 INSERT INTO t1 (a) VALUES (1);
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 ALTER TABLE t1 ADD COLUMN b <CHAR_COLUMN> DEFAULT '';
@@ -13,7 +13,7 @@ Field	Type	Null	Key	Default	Extra
 a	int(11)	#		0	
 b	char(8)	#			
 INSERT INTO t1 (b) VALUES ('a');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	a
 1	
diff --git a/mysql-test/suite/storage_engine/col_opt_default.test b/mysql-test/suite/storage_engine/col_opt_default.test
index f59daef37fc..3b28def76db 100644
--- a/mysql-test/suite/storage_engine/col_opt_default.test
+++ b/mysql-test/suite/storage_engine/col_opt_default.test
@@ -25,7 +25,7 @@ if (!$mysql_errname)
 
   INSERT INTO t1 (a) VALUES (1);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a FROM t1;
 
   --let $alter_definition = ADD COLUMN b $char_col DEFAULT ''
   --source alter_table.inc
@@ -41,7 +41,7 @@ if (!$mysql_errname)
 
     INSERT INTO t1 (b) VALUES ('a');
     --sorted_result
-    SELECT * FROM t1;
+    SELECT a,b FROM t1;
   }
   DROP TABLE t1;
 }
diff --git a/mysql-test/suite/storage_engine/col_opt_not_null.result b/mysql-test/suite/storage_engine/col_opt_not_null.result
index 49b834efc26..18508e98e8c 100644
--- a/mysql-test/suite/storage_engine/col_opt_not_null.result
+++ b/mysql-test/suite/storage_engine/col_opt_not_null.result
@@ -15,20 +15,20 @@ b0	binary(0)	#	#	#	#
 b1	binary(1)	#	#	#	#
 b20	binary(20)	#	#	#	#
 b255	binary(255)	#	#	#	#
-INSERT INTO t1 VALUES ('','','','','');
-INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('','','','','');
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
 SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1;
 HEX(b)	HEX(b0)	HEX(b1)	HEX(b20)	HEX(b255)
 00		00	0000000000000000000000000000000000000000	000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 61		62	616263646566676869206B6C6D6E6F7071727374	4372656174696E6720616E2061727469636C6520666F7220746865204B6E6F776C65646765626173652069732073696D696C617220746F2061736B696E67207175657374696F6E732E2046697273742C206E6176696761746520746F207468652063617465676F727920776865726520796F75206665656C207468652061727469636C652073686F756C642062652E204F6E63652074686572652C20646F75626C6520636865636B207468617420616E2061727469636C6520646F65736E277420616C726561647920657869737420776869636820776F756C6420776F726B2E00000000000000000000000000000000000000000000000000000000000000
-INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'b0' at row 1
 Warning	1265	Data truncated for column 'b1' at row 1
 Warning	1265	Data truncated for column 'b20' at row 1
 Warning	1265	Data truncated for column 'b255' at row 1
-INSERT INTO t1 SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1;
+INSERT INTO t1 (b,b0,b1,b20,b255) SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1;
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'b0' at row 1
@@ -237,29 +237,29 @@ a	bit(1)	#	#	#
 b	bit(20)	#	#	#	
 c	bit(64)	#	#	#	
 d	bit(1)	#	#	#	
-INSERT INTO t1 VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
+INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
 SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0;
 BIN(a)	HEX(b)	c+0
 0	FFFFF	18446744073709551615
-INSERT INTO t1 VALUES (1,0,-1,0);
+INSERT INTO t1 (a,b,c,d) VALUES (1,0,-1,0);
 SELECT a+0, b+0, c+0 FROM t1 WHERE d<100;
 a+0	b+0	c+0
 0	1048575	18446744073709551615
 1	0	18446744073709551615
-INSERT INTO t1 VALUES (b'1', 'f', 0xFF, 0x0);
+INSERT INTO t1 (a,b,c,d) VALUES (b'1', 'f', 0xFF, 0x0);
 SELECT a+0, b+0, c+0 FROM t1 WHERE d IN (0, 2);
 a+0	b+0	c+0
 1	0	18446744073709551615
 1	102	255
-INSERT INTO t1 VALUES (0x10,0,0,1);
+INSERT INTO t1 (a,b,c,d) VALUES (0x10,0,0,1);
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-SELECT * FROM t1;
+SELECT a,b,c,d FROM t1;
 a	b	c	d
-INSERT INTO t1 VALUES (0x01,0,0x10000000000000000,0);
+INSERT INTO t1 (a,b,c,d) VALUES (0x01,0,0x10000000000000000,0);
 Warnings:
 Warning	1264	Out of range value for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c,d FROM t1;
 a	b	c	d
 DROP TABLE t1;
 CREATE TABLE t1 (a BIT(65) <CUSTOM_COL_OPTIONS> NOT NULL) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
@@ -319,7 +319,7 @@ b17m	longblob	#	#	#
 t	tinyblob	#	#	#	
 m	mediumblob	#	#	#	
 l	longblob	#	#	#	
-INSERT INTO t1 VALUES
+INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES
 ('','','','','','','','','',''),
 ('a','b','c','d','e','f','g','h','i','j'),
 ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'),
@@ -330,7 +330,7 @@ LENGTH(b)	LENGTH(b0)	LENGTH(b1)	LENGTH(b300)	LENGTH(bm)	LENGTH(b70k)	LENGTH(b17m
 1	1	1	1	1	1	1	1	1	1
 5	5	5	5	5	5	5	5	5	6
 65535	65535	255	65535	65535	1048576	2097152	255	1048576	2097152
-INSERT INTO t1 VALUES
+INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES
 ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) );
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
@@ -392,23 +392,23 @@ SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 b1	tinyint(1)	#	#	#	
 b2	tinyint(1)	#	#	#	
-INSERT INTO t1 VALUES (1,TRUE);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (1,TRUE);
+SELECT b1,b2 FROM t1;
 b1	b2
 1	1
-INSERT INTO t1 VALUES (FALSE,0);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (FALSE,0);
+SELECT b1,b2 FROM t1;
 b1	b2
 0	0
 1	1
-INSERT INTO t1 VALUES (2,3);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (2,3);
+SELECT b1,b2 FROM t1;
 b1	b2
 0	0
 1	1
 2	3
-INSERT INTO t1 VALUES (-1,-2);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (-1,-2);
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
@@ -420,28 +420,28 @@ false	false
 true	true
 true	true
 true	true
-SELECT * FROM t1 WHERE b1 = TRUE;
+SELECT b1,b2 FROM t1 WHERE b1 = TRUE;
 b1	b2
 1	1
-SELECT * FROM t1 WHERE b2 = FALSE;
+SELECT b1,b2 FROM t1 WHERE b2 = FALSE;
 b1	b2
 0	0
-INSERT INTO t1 VALUES ('a','b');
+INSERT INTO t1 (b1,b2) VALUES ('a','b');
 Warnings:
 Warning	1366	Incorrect integer value: 'a' for column 'b1' at row 1
 Warning	1366	Incorrect integer value: 'b' for column 'b2' at row 1
-SELECT * FROM t1;
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
 0	0
 1	1
 2	3
-INSERT INTO t1 VALUES (128,-129);
+INSERT INTO t1 (b1,b2) VALUES (128,-129);
 Warnings:
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b2' at row 1
-SELECT * FROM t1;
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
@@ -499,20 +499,20 @@ c0	char(0)	#	#	#
 c1	char(1)	#	#	#	
 c20	char(20)	#	#	#	
 c255	char(255)	#	#	#	
-INSERT INTO t1 VALUES ('','','','','');
-INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
-SELECT * FROM t1;
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('','','','','');
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
+SELECT c,c0,c1,c20,c255 FROM t1;
 c	c0	c1	c20	c255
 				
 a		b	abcdefghi klmnopqrst	Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn't already exist which would work.
-INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
 Warning	1265	Data truncated for column 'c0' at row 1
 Warning	1265	Data truncated for column 'c1' at row 1
 Warning	1265	Data truncated for column 'c20' at row 1
 Warning	1265	Data truncated for column 'c255' at row 1
-INSERT INTO t1 SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1;
+INSERT INTO t1 (c,c0,c1,c20,c255) SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1;
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 2
 Warning	1265	Data truncated for column 'c0' at row 2
@@ -523,7 +523,7 @@ Warning	1265	Data truncated for column 'c0' at row 3
 Warning	1265	Data truncated for column 'c1' at row 3
 Warning	1265	Data truncated for column 'c20' at row 3
 Warning	1265	Data truncated for column 'c255' at row 3
-SELECT * FROM t1;
+SELECT c,c0,c1,c20,c255 FROM t1;
 c	c0	c1	c20	c255
 				
 				
@@ -625,7 +625,7 @@ INSERT INTO t1 (v0,v1,v64,v65000) VALUES ('','y','Once there, double check that
 
       * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen
             o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. ');
-SELECT * FROM t1;
+SELECT v0,v1,v64,v65000 FROM t1;
 v0	v1	v64	v65000
 
 
@@ -751,18 +751,18 @@ y	year(4)	#	#	#
 y4	year(4)	#	#	#	
 y2	year(2)	#	#	#	
 SET @tm = '2012-04-09 05:27:00';
-INSERT INTO t1 VALUES
+INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('1000-01-01', '1000-01-01 00:00:00', FROM_UNIXTIME(1), '-838:59:59', '1901', '1901', '00'),
 ('9999-12-31', '9999-12-31 23:59:59', FROM_UNIXTIME(2147483647), '838:59:59', '2155', '2155', '99'),
 ('0000-00-00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '00:00:00', '0', '0', '0'),
 (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm));
-SELECT * FROM t1;
+SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
 1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
 9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
-INSERT INTO t1 VALUES
+INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' );
 Warnings:
 Warning	1265	Data truncated for column 'd' at row 1
@@ -772,7 +772,7 @@ Warning	1264	Out of range value for column 't' at row 1
 Warning	1264	Out of range value for column 'y' at row 1
 Warning	1264	Out of range value for column 'y4' at row 1
 Warning	1264	Out of range value for column 'y2' at row 1
-SELECT * FROM t1;
+SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	-838:59:59	0000	0000	00
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
@@ -853,7 +853,7 @@ SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 c	timestamp	NO		CURRENT_TIMESTAMP	on update CURRENT_TIMESTAMP
 INSERT INTO t1 (c) VALUES (NULL);
-SELECT * FROM t1;
+SELECT c FROM t1;
 c
 <TIMESTAMP>
 DROP TABLE t1;
@@ -959,17 +959,17 @@ Field	Type	Null	Key	Default	Extra
 a	enum('')	#	#	#	
 b	enum('test1','test2','test3','test4','test5')	#	#	#	
 c	enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75')	#	#	#	
-INSERT INTO t1 VALUES ('','test2','4'),('',5,2);
-SELECT * FROM t1;
+INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2);
+SELECT a,b,c FROM t1;
 a	b	c
 	test2	4
 	test5	2
-INSERT INTO t1 VALUES (0,'test6',-1);
+INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1);
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 		
 	test2	4
@@ -984,14 +984,14 @@ a	enum('')	#	#	#
 b	enum('test1','test2','test3','test4','test5')	#	#	#	
 c	enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75')	#	#	#	
 e	enum('a','A')	#	#	#	
-INSERT INTO t1 VALUES ('','test3','75','A');
-SELECT * FROM t1;
+INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A');
+SELECT a,b,c,e FROM t1;
 a	b	c	e
 			a
 	test2	4	a
 	test3	75	a
 	test5	2	a
-SELECT * FROM t1 WHERE b='test2' OR a != '';
+SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != '';
 a	b	c	e
 	test2	4	a
 DROP TABLE t1;
@@ -1050,30 +1050,30 @@ n0_0	decimal(10,0)	#	#	#
 n1	decimal(1,0)	#	#	#	
 n20_4	decimal(20,4)	#	#	#	
 n65_4	decimal(65,4)	#	#	#	
-INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
-SELECT * FROM t1;
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
-INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
-SELECT * FROM t1;
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -1084,7 +1084,7 @@ Warning	1264	Out of range value for column 'n' at row 1
 Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
@@ -1092,7 +1092,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -1104,7 +1104,7 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
@@ -1113,7 +1113,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
 Warnings:
 Note	1265	Data truncated for column 'd' at row 1
 Note	1265	Data truncated for column 'd0' at row 1
@@ -1125,7 +1125,7 @@ Note	1265	Data truncated for column 'n0_0' at row 1
 Note	1265	Data truncated for column 'n1' at row 1
 Note	1265	Data truncated for column 'n20_4' at row 1
 Note	1265	Data truncated for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
@@ -1229,8 +1229,8 @@ d1_0	double(1,0)	#	#	#
 d10_10	double(10,10)	#	#	#	
 d53	double(53,0)	#	#	#	
 d53_10	double(53,10)	#	#	#	
-INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
-SELECT * FROM t1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	11111111.111
 d10_10	0.0123456789
@@ -1241,8 +1241,8 @@ f0	12345.1
 f20_3	56789.988
 f23_0	123457000
 r1_1	0.9
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 99999999999999999999999999999999999999,
 99999999999999999999999999999999999999.9999999999999999,
 0.9,
@@ -1257,7 +1257,7 @@ INSERT INTO t1 VALUES (
 Warnings:
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	0
 d	11111111.111
@@ -1288,8 +1288,8 @@ f23_0	1e38
 r1_1	0.0
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
-SELECT * FROM t1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
@@ -1341,7 +1341,7 @@ MAX(f0)	9.999999680285692e37
 MAX(f20_3)	99999998430674940.000
 MAX(f23_0)	9.999999680285692e37
 MAX(r1_1)	0.9
-INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
 Warnings:
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
@@ -1349,7 +1349,7 @@ Warning	1264	Out of range value for column 'r1_1' at row 1
 Warning	1264	Out of range value for column 'f23_0' at row 1
 Warning	1264	Out of range value for column 'f20_3' at row 1
 Warning	1264	Out of range value for column 'd1_0' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
@@ -1400,7 +1400,7 @@ r1_1	0.0
 r1_1	0.9
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 999999999999999999999999999999999999999,
 999999999999999999999999999999999999999.9999999999999999,
 1.9,
@@ -1423,7 +1423,7 @@ Warning	1264	Out of range value for column 'd1_0' at row 1
 Warning	1264	Out of range value for column 'd10_10' at row 1
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
@@ -1594,16 +1594,16 @@ b	bigint(20)	#	#	#
 b0	bigint(20)	#	#	#	
 b1	bigint(1)	#	#	#	
 b20	bigint(20)	#	#	#	
-INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
-SELECT * FROM t1;
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
-INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
-INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -1625,14 +1625,14 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-SELECT * FROM t1;
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
-INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -1654,7 +1654,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -1676,7 +1676,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -1742,7 +1742,7 @@ Warning	1264	Out of range value for column 'm' at row 4
 Warning	1264	Out of range value for column 'm0' at row 4
 Warning	1264	Out of range value for column 'm1' at row 4
 Warning	1264	Out of range value for column 'm20' at row 4
-SELECT * FROM t1;
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
@@ -1912,22 +1912,22 @@ Field	Type	Null	Key	Default	Extra
 a	set('')	#	#	#	
 b	set('test1','test2','test3','test4','test5')	#	#	#	
 c	set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50''51','52','53','54','55','56','57','58','59','60','61','62','63','64')	#	#	#	
-INSERT INTO t1 VALUES 
+INSERT INTO t1 (a,b,c) VALUES 
 ('','test2,test3','01,34,44,,23'),
 ('',5,2),
 (',','test4,test2','');
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 	test1,test3	02
 	test2,test3	01,23,34,44
 	test2,test4	
-INSERT INTO t1 VALUES (0,'test6',-1);
+INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1);
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 		01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50'51,52,53,54,55,56,57,58,59,60,61,62,63,64
 	test1,test3	02
@@ -1945,7 +1945,7 @@ c	set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15'
 e	set('a','A')	#	#	#	
 ALTER TABLE t1 ADD COLUMN f SET('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',' ','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i') <CUSTOM_COL_OPTIONS> NOT NULL;
 ERROR HY000: Too many strings for column f and SET
-SELECT * FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != '';
+SELECT a,b,c,e FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != '';
 a	b	c	e
 	test2,test3	01,23,34,44	
 	test2,test4		
@@ -2005,7 +2005,7 @@ t17m	longtext	#	#	#
 tt	tinytext	#	#	#	
 m	mediumtext	#	#	#	
 l	longtext	#	#	#	
-INSERT INTO t1 VALUES
+INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES
 ('','','','','','','','','',''),
 ('a','b','c','d','e','f','g','h','i','j'),
 ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'),
@@ -2016,7 +2016,7 @@ LENGTH(t)	LENGTH(t0)	LENGTH(t1)	LENGTH(t300)	LENGTH(tm)	LENGTH(t70k)	LENGTH(t17m
 1	1	1	1	1	1	1	1	1	1
 5	5	5	5	5	5	5	5	5	6
 65535	65535	255	65535	65535	1048576	1048576	255	1048576	1048576
-INSERT INTO t1 VALUES
+INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES
 ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) );
 Warnings:
 Warning	1265	Data truncated for column 't' at row 1
diff --git a/mysql-test/suite/storage_engine/col_opt_not_null.test b/mysql-test/suite/storage_engine/col_opt_not_null.test
index 2cd0e909536..1ec00621518 100644
--- a/mysql-test/suite/storage_engine/col_opt_not_null.test
+++ b/mysql-test/suite/storage_engine/col_opt_not_null.test
@@ -144,7 +144,7 @@ if (!$mysql_errname)
   }
 
   --replace_regex /[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} [[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}/<TIMESTAMP>/
-  SELECT * FROM t1;
+  SELECT c FROM t1;
   DROP TABLE t1;
 }
 
diff --git a/mysql-test/suite/storage_engine/col_opt_null.result b/mysql-test/suite/storage_engine/col_opt_null.result
index ebcb91d0c5f..45982faed61 100644
--- a/mysql-test/suite/storage_engine/col_opt_null.result
+++ b/mysql-test/suite/storage_engine/col_opt_null.result
@@ -15,20 +15,20 @@ b0	binary(0)	#	#	#	#
 b1	binary(1)	#	#	#	#
 b20	binary(20)	#	#	#	#
 b255	binary(255)	#	#	#	#
-INSERT INTO t1 VALUES ('','','','','');
-INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('','','','','');
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
 SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1;
 HEX(b)	HEX(b0)	HEX(b1)	HEX(b20)	HEX(b255)
 00		00	0000000000000000000000000000000000000000	000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 61		62	616263646566676869206B6C6D6E6F7071727374	4372656174696E6720616E2061727469636C6520666F7220746865204B6E6F776C65646765626173652069732073696D696C617220746F2061736B696E67207175657374696F6E732E2046697273742C206E6176696761746520746F207468652063617465676F727920776865726520796F75206665656C207468652061727469636C652073686F756C642062652E204F6E63652074686572652C20646F75626C6520636865636B207468617420616E2061727469636C6520646F65736E277420616C726561647920657869737420776869636820776F756C6420776F726B2E00000000000000000000000000000000000000000000000000000000000000
-INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'b0' at row 1
 Warning	1265	Data truncated for column 'b1' at row 1
 Warning	1265	Data truncated for column 'b20' at row 1
 Warning	1265	Data truncated for column 'b255' at row 1
-INSERT INTO t1 SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1;
+INSERT INTO t1 (b,b0,b1,b20,b255) SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1;
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'b0' at row 1
@@ -229,29 +229,29 @@ a	bit(1)	#	#	#
 b	bit(20)	#	#	#	
 c	bit(64)	#	#	#	
 d	bit(1)	#	#	#	
-INSERT INTO t1 VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
+INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
 SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0;
 BIN(a)	HEX(b)	c+0
 0	FFFFF	18446744073709551615
-INSERT INTO t1 VALUES (1,0,-1,0);
+INSERT INTO t1 (a,b,c,d) VALUES (1,0,-1,0);
 SELECT a+0, b+0, c+0 FROM t1 WHERE d<100;
 a+0	b+0	c+0
 0	1048575	18446744073709551615
 1	0	18446744073709551615
-INSERT INTO t1 VALUES (b'1', 'f', 0xFF, 0x0);
+INSERT INTO t1 (a,b,c,d) VALUES (b'1', 'f', 0xFF, 0x0);
 SELECT a+0, b+0, c+0 FROM t1 WHERE d IN (0, 2);
 a+0	b+0	c+0
 1	0	18446744073709551615
 1	102	255
-INSERT INTO t1 VALUES (0x10,0,0,1);
+INSERT INTO t1 (a,b,c,d) VALUES (0x10,0,0,1);
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-SELECT * FROM t1;
+SELECT a,b,c,d FROM t1;
 a	b	c	d
-INSERT INTO t1 VALUES (0x01,0,0x10000000000000000,0);
+INSERT INTO t1 (a,b,c,d) VALUES (0x01,0,0x10000000000000000,0);
 Warnings:
 Warning	1264	Out of range value for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c,d FROM t1;
 a	b	c	d
 DROP TABLE t1;
 CREATE TABLE t1 (a BIT(65) <CUSTOM_COL_OPTIONS> NULL) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
@@ -307,7 +307,7 @@ b17m	longblob	#	#	#
 t	tinyblob	#	#	#	
 m	mediumblob	#	#	#	
 l	longblob	#	#	#	
-INSERT INTO t1 VALUES
+INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES
 ('','','','','','','','','',''),
 ('a','b','c','d','e','f','g','h','i','j'),
 ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'),
@@ -318,7 +318,7 @@ LENGTH(b)	LENGTH(b0)	LENGTH(b1)	LENGTH(b300)	LENGTH(bm)	LENGTH(b70k)	LENGTH(b17m
 1	1	1	1	1	1	1	1	1	1
 5	5	5	5	5	5	5	5	5	6
 65535	65535	255	65535	65535	1048576	2097152	255	1048576	2097152
-INSERT INTO t1 VALUES
+INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES
 ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) );
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
@@ -388,23 +388,23 @@ SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 b1	tinyint(1)	#	#	#	
 b2	tinyint(1)	#	#	#	
-INSERT INTO t1 VALUES (1,TRUE);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (1,TRUE);
+SELECT b1,b2 FROM t1;
 b1	b2
 1	1
-INSERT INTO t1 VALUES (FALSE,0);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (FALSE,0);
+SELECT b1,b2 FROM t1;
 b1	b2
 0	0
 1	1
-INSERT INTO t1 VALUES (2,3);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (2,3);
+SELECT b1,b2 FROM t1;
 b1	b2
 0	0
 1	1
 2	3
-INSERT INTO t1 VALUES (-1,-2);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (-1,-2);
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
@@ -416,28 +416,28 @@ false	false
 true	true
 true	true
 true	true
-SELECT * FROM t1 WHERE b1 = TRUE;
+SELECT b1,b2 FROM t1 WHERE b1 = TRUE;
 b1	b2
 1	1
-SELECT * FROM t1 WHERE b2 = FALSE;
+SELECT b1,b2 FROM t1 WHERE b2 = FALSE;
 b1	b2
 0	0
-INSERT INTO t1 VALUES ('a','b');
+INSERT INTO t1 (b1,b2) VALUES ('a','b');
 Warnings:
 Warning	1366	Incorrect integer value: 'a' for column 'b1' at row 1
 Warning	1366	Incorrect integer value: 'b' for column 'b2' at row 1
-SELECT * FROM t1;
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
 0	0
 1	1
 2	3
-INSERT INTO t1 VALUES (128,-129);
+INSERT INTO t1 (b1,b2) VALUES (128,-129);
 Warnings:
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b2' at row 1
-SELECT * FROM t1;
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
@@ -491,20 +491,20 @@ c0	char(0)	#	#	#
 c1	char(1)	#	#	#	
 c20	char(20)	#	#	#	
 c255	char(255)	#	#	#	
-INSERT INTO t1 VALUES ('','','','','');
-INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
-SELECT * FROM t1;
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('','','','','');
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
+SELECT c,c0,c1,c20,c255 FROM t1;
 c	c0	c1	c20	c255
 				
 a		b	abcdefghi klmnopqrst	Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn't already exist which would work.
-INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
 Warning	1265	Data truncated for column 'c0' at row 1
 Warning	1265	Data truncated for column 'c1' at row 1
 Warning	1265	Data truncated for column 'c20' at row 1
 Warning	1265	Data truncated for column 'c255' at row 1
-INSERT INTO t1 SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1;
+INSERT INTO t1 (c,c0,c1,c20,c255) SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1;
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 2
 Warning	1265	Data truncated for column 'c0' at row 2
@@ -515,7 +515,7 @@ Warning	1265	Data truncated for column 'c0' at row 3
 Warning	1265	Data truncated for column 'c1' at row 3
 Warning	1265	Data truncated for column 'c20' at row 3
 Warning	1265	Data truncated for column 'c255' at row 3
-SELECT * FROM t1;
+SELECT c,c0,c1,c20,c255 FROM t1;
 c	c0	c1	c20	c255
 				
 				
@@ -613,7 +613,7 @@ INSERT INTO t1 (v0,v1,v64,v65000) VALUES ('','y','Once there, double check that
 
       * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen
             o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. ');
-SELECT * FROM t1;
+SELECT v0,v1,v64,v65000 FROM t1;
 v0	v1	v64	v65000
 
 
@@ -735,18 +735,18 @@ y	year(4)	#	#	#
 y4	year(4)	#	#	#	
 y2	year(2)	#	#	#	
 SET @tm = '2012-04-09 05:27:00';
-INSERT INTO t1 VALUES
+INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('1000-01-01', '1000-01-01 00:00:00', FROM_UNIXTIME(1), '-838:59:59', '1901', '1901', '00'),
 ('9999-12-31', '9999-12-31 23:59:59', FROM_UNIXTIME(2147483647), '838:59:59', '2155', '2155', '99'),
 ('0000-00-00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '00:00:00', '0', '0', '0'),
 (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm));
-SELECT * FROM t1;
+SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
 1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
 9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
-INSERT INTO t1 VALUES
+INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' );
 Warnings:
 Warning	1265	Data truncated for column 'd' at row 1
@@ -756,7 +756,7 @@ Warning	1264	Out of range value for column 't' at row 1
 Warning	1264	Out of range value for column 'y' at row 1
 Warning	1264	Out of range value for column 'y4' at row 1
 Warning	1264	Out of range value for column 'y2' at row 1
-SELECT * FROM t1;
+SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	-838:59:59	0000	0000	00
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
@@ -927,17 +927,17 @@ Field	Type	Null	Key	Default	Extra
 a	enum('')	#	#	#	
 b	enum('test1','test2','test3','test4','test5')	#	#	#	
 c	enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75')	#	#	#	
-INSERT INTO t1 VALUES ('','test2','4'),('',5,2);
-SELECT * FROM t1;
+INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2);
+SELECT a,b,c FROM t1;
 a	b	c
 	test2	4
 	test5	2
-INSERT INTO t1 VALUES (0,'test6',-1);
+INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1);
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 		
 	test2	4
@@ -952,14 +952,14 @@ a	enum('')	#	#	#
 b	enum('test1','test2','test3','test4','test5')	#	#	#	
 c	enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75')	#	#	#	
 e	enum('a','A')	#	#	#	
-INSERT INTO t1 VALUES ('','test3','75','A');
-SELECT * FROM t1;
+INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A');
+SELECT a,b,c,e FROM t1;
 a	b	c	e
 			NULL
 	test2	4	NULL
 	test3	75	a
 	test5	2	NULL
-SELECT * FROM t1 WHERE b='test2' OR a != '';
+SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != '';
 a	b	c	e
 	test2	4	NULL
 DROP TABLE t1;
@@ -1014,30 +1014,30 @@ n0_0	decimal(10,0)	#	#	#
 n1	decimal(1,0)	#	#	#	
 n20_4	decimal(20,4)	#	#	#	
 n65_4	decimal(65,4)	#	#	#	
-INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
-SELECT * FROM t1;
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
-INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
-SELECT * FROM t1;
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -1048,7 +1048,7 @@ Warning	1264	Out of range value for column 'n' at row 1
 Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
@@ -1056,7 +1056,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -1068,7 +1068,7 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
@@ -1077,7 +1077,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
 Warnings:
 Note	1265	Data truncated for column 'd' at row 1
 Note	1265	Data truncated for column 'd0' at row 1
@@ -1089,7 +1089,7 @@ Note	1265	Data truncated for column 'n0_0' at row 1
 Note	1265	Data truncated for column 'n1' at row 1
 Note	1265	Data truncated for column 'n20_4' at row 1
 Note	1265	Data truncated for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
@@ -1183,8 +1183,8 @@ d1_0	double(1,0)	#	#	#
 d10_10	double(10,10)	#	#	#	
 d53	double(53,0)	#	#	#	
 d53_10	double(53,10)	#	#	#	
-INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
-SELECT * FROM t1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	11111111.111
 d10_10	0.0123456789
@@ -1195,8 +1195,8 @@ f0	12345.1
 f20_3	56789.988
 f23_0	123457000
 r1_1	0.9
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 99999999999999999999999999999999999999,
 99999999999999999999999999999999999999.9999999999999999,
 0.9,
@@ -1211,7 +1211,7 @@ INSERT INTO t1 VALUES (
 Warnings:
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	0
 d	11111111.111
@@ -1242,8 +1242,8 @@ f23_0	1e38
 r1_1	0.0
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
-SELECT * FROM t1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
@@ -1295,7 +1295,7 @@ MAX(f0)	9.999999680285692e37
 MAX(f20_3)	99999998430674940.000
 MAX(f23_0)	9.999999680285692e37
 MAX(r1_1)	0.9
-INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
 Warnings:
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
@@ -1303,7 +1303,7 @@ Warning	1264	Out of range value for column 'r1_1' at row 1
 Warning	1264	Out of range value for column 'f23_0' at row 1
 Warning	1264	Out of range value for column 'f20_3' at row 1
 Warning	1264	Out of range value for column 'd1_0' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
@@ -1354,7 +1354,7 @@ r1_1	0.0
 r1_1	0.9
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 999999999999999999999999999999999999999,
 999999999999999999999999999999999999999.9999999999999999,
 1.9,
@@ -1377,7 +1377,7 @@ Warning	1264	Out of range value for column 'd1_0' at row 1
 Warning	1264	Out of range value for column 'd10_10' at row 1
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
@@ -1540,16 +1540,16 @@ b	bigint(20)	#	#	#
 b0	bigint(20)	#	#	#	
 b1	bigint(1)	#	#	#	
 b20	bigint(20)	#	#	#	
-INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
-SELECT * FROM t1;
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
-INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
-INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -1571,14 +1571,14 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-SELECT * FROM t1;
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
-INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -1600,7 +1600,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -1622,7 +1622,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -1688,7 +1688,7 @@ Warning	1264	Out of range value for column 'm' at row 4
 Warning	1264	Out of range value for column 'm0' at row 4
 Warning	1264	Out of range value for column 'm1' at row 4
 Warning	1264	Out of range value for column 'm20' at row 4
-SELECT * FROM t1;
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
@@ -1838,22 +1838,22 @@ Field	Type	Null	Key	Default	Extra
 a	set('')	#	#	#	
 b	set('test1','test2','test3','test4','test5')	#	#	#	
 c	set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50''51','52','53','54','55','56','57','58','59','60','61','62','63','64')	#	#	#	
-INSERT INTO t1 VALUES 
+INSERT INTO t1 (a,b,c) VALUES 
 ('','test2,test3','01,34,44,,23'),
 ('',5,2),
 (',','test4,test2','');
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 	test1,test3	02
 	test2,test3	01,23,34,44
 	test2,test4	
-INSERT INTO t1 VALUES (0,'test6',-1);
+INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1);
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 		01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50'51,52,53,54,55,56,57,58,59,60,61,62,63,64
 	test1,test3	02
@@ -1871,7 +1871,7 @@ c	set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15'
 e	set('a','A')	#	#	#	
 ALTER TABLE t1 ADD COLUMN f SET('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',' ','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i') <CUSTOM_COL_OPTIONS> NULL;
 ERROR HY000: Too many strings for column f and SET
-SELECT * FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != '';
+SELECT a,b,c,e FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != '';
 a	b	c	e
 	test2,test3	01,23,34,44	NULL
 	test2,test4		NULL
@@ -1927,7 +1927,7 @@ t17m	longtext	#	#	#
 tt	tinytext	#	#	#	
 m	mediumtext	#	#	#	
 l	longtext	#	#	#	
-INSERT INTO t1 VALUES
+INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES
 ('','','','','','','','','',''),
 ('a','b','c','d','e','f','g','h','i','j'),
 ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'),
@@ -1938,7 +1938,7 @@ LENGTH(t)	LENGTH(t0)	LENGTH(t1)	LENGTH(t300)	LENGTH(tm)	LENGTH(t70k)	LENGTH(t17m
 1	1	1	1	1	1	1	1	1	1
 5	5	5	5	5	5	5	5	5	6
 65535	65535	255	65535	65535	1048576	1048576	255	1048576	1048576
-INSERT INTO t1 VALUES
+INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES
 ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) );
 Warnings:
 Warning	1265	Data truncated for column 't' at row 1
diff --git a/mysql-test/suite/storage_engine/col_opt_unsigned.result b/mysql-test/suite/storage_engine/col_opt_unsigned.result
index a68aa48ee79..7b5274525ce 100644
--- a/mysql-test/suite/storage_engine/col_opt_unsigned.result
+++ b/mysql-test/suite/storage_engine/col_opt_unsigned.result
@@ -25,15 +25,15 @@ n0_0	decimal(10,0) unsigned	#	#	#
 n1	decimal(1,0) unsigned	#	#	#	
 n20_4	decimal(20,4) unsigned	#	#	#	
 n65_4	decimal(65,4) unsigned	#	#	#	
-INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
-SELECT * FROM t1;
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -45,7 +45,7 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -57,20 +57,20 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -81,7 +81,7 @@ Warning	1264	Out of range value for column 'n' at row 1
 Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
@@ -89,7 +89,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -101,7 +101,7 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
@@ -110,7 +110,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
 Warnings:
 Note	1265	Data truncated for column 'd' at row 1
 Note	1265	Data truncated for column 'd0' at row 1
@@ -122,7 +122,7 @@ Note	1265	Data truncated for column 'n0_0' at row 1
 Note	1265	Data truncated for column 'n1' at row 1
 Note	1265	Data truncated for column 'n20_4' at row 1
 Note	1265	Data truncated for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
@@ -152,7 +152,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 INSERT INTO t1 (a,b) VALUES (-100,100);
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	100
 1	0
@@ -184,8 +184,8 @@ d1_0	double(1,0) unsigned	#	#	#
 d10_10	double(10,10) unsigned	#	#	#	
 d53	double(53,0) unsigned	#	#	#	
 d53_10	double(53,10) unsigned	#	#	#	
-INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
-SELECT * FROM t1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	11111111.111
 d10_10	0.0123456789
@@ -196,8 +196,8 @@ f0	12345.1
 f20_3	56789.988
 f23_0	123457000
 r1_1	0.9
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 99999999999999999999999999999999999999,
 99999999999999999999999999999999999999.9999999999999999,
 0.9,
@@ -212,7 +212,7 @@ INSERT INTO t1 VALUES (
 Warnings:
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	0
 d	11111111.111
@@ -243,7 +243,7 @@ f23_0	1e38
 r1_1	0.0
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
 Warnings:
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
@@ -255,7 +255,7 @@ Warning	1264	Out of range value for column 'd1_0' at row 1
 Warning	1264	Out of range value for column 'd10_10' at row 1
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	0
 d	0
@@ -307,7 +307,7 @@ MAX(f0)	9.999999680285692e37
 MAX(f20_3)	99999998430674940.000
 MAX(f23_0)	9.999999680285692e37
 MAX(r1_1)	0.9
-INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
 Warnings:
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
@@ -315,7 +315,7 @@ Warning	1264	Out of range value for column 'r1_1' at row 1
 Warning	1264	Out of range value for column 'f23_0' at row 1
 Warning	1264	Out of range value for column 'f20_3' at row 1
 Warning	1264	Out of range value for column 'd1_0' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	0
 d	0
@@ -366,7 +366,7 @@ r1_1	0.0
 r1_1	0.9
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 999999999999999999999999999999999999999,
 999999999999999999999999999999999999999.9999999999999999,
 1.9,
@@ -389,7 +389,7 @@ Warning	1264	Out of range value for column 'd1_0' at row 1
 Warning	1264	Out of range value for column 'd10_10' at row 1
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	0
 d	0
@@ -470,7 +470,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 INSERT INTO t1 (a,b) VALUES (-100,100);
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	100
 1	0
@@ -522,15 +522,15 @@ b	bigint(20) unsigned	#	#	#
 b0	bigint(20) unsigned	#	#	#	
 b1	bigint(1) unsigned	#	#	#	
 b20	bigint(20) unsigned	#	#	#	
-INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
-SELECT * FROM t1;
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
-INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -552,15 +552,15 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
-SELECT * FROM t1;
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
 4294967295	4294967295	4294967295	4294967295	255	255	255	255	65535	65535	65535	65535	16777215	16777215	16777215	16777215	18446744073709551615	18446744073709551615	18446744073709551615	18446744073709551615
-INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -582,7 +582,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -604,7 +604,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -654,7 +654,7 @@ Warning	1264	Out of range value for column 'm' at row 3
 Warning	1264	Out of range value for column 'm0' at row 3
 Warning	1264	Out of range value for column 'm1' at row 3
 Warning	1264	Out of range value for column 'm20' at row 3
-SELECT * FROM t1;
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -690,7 +690,7 @@ Warning	1264	Out of range value for column 's' at row 1
 Warning	1264	Out of range value for column 'm' at row 1
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'b' at row 1
-SELECT * FROM t1;
+SELECT t,s,m,i,b FROM t1;
 t	s	m	i	b
 0	0	0	0	0
 255	65535	16777215	4294967295	18446744073709551615
diff --git a/mysql-test/suite/storage_engine/col_opt_unsigned.test b/mysql-test/suite/storage_engine/col_opt_unsigned.test
index e9d4566de7f..62b7b29a507 100644
--- a/mysql-test/suite/storage_engine/col_opt_unsigned.test
+++ b/mysql-test/suite/storage_engine/col_opt_unsigned.test
@@ -29,7 +29,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a,b) VALUES (1.0,-1.0);
   INSERT INTO t1 (a,b) VALUES (-100,100);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
@@ -56,7 +56,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a,b) VALUES (1.0,-1.0);
   INSERT INTO t1 (a,b) VALUES (-100,100);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
@@ -86,7 +86,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (t,s,m,i,b) VALUES (255,65535,16777215,4294967295,18446744073709551615);
   INSERT INTO t1 (t,s,m,i,b) VALUES (-1,-1,-1,-1,-1);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT t,s,m,i,b FROM t1;
   DROP TABLE t1;
   
 }
diff --git a/mysql-test/suite/storage_engine/col_opt_zerofill.result b/mysql-test/suite/storage_engine/col_opt_zerofill.result
index c2445c5bbc7..a35ce4bfe66 100644
--- a/mysql-test/suite/storage_engine/col_opt_zerofill.result
+++ b/mysql-test/suite/storage_engine/col_opt_zerofill.result
@@ -25,15 +25,15 @@ n0_0	decimal(10,0) unsigned zerofill	#	#	#
 n1	decimal(1,0) unsigned zerofill	#	#	#	
 n20_4	decimal(20,4) unsigned zerofill	#	#	#	
 n65_4	decimal(65,4) unsigned zerofill	#	#	#	
-INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
-SELECT * FROM t1;
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000100	0000123456	0.3	00040000.25	00000000000000000000000000000000123456789123456789.1000100000	0000001024	0000007000	8	0000000000999999.9000	0000000000000000000000000000000000000000009223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -45,7 +45,7 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -57,20 +57,20 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000100	0000123456	0.3	00040000.25	00000000000000000000000000000000123456789123456789.1000100000	0000001024	0000007000	8	0000000000999999.9000	0000000000000000000000000000000000000000009223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -81,7 +81,7 @@ Warning	1264	Out of range value for column 'n' at row 1
 Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
@@ -89,7 +89,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0000000100	0000123456	0.3	00040000.25	00000000000000000000000000000000123456789123456789.1000100000	0000001024	0000007000	8	0000000000999999.9000	0000000000000000000000000000000000000000009223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -101,7 +101,7 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
@@ -110,7 +110,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
 Warnings:
 Note	1265	Data truncated for column 'd' at row 1
 Note	1265	Data truncated for column 'd0' at row 1
@@ -122,7 +122,7 @@ Note	1265	Data truncated for column 'n0_0' at row 1
 Note	1265	Data truncated for column 'n1' at row 1
 Note	1265	Data truncated for column 'n20_4' at row 1
 Note	1265	Data truncated for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
 0000000000	0000000000	0.0	00000000.00	00000000000000000000000000000000000000000000000000.0000000000	0000000000	0000000000	0	0000000000000000.0000	0000000000000000000000000000000000000000000000000000000000000.0000
@@ -149,7 +149,7 @@ b	decimal(10,0) unsigned zerofill	#	#	#	#
 INSERT INTO t1 (a,b) VALUES (1.1,1234);
 Warnings:
 Note	1265	Data truncated for column 'a' at row 1
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0000000001	0000001234
 DROP TABLE t1;
@@ -180,8 +180,8 @@ d1_0	double(1,0) unsigned zerofill	#	#	#
 d10_10	double(10,10) unsigned zerofill	#	#	#	
 d53	double(53,0) unsigned zerofill	#	#	#	
 d53_10	double(53,10) unsigned zerofill	#	#	#	
-INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
-SELECT * FROM t1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	0000012345.1
 d	000000000011111111.111
 d10_10	0.0123456789
@@ -192,8 +192,8 @@ f0	0000012345.1
 f20_3	0000000000056789.988
 f23_0	000123457000
 r1_1	0.9
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 99999999999999999999999999999999999999,
 99999999999999999999999999999999999999.9999999999999999,
 0.9,
@@ -208,7 +208,7 @@ INSERT INTO t1 VALUES (
 Warnings:
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	0000012345.1
 d	0000000000000000000000
 d	0000000000000000001e81
@@ -239,7 +239,7 @@ f23_0	000123457000
 r1_1	0.0
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
 Warnings:
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
@@ -251,7 +251,7 @@ Warning	1264	Out of range value for column 'd1_0' at row 1
 Warning	1264	Out of range value for column 'd10_10' at row 1
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	0000012345.1
 d	0000000000000000000000
 d	0000000000000000000000
@@ -303,7 +303,7 @@ MAX(f0)	9.999999680285692e37
 MAX(f20_3)	99999998430674940.000
 MAX(f23_0)	9.999999680285692e37
 MAX(r1_1)	0.9
-INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
 Warnings:
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
@@ -311,7 +311,7 @@ Warning	1264	Out of range value for column 'r1_1' at row 1
 Warning	1264	Out of range value for column 'f23_0' at row 1
 Warning	1264	Out of range value for column 'f20_3' at row 1
 Warning	1264	Out of range value for column 'd1_0' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	0000012345.1
 d	0000000000000000000000
 d	0000000000000000000000
@@ -362,7 +362,7 @@ r1_1	0.0
 r1_1	0.9
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 999999999999999999999999999999999999999,
 999999999999999999999999999999999999999.9999999999999999,
 1.9,
@@ -385,7 +385,7 @@ Warning	1264	Out of range value for column 'd1_0' at row 1
 Warning	1264	Out of range value for column 'd10_10' at row 1
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	0000012345.1
 d	0000000000000000000000
 d	0000000000000000000000
@@ -461,7 +461,7 @@ Field	Type	Null	Key	Default	Extra
 a	double unsigned zerofill	#	#	#	#
 b	float unsigned zerofill	#	#	#	#
 INSERT INTO t1 (a,b) VALUES (1,1234.5);
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0000000000000000000001	0000001234.5
 DROP TABLE t1;
@@ -512,15 +512,15 @@ b	bigint(20) unsigned zerofill	#	#	#
 b0	bigint(20) unsigned zerofill	#	#	#	
 b1	bigint(1) unsigned zerofill	#	#	#	
 b20	bigint(20) unsigned zerofill	#	#	#	
-INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
-SELECT * FROM t1;
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0000000000	0000000000	0	00000000000000000000	000	000	0	00000000000000000000	00000	00000	0	00000000000000000000	00000000	00000000	0	00000000000000000000	00000000000000000000	00000000000000000000	0	00000000000000000000
 0000000001	0000000002	3	00000000000000000004	005	006	7	00000000000000000008	00009	00010	11	00000000000000000012	00000013	00000014	15	00000000000000000016	00000000000000000017	00000000000000000018	19	00000000000000000020
 2147483647	2147483647	2147483647	00000000002147483647	127	127	127	00000000000000000127	32767	32767	32767	00000000000000032767	08388607	08388607	8388607	00000000000008388607	09223372036854775807	09223372036854775807	9223372036854775807	09223372036854775807
-INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -542,15 +542,15 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
-SELECT * FROM t1;
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0000000000	0000000000	0	00000000000000000000	000	000	0	00000000000000000000	00000	00000	0	00000000000000000000	00000000	00000000	0	00000000000000000000	00000000000000000000	00000000000000000000	0	00000000000000000000
 0000000000	0000000000	0	00000000000000000000	000	000	0	00000000000000000000	00000	00000	0	00000000000000000000	00000000	00000000	0	00000000000000000000	00000000000000000000	00000000000000000000	0	00000000000000000000
 0000000001	0000000002	3	00000000000000000004	005	006	7	00000000000000000008	00009	00010	11	00000000000000000012	00000013	00000014	15	00000000000000000016	00000000000000000017	00000000000000000018	19	00000000000000000020
 2147483647	2147483647	2147483647	00000000002147483647	127	127	127	00000000000000000127	32767	32767	32767	00000000000000032767	08388607	08388607	8388607	00000000000008388607	09223372036854775807	09223372036854775807	9223372036854775807	09223372036854775807
 4294967295	4294967295	4294967295	00000000004294967295	255	255	255	00000000000000000255	65535	65535	65535	00000000000000065535	16777215	16777215	16777215	00000000000016777215	18446744073709551615	18446744073709551615	18446744073709551615	18446744073709551615
-INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -572,7 +572,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -594,7 +594,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -644,7 +644,7 @@ Warning	1264	Out of range value for column 'm' at row 3
 Warning	1264	Out of range value for column 'm0' at row 3
 Warning	1264	Out of range value for column 'm1' at row 3
 Warning	1264	Out of range value for column 'm20' at row 3
-SELECT * FROM t1;
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0000000000	0000000000	0	00000000000000000000	000	000	0	00000000000000000000	00000	00000	0	00000000000000000000	00000000	00000000	0	00000000000000000000	00000000000000000000	00000000000000000000	0	00000000000000000000
 0000000000	0000000000	0	00000000000000000000	000	000	0	00000000000000000000	00000	00000	0	00000000000000000000	00000000	00000000	0	00000000000000000000	00000000000000000000	00000000000000000000	0	00000000000000000000
@@ -673,7 +673,7 @@ m	mediumint(8) unsigned zerofill	#	#	#	#
 i	int(10) unsigned zerofill	#	#	#	#
 b	bigint(20) unsigned zerofill	#	#	#	#
 INSERT INTO t1 (t,s,m,i,b) VALUES (1,10,100,1000,0);
-SELECT * FROM t1;
+SELECT t,s,m,i,b FROM t1;
 t	s	m	i	b
 001	00010	00000100	0000001000	00000000000000000000
 DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/col_opt_zerofill.test b/mysql-test/suite/storage_engine/col_opt_zerofill.test
index 83b7dcf28c1..0dc1c243673 100644
--- a/mysql-test/suite/storage_engine/col_opt_zerofill.test
+++ b/mysql-test/suite/storage_engine/col_opt_zerofill.test
@@ -27,7 +27,7 @@ if (!$mysql_errname)
   SHOW COLUMNS IN t1;
 
   INSERT INTO t1 (a,b) VALUES (1.1,1234);
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
@@ -52,7 +52,7 @@ if (!$mysql_errname)
   SHOW COLUMNS IN t1;
 
   INSERT INTO t1 (a,b) VALUES (1,1234.5);
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
@@ -80,7 +80,7 @@ if (!$mysql_errname)
   SHOW COLUMNS IN t1;
 
   INSERT INTO t1 (t,s,m,i,b) VALUES (1,10,100,1000,0);
-  SELECT * FROM t1;
+  SELECT t,s,m,i,b FROM t1;
   DROP TABLE t1;
 }
 
diff --git a/mysql-test/suite/storage_engine/delete.result b/mysql-test/suite/storage_engine/delete.result
index 1d84516c86a..d7125a344b7 100644
--- a/mysql-test/suite/storage_engine/delete.result
+++ b/mysql-test/suite/storage_engine/delete.result
@@ -3,7 +3,7 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTO
 INSERT INTO t1 (a,b) VALUES (10000,'foobar'),(1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
 INSERT INTO t1 (a,b) SELECT a, b FROM t1;
 DELETE FROM t1 WHERE b IN ('c');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 1	a
@@ -16,7 +16,7 @@ a	b
 5	e
 5	e
 DELETE FROM t1 WHERE a < 0 OR b = 'a';
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 10000	foobar
 10000	foobar
@@ -27,7 +27,7 @@ a	b
 5	e
 5	e
 DELETE FROM t1 WHERE a <= 4 ORDER BY b DESC LIMIT 1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 10000	foobar
 10000	foobar
@@ -38,7 +38,7 @@ a	b
 5	e
 CREATE TABLE t2 (c <CHAR_COLUMN>, d <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t2 (c,d) SELECT b, a FROM t1;
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 b	2
 b	2
@@ -48,7 +48,7 @@ e	5
 foobar	10000
 foobar	10000
 DELETE t2.* FROM t1, t2 WHERE c < b AND a + d != 1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 10000	foobar
 10000	foobar
@@ -57,21 +57,21 @@ a	b
 4	d
 5	e
 5	e
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 foobar	10000
 foobar	10000
 DELETE FROM t2, t1.* USING t2, t1 WHERE c = 'foobar' and b = c;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 2	b
 2	b
 4	d
 5	e
 5	e
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 DELETE FROM t1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 DROP TABLE t1, t2;
diff --git a/mysql-test/suite/storage_engine/delete.test b/mysql-test/suite/storage_engine/delete.test
index 802093e2977..e210ec3d17c 100644
--- a/mysql-test/suite/storage_engine/delete.test
+++ b/mysql-test/suite/storage_engine/delete.test
@@ -25,16 +25,16 @@ if ($mysql_errname)
   --source unexpected_result.inc
 }
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 DELETE FROM t1 WHERE a < 0 OR b = 'a';
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 # ORDER BY and LIMIT
 DELETE FROM t1 WHERE a <= 4 ORDER BY b DESC LIMIT 1;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 # Multi-table DELETE
 
@@ -43,23 +43,23 @@ SELECT * FROM t1;
 --source create_table.inc
 INSERT INTO t2 (c,d) SELECT b, a FROM t1;
 --sorted_result
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 
 DELETE t2.* FROM t1, t2 WHERE c < b AND a + d != 1;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 --sorted_result
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 
 DELETE FROM t2, t1.* USING t2, t1 WHERE c = 'foobar' and b = c;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 --sorted_result
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 
 DELETE FROM t1;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 # Cleanup
 DROP TABLE t1, t2;
diff --git a/mysql-test/suite/storage_engine/delete_ignore.result b/mysql-test/suite/storage_engine/delete_ignore.result
index a15c338ea04..aedac761d99 100644
--- a/mysql-test/suite/storage_engine/delete_ignore.result
+++ b/mysql-test/suite/storage_engine/delete_ignore.result
@@ -4,7 +4,7 @@ INSERT INTO t1 (a,b) VALUES (10000,'foobar'),(1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,
 INSERT INTO t1 (a,b) SELECT a, b FROM t1;
 CREATE TABLE t2 (c <CHAR_COLUMN>, d <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t2 (c,d) SELECT b, a FROM t1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 1	a
@@ -18,7 +18,7 @@ a	b
 4	d
 5	e
 5	e
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 a	1
 a	1
@@ -33,7 +33,7 @@ e	5
 foobar	10000
 foobar	10000
 DELETE IGNORE FROM t1 WHERE b IS NOT NULL ORDER BY a LIMIT 1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 10000	foobar
@@ -49,10 +49,10 @@ a	b
 DELETE IGNORE t1.*, t2.* FROM t1, t2 WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 );
 Warnings:
 Warning	1242	Subquery returns more than 1 row
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 foobar	10000
 foobar	10000
diff --git a/mysql-test/suite/storage_engine/delete_ignore.test b/mysql-test/suite/storage_engine/delete_ignore.test
index fa98ec92029..c1b1926db45 100644
--- a/mysql-test/suite/storage_engine/delete_ignore.test
+++ b/mysql-test/suite/storage_engine/delete_ignore.test
@@ -18,9 +18,9 @@ INSERT INTO t1 (a,b) SELECT a, b FROM t1;
 --source create_table.inc
 INSERT INTO t2 (c,d) SELECT b, a FROM t1;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 --sorted_result
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 
 DELETE IGNORE FROM t1 WHERE b IS NOT NULL ORDER BY a LIMIT 1;
 if ($mysql_errname)
@@ -29,13 +29,13 @@ if ($mysql_errname)
   --source unexpected_result.inc
 }
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 DELETE IGNORE t1.*, t2.* FROM t1, t2 WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 );
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 --sorted_result
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 
 # Cleanup
 DROP TABLE t1, t2;
diff --git a/mysql-test/suite/storage_engine/delete_low_prio.result b/mysql-test/suite/storage_engine/delete_low_prio.result
index be334612a2b..89d08db5450 100644
--- a/mysql-test/suite/storage_engine/delete_low_prio.result
+++ b/mysql-test/suite/storage_engine/delete_low_prio.result
@@ -17,7 +17,7 @@ SLEEP(1)
 0
 0
 connection default;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
 connection con1;
@@ -34,7 +34,7 @@ SLEEP(1)
 0
 0
 connection default;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
 SET LOW_PRIORITY_UPDATES = 1;
@@ -52,7 +52,7 @@ SLEEP(1)
 0
 0
 connection default;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 disconnect con1;
 disconnect con2;
diff --git a/mysql-test/suite/storage_engine/delete_low_prio.test b/mysql-test/suite/storage_engine/delete_low_prio.test
index 34677df5373..f79a055dabe 100644
--- a/mysql-test/suite/storage_engine/delete_low_prio.test
+++ b/mysql-test/suite/storage_engine/delete_low_prio.test
@@ -73,7 +73,7 @@ if ($found)
 --connection default
 --reap
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
 
 
@@ -113,7 +113,7 @@ if ($found)
 --connection default
 --reap
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
 
 SET LOW_PRIORITY_UPDATES = 1;
@@ -148,7 +148,7 @@ if ($found)
 --connection default
 --reap
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 --disconnect con1
 --disconnect con2
diff --git a/mysql-test/suite/storage_engine/delete_quick.result b/mysql-test/suite/storage_engine/delete_quick.result
index 30d4841b51f..7166bcde96c 100644
--- a/mysql-test/suite/storage_engine/delete_quick.result
+++ b/mysql-test/suite/storage_engine/delete_quick.result
@@ -2,24 +2,24 @@ DROP TABLE IF EXISTS t1,t2;
 CREATE TABLE t1 (a <INT_COLUMN>, <CUSTOM_INDEX> (a), b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
 DELETE QUICK FROM t1 WHERE a = 1 OR b > 'foo';
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 2	b
 3	c
 4	d
 5	e
 CREATE TABLE t2 (c <CHAR_COLUMN>, d <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-INSERT INTO t2 SELECT b, a FROM t1;
-SELECT * FROM t2;
+INSERT INTO t2 (c,d) SELECT b, a FROM t1;
+SELECT c,d FROM t2;
 c	d
 b	2
 c	3
 d	4
 e	5
 DELETE QUICK FROM t2, t1.* USING t2, t1 WHERE c IS NULL OR a = d;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 DROP TABLE t2;
 DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/delete_quick.test b/mysql-test/suite/storage_engine/delete_quick.test
index 3b37096de4f..f96fedfd9c5 100644
--- a/mysql-test/suite/storage_engine/delete_quick.test
+++ b/mysql-test/suite/storage_engine/delete_quick.test
@@ -30,20 +30,20 @@ if (!$mysql_errname)
   if (!$mysql_errname)
   {
     --sorted_result
-    SELECT * FROM t1;
+    SELECT a,b FROM t1;
 
     --let $create_definition = c $char_col, d $int_col
     --let $table_name = t2
     --source create_table.inc
-    INSERT INTO t2 SELECT b, a FROM t1;
+    INSERT INTO t2 (c,d) SELECT b, a FROM t1;
     --sorted_result
-    SELECT * FROM t2;
+    SELECT c,d FROM t2;
 
     DELETE QUICK FROM t2, t1.* USING t2, t1 WHERE c IS NULL OR a = d;
     --sorted_result
-    SELECT * FROM t1;
+    SELECT a,b FROM t1;
     --sorted_result
-    SELECT * FROM t2;
+    SELECT c,d FROM t2;
     DROP TABLE t2;
   }
   DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/delete_with_keys.result b/mysql-test/suite/storage_engine/delete_with_keys.result
index 6622cc1fb64..e968451b2e2 100644
--- a/mysql-test/suite/storage_engine/delete_with_keys.result
+++ b/mysql-test/suite/storage_engine/delete_with_keys.result
@@ -3,7 +3,7 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (b)) ENGINE=<ST
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(6,'x'),(7,'y'),(8,'z');
 DELETE FROM t1 WHERE b > 'y';
 DELETE FROM t1 WHERE a=2;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 3	c
@@ -17,7 +17,7 @@ CREATE TABLE t1 (a <INT_COLUMN> PRIMARY KEY, b <CHAR_COLUMN>) ENGINE=<STORAGE_EN
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(6,'x'),(7,'y'),(8,'z');
 DELETE FROM t1 WHERE b > 'y';
 DELETE FROM t1 WHERE a=2;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 3	c
@@ -30,7 +30,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <INT_COLUMN>, <CUSTOM_INDEX>(a), <CUSTOM_INDEX>(b)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t1 (a,b,c) VALUES (1,2,3),(4,5,6),(7,8,9);
 DELETE FROM t1 WHERE a = 10 OR b = 20 ORDER BY c LIMIT 1;
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 1	2	3
 4	5	6
diff --git a/mysql-test/suite/storage_engine/delete_with_keys.test b/mysql-test/suite/storage_engine/delete_with_keys.test
index 274801b6d0e..cda0da0653f 100644
--- a/mysql-test/suite/storage_engine/delete_with_keys.test
+++ b/mysql-test/suite/storage_engine/delete_with_keys.test
@@ -29,7 +29,7 @@ if (!$mysql_errname)
     DELETE FROM t1 WHERE a=2;
 
     --sorted_result
-    SELECT * FROM t1;
+    SELECT a,b FROM t1;
     DELETE FROM t1;
   }
   DROP TABLE t1;
@@ -49,7 +49,7 @@ if (!$mysql_errname)
   DELETE FROM t1 WHERE a=2;
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DELETE FROM t1;
   DROP TABLE t1;
 }
@@ -66,7 +66,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a,b,c) VALUES (1,2,3),(4,5,6),(7,8,9);
   DELETE FROM t1 WHERE a = 10 OR b = 20 ORDER BY c LIMIT 1;
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b,c FROM t1;
   DROP TABLE t1;
 }
 
diff --git a/mysql-test/suite/storage_engine/foreign_keys.result b/mysql-test/suite/storage_engine/foreign_keys.result
index 5374e78d9b1..6c4a3406811 100644
--- a/mysql-test/suite/storage_engine/foreign_keys.result
+++ b/mysql-test/suite/storage_engine/foreign_keys.result
@@ -26,11 +26,11 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail
 DELETE FROM t1 WHERE a=2;
 ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`))
 DELETE FROM t2 WHERE a=2;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	c
 2	d
-SELECT * FROM t2;
+SELECT a,b FROM t2;
 a	b
 1	a
 DROP TABLE t1;
@@ -54,7 +54,7 @@ ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`
 INSERT INTO t1 (a,b) VALUES (3,'a'),(4,'a');
 INSERT INTO t2 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(4,'e'),(3,'a');
 UPDATE t1 SET a=a+1;
-SELECT * FROM t2;
+SELECT a,b FROM t2;
 a	b
 5	a
 5	a
@@ -63,7 +63,7 @@ a	b
 5	d
 5	e
 DELETE FROM t1 WHERE b='a' LIMIT 2;
-SELECT * FROM t2;
+SELECT a,b FROM t2;
 a	b
 TRUNCATE TABLE t1;
 ERROR 42000: Cannot truncate a table referenced in a foreign key constraint (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `test`.`t1` (`a`))
diff --git a/mysql-test/suite/storage_engine/foreign_keys.test b/mysql-test/suite/storage_engine/foreign_keys.test
index 643ca8bf6b1..cbadc4c950d 100644
--- a/mysql-test/suite/storage_engine/foreign_keys.test
+++ b/mysql-test/suite/storage_engine/foreign_keys.test
@@ -73,8 +73,9 @@ if (!$mysql_errname)
     DELETE FROM t2 WHERE a=2;
 
     --sorted_result
-    SELECT * FROM t1;
-    SELECT * FROM t2;
+    SELECT a,b FROM t1;
+    --sorted_result
+    SELECT a,b FROM t2;
 
     --let $error_codes = ER_ROW_IS_REFERENCED
     DROP TABLE t1;
@@ -119,7 +120,7 @@ if (!$mysql_errname)
       --source unexpected_result.inc
     }
     --sorted_result
-    SELECT * FROM t2;
+    SELECT a,b FROM t2;
 
     DELETE FROM t1 WHERE b='a' LIMIT 2;
     if ($mysql_errname)
@@ -128,7 +129,7 @@ if (!$mysql_errname)
       --source unexpected_result.inc
     }
     --sorted_result
-    SELECT * FROM t2;
+    SELECT a,b FROM t2;
 
     --let $error_codes = ER_TRUNCATE_ILLEGAL_FK
     TRUNCATE TABLE t1;
diff --git a/mysql-test/suite/storage_engine/insert.result b/mysql-test/suite/storage_engine/insert.result
index a07a6e8d9a4..2dfe20cb822 100644
--- a/mysql-test/suite/storage_engine/insert.result
+++ b/mysql-test/suite/storage_engine/insert.result
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t1 VALUES (100,'foobar'),(1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 100	foobar
@@ -10,7 +10,7 @@ a	b
 4	d
 5	e
 INSERT t1 VALUE (10,'foo'),(11,'abc');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 10	foo
@@ -21,7 +21,7 @@ a	b
 4	d
 5	e
 INSERT INTO t1 (b,a) VALUES ('test',0);
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	test
 1	a
@@ -33,7 +33,7 @@ a	b
 4	d
 5	e
 INSERT INTO t1 VALUES (DEFAULT,DEFAULT);
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	test
 1	a
@@ -46,7 +46,7 @@ a	b
 5	e
 NULL	NULL
 INSERT t1 (a) VALUE (10),(20);
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	test
 1	a
@@ -61,7 +61,7 @@ a	b
 5	e
 NULL	NULL
 INSERT INTO t1 SET a = 11, b = 'f';
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	test
 1	a
@@ -77,7 +77,7 @@ a	b
 5	e
 NULL	NULL
 INSERT t1 SET b = DEFAULT;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	test
 1	a
@@ -94,9 +94,9 @@ a	b
 NULL	NULL
 NULL	NULL
 CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-INSERT INTO t2 SELECT * FROM t1;
+INSERT INTO t2 SELECT a,b FROM t1;
 INSERT INTO t1 (a) SELECT a FROM t2 WHERE b = 'foo';
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	test
 1	a
@@ -113,8 +113,8 @@ a	b
 5	e
 NULL	NULL
 NULL	NULL
-INSERT t1 SELECT * FROM t1;
-SELECT * FROM t1;
+INSERT t1 (a,b) SELECT a,b FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	test
 0	test
diff --git a/mysql-test/suite/storage_engine/insert.test b/mysql-test/suite/storage_engine/insert.test
index d9076219eb0..1f780eba71f 100644
--- a/mysql-test/suite/storage_engine/insert.test
+++ b/mysql-test/suite/storage_engine/insert.test
@@ -22,40 +22,40 @@ if ($mysql_errname)
   --source unexpected_result.inc
 }
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 INSERT t1 VALUE (10,'foo'),(11,'abc');
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 INSERT INTO t1 (b,a) VALUES ('test',0);
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 INSERT INTO t1 VALUES (DEFAULT,DEFAULT);
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 INSERT t1 (a) VALUE (10),(20);
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 # INSERT [INTO] .. SET 
 
 INSERT INTO t1 SET a = 11, b = 'f';
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 INSERT t1 SET b = DEFAULT;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 
 # INSERT .. SELECT
 
 --let $table_name = t2
 --source create_table.inc
-INSERT INTO t2 SELECT * FROM t1;
+INSERT INTO t2 SELECT a,b FROM t1;
 if ($mysql_errname)
 {
   --let $functionality = INSERT .. SELECT
@@ -65,11 +65,11 @@ if ($mysql_errname)
 
 INSERT INTO t1 (a) SELECT a FROM t2 WHERE b = 'foo';
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
-INSERT t1 SELECT * FROM t1;
+INSERT t1 (a,b) SELECT a,b FROM t1;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 # Cleanup
 DROP TABLE t1, t2;
diff --git a/mysql-test/suite/storage_engine/insert_delayed.result b/mysql-test/suite/storage_engine/insert_delayed.result
index 98e149bdf96..528003d8923 100644
--- a/mysql-test/suite/storage_engine/insert_delayed.result
+++ b/mysql-test/suite/storage_engine/insert_delayed.result
@@ -6,17 +6,17 @@ connect  con0,localhost,root,,;
 SET lock_wait_timeout = 1;
 INSERT DELAYED INTO t1 (a,b) VALUES (3,'c');
 INSERT DELAYED INTO t1 SET a=4, b='d';
-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;
 connection default;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	f
 2	b
 UNLOCK TABLES;
 FLUSH TABLES;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	f
 2	b
diff --git a/mysql-test/suite/storage_engine/insert_delayed.test b/mysql-test/suite/storage_engine/insert_delayed.test
index 7c3c4eec768..ca8bf7eddbb 100644
--- a/mysql-test/suite/storage_engine/insert_delayed.test
+++ b/mysql-test/suite/storage_engine/insert_delayed.test
@@ -41,16 +41,16 @@ if (!$mysql_errname)
   INSERT DELAYED INTO t1 SET a=4, b='d';
   # DELAYED is ignored with INSERT .. SELECT
   --let $error_codes = ER_LOCK_WAIT_TIMEOUT
-  INSERT DELAYED INTO t1 SELECT 5, 'e';
+  INSERT DELAYED INTO t1 (a,b) SELECT 5, 'e';
   --source check_errors.inc
 
   --disconnect con0
   --connection default
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 }
 UNLOCK TABLES;
 FLUSH TABLES;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 # Cleanup
 DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/insert_high_prio.result b/mysql-test/suite/storage_engine/insert_high_prio.result
index 66378564ff7..4f5a3a443cd 100644
--- a/mysql-test/suite/storage_engine/insert_high_prio.result
+++ b/mysql-test/suite/storage_engine/insert_high_prio.result
@@ -26,7 +26,7 @@ SLEEP(1)
 0
 0
 connection con0;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	f
 2	b
@@ -50,7 +50,7 @@ SLEEP(1)
 0
 0
 connection con0;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	f
 2	b
diff --git a/mysql-test/suite/storage_engine/insert_high_prio.test b/mysql-test/suite/storage_engine/insert_high_prio.test
index 819e996d468..558e95a6cdf 100644
--- a/mysql-test/suite/storage_engine/insert_high_prio.test
+++ b/mysql-test/suite/storage_engine/insert_high_prio.test
@@ -80,7 +80,7 @@ if ($found)
 --connection con0
 --reap
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 DROP TABLE t1;
 
@@ -122,7 +122,7 @@ if ($found)
 --connection con0
 --reap
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 --disconnect con1
 --disconnect con2
diff --git a/mysql-test/suite/storage_engine/insert_low_prio.result b/mysql-test/suite/storage_engine/insert_low_prio.result
index 561b6296380..1a74a82ea23 100644
--- a/mysql-test/suite/storage_engine/insert_low_prio.result
+++ b/mysql-test/suite/storage_engine/insert_low_prio.result
@@ -25,7 +25,7 @@ SLEEP(1)
 0
 0
 connection con0;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	f
 2	b
diff --git a/mysql-test/suite/storage_engine/insert_low_prio.test b/mysql-test/suite/storage_engine/insert_low_prio.test
index 30f47833162..ed30d106016 100644
--- a/mysql-test/suite/storage_engine/insert_low_prio.test
+++ b/mysql-test/suite/storage_engine/insert_low_prio.test
@@ -76,7 +76,7 @@ if ($found)
 --connection con0
 --reap
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 --disconnect con0
 --disconnect con1
diff --git a/mysql-test/suite/storage_engine/insert_with_keys.result b/mysql-test/suite/storage_engine/insert_with_keys.result
index db7439c4dbf..39e42b306d2 100644
--- a/mysql-test/suite/storage_engine/insert_with_keys.result
+++ b/mysql-test/suite/storage_engine/insert_with_keys.result
@@ -5,7 +5,7 @@ INSERT INTO t1 (a,b) VALUES (100,'a'), (6,'f');
 INSERT INTO t1 (a,b) VALUES (30,'m'),(29,'n');
 INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
 INSERT INTO t1 (a,b) VALUES (3,'a'),(0,'');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	
 1	a
@@ -34,7 +34,7 @@ ERROR 23000: Duplicate entry '3' for key 'a'
 # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
 # If you got a difference in error message, just add it to rdiff file
 INSERT INTO t1 (a,b) VALUES (0,'');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	
 1	a
@@ -50,7 +50,7 @@ INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
 Warnings:
 Warning	1062	Duplicate entry '1' for key 'a'
 INSERT INTO t1 (a,b) VALUES (3,'a'),(4,'d') ON DUPLICATE KEY UPDATE a = a+10;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	
 1	a
@@ -73,7 +73,7 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
 ERROR 23000: Duplicate entry '1-a' for key 'a'
 # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
 # If you got a difference in error message, just add it to rdiff file
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 100	a
@@ -90,7 +90,7 @@ INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
 Warnings:
 Warning	1062	Duplicate entry '1-a' for key 'a'
 INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE a = a+VALUES(a);
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 100	a
 100	b
@@ -122,7 +122,7 @@ ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
 # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
 # If you got a difference in error message, just add it to rdiff file
 INSERT INTO t1 (a,b) VALUES (0,'');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	
 1	a
@@ -138,7 +138,7 @@ INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
 Warnings:
 Warning	1062	Duplicate entry '1' for key 'PRIMARY'
 INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE b = CONCAT(b,b);
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	
 1	aa
diff --git a/mysql-test/suite/storage_engine/insert_with_keys.test b/mysql-test/suite/storage_engine/insert_with_keys.test
index 1959b55c707..c44b6c712e0 100644
--- a/mysql-test/suite/storage_engine/insert_with_keys.test
+++ b/mysql-test/suite/storage_engine/insert_with_keys.test
@@ -24,7 +24,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
   INSERT INTO t1 (a,b) VALUES (3,'a'),(0,'');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   DROP TABLE t1;
 }
 
@@ -49,7 +49,7 @@ if (!$mysql_errname)
   --source check_errors.inc
   INSERT INTO t1 (a,b) VALUES (0,'');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
   if ($mysql_errname)
@@ -63,7 +63,7 @@ if (!$mysql_errname)
   }
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 }
@@ -86,12 +86,12 @@ if (!$mysql_errname)
   INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
   --source check_errors.inc
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
   INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE a = a+VALUES(a);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   --let $error_codes = ER_DUP_ENTRY,ER_DUP_KEY
   INSERT INTO t1 (a,b) VALUES (101,'x'),(101,'x');
@@ -120,7 +120,7 @@ if (!$mysql_errname)
   --source check_errors.inc
   INSERT INTO t1 (a,b) VALUES (0,'');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
   if ($mysql_errname)
@@ -134,7 +134,7 @@ if (!$mysql_errname)
     --source unexpected_result.inc
   }
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 }  
diff --git a/mysql-test/suite/storage_engine/loaddata.result b/mysql-test/suite/storage_engine/loaddata.result
index 85608cdc32a..2b25435fa7a 100644
--- a/mysql-test/suite/storage_engine/loaddata.result
+++ b/mysql-test/suite/storage_engine/loaddata.result
@@ -1,8 +1,8 @@
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 LOAD DATA INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1 
-FIELDS TERMINATED BY ',';
-SELECT * FROM t1;
+FIELDS TERMINATED BY ',' (a,b);
+SELECT a,b FROM t1;
 a	b
 1	foo
 2	bar
@@ -10,8 +10,8 @@ a	b
 4	abc
 LOAD DATA LOCAL INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
 CHARACTER SET utf8 COLUMNS TERMINATED BY ','
-    ESCAPED BY '/';
-SELECT * FROM t1;
+    ESCAPED BY '/' (a,b);
+SELECT a,b FROM t1;
 a	b
 1	foo
 1	foo
@@ -21,46 +21,66 @@ a	b
 3	
 4	abc
 4	abc
+LOAD DATA LOCAL INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
+FIELDS TERMINATED BY ';'
+    (a) SET b='loaded';
+Warnings:
+Warning	1262	Row 1 was truncated; it contained more data than there were input columns
+Warning	1262	Row 2 was truncated; it contained more data than there were input columns
+Warning	1262	Row 3 was truncated; it contained more data than there were input columns
+SELECT a,b FROM t1;
+a	b
+0	loaded
+1	foo
+1	foo
+102	loaded
+2	bar
+2	bar
+3	
+3	
+4	abc
+4	abc
+5	loaded
 LOAD DATA INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
 FIELDS TERMINATED BY ';'
     OPTIONALLY ENCLOSED BY ''''
     LINES STARTING BY 'prefix:' 
-IGNORE 2 LINES
-(a,b);
+IGNORE 2 LINES (a,b);
 Warnings:
 Warning	1262	Row 2 was truncated; it contained more data than there were input columns
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	
+0	loaded
 1	foo
 1	foo
 100	foo
+102	loaded
 2	bar
 2	bar
 3	
 3	
 4	abc
 4	abc
+5	loaded
 7	test
-LOAD DATA LOCAL INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1
-FIELDS TERMINATED BY ';'
-    (a) SET b='loaded';
-Warnings:
-Warning	1262	Row 1 was truncated; it contained more data than there were input columns
-Warning	1262	Row 2 was truncated; it contained more data than there were input columns
-Warning	1262	Row 3 was truncated; it contained more data than there were input columns
-SELECT * FROM t1;
+LOAD DATA INFILE '<DATADIR>/se_loaddata.dat' INTO TABLE t1;
+SELECT a,b FROM t1;
 a	b
 0	
 0	loaded
 1	foo
 1	foo
+1	foo
 100	foo
 102	loaded
 2	bar
 2	bar
+2	bar
 3	
 3	
+3	
+4	abc
 4	abc
 4	abc
 5	loaded
diff --git a/mysql-test/suite/storage_engine/loaddata.test b/mysql-test/suite/storage_engine/loaddata.test
index c413184af00..5a708626c74 100644
--- a/mysql-test/suite/storage_engine/loaddata.test
+++ b/mysql-test/suite/storage_engine/loaddata.test
@@ -22,23 +22,40 @@ EOF
 --replace_result $datadir <DATADIR>
 eval
 LOAD DATA INFILE '$datadir/se_loaddata.dat' INTO TABLE t1 
-  FIELDS TERMINATED BY ',';
+  FIELDS TERMINATED BY ',' (a,b);
 if ($mysql_errname)
 {
   --source unexpected_result.inc
+  --remove_file $datadir/se_loaddata.dat
 }
 if (!$mysql_errname)
 {
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   --replace_result $datadir <DATADIR>
   eval
   LOAD DATA LOCAL INFILE '$datadir/se_loaddata.dat' INTO TABLE t1
     CHARACTER SET utf8 COLUMNS TERMINATED BY ','
-    ESCAPED BY '/';
+    ESCAPED BY '/' (a,b);
+  --sorted_result
+  SELECT a,b FROM t1;
+
+  --remove_file $datadir/se_loaddata.dat
+  --write_file $datadir/se_loaddata.dat
+5;YYY;
+102;'zzz';
+0;'test';
+EOF
+
+  --replace_result $datadir <DATADIR>
+  eval
+  LOAD DATA LOCAL INFILE '$datadir/se_loaddata.dat' INTO TABLE t1
+    FIELDS TERMINATED BY ';'
+    (a) SET b='loaded';
+
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   --remove_file $datadir/se_loaddata.dat
   --write_file $datadir/se_loaddata.dat
@@ -57,31 +74,30 @@ EOF
     FIELDS TERMINATED BY ';'
     OPTIONALLY ENCLOSED BY ''''
     LINES STARTING BY 'prefix:' 
-    IGNORE 2 LINES
-    (a,b);
+    IGNORE 2 LINES (a,b);
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   --remove_file $datadir/se_loaddata.dat
   --write_file $datadir/se_loaddata.dat
-5;YYY;
-102;'zzz';
-0;'test';
+1	foo
+2	bar
+3	
+4	abc
 EOF
 
   --replace_result $datadir <DATADIR>
   eval
-  LOAD DATA LOCAL INFILE '$datadir/se_loaddata.dat' INTO TABLE t1
-    FIELDS TERMINATED BY ';'
-    (a) SET b='loaded';
-
+  LOAD DATA INFILE '$datadir/se_loaddata.dat' INTO TABLE t1;
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
+
+  --remove_file $datadir/se_loaddata.dat
+
 }
 
 # Cleanup
---remove_file $datadir/se_loaddata.dat
 DROP TABLE t1;
 
 --source cleanup_engine.inc
diff --git a/mysql-test/suite/storage_engine/lock.result b/mysql-test/suite/storage_engine/lock.result
index 73573381110..f20548da12b 100644
--- a/mysql-test/suite/storage_engine/lock.result
+++ b/mysql-test/suite/storage_engine/lock.result
@@ -12,7 +12,7 @@ id2	COUNT(DISTINCT id)
 3	1
 UPDATE t1 SET id=-1 WHERE id=1;
 connection con1;
-SELECT * FROM t1;
+SELECT id,id2 FROM t1;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 LOCK TABLE t1 READ;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
@@ -38,7 +38,7 @@ DROP TABLE IF EXISTS t2;
 UNLOCK TABLES;
 CREATE TABLE t2 (id <INT_COLUMN>, id2 <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 LOCK TABLE t1 WRITE, t2 WRITE;
-INSERT INTO t2 SELECT * FROM t1;
+INSERT INTO t2 (id,id2) SELECT id,id2 FROM t1;
 UPDATE t1 SET id=1 WHERE id=-1;
 DROP TABLE t1,t2;
 CREATE TABLE t1 (i1 <INT_COLUMN>, nr <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
@@ -105,7 +105,7 @@ LOCK TABLE t1 WRITE, t2 WRITE;
 CREATE TEMPORARY TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 FLUSH TABLE t1;
 DROP TEMPORARY TABLE t1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 UNLOCK TABLES;
 DROP TABLE t1, t2;
diff --git a/mysql-test/suite/storage_engine/lock.test b/mysql-test/suite/storage_engine/lock.test
index 16872bdaa7d..7335f8d1d39 100644
--- a/mysql-test/suite/storage_engine/lock.test
+++ b/mysql-test/suite/storage_engine/lock.test
@@ -43,7 +43,7 @@ connection con1;
 # With WRITE lock held by connection 'default',
 # nobody else can access the table
 --let $error_codes = ER_LOCK_WAIT_TIMEOUT
-SELECT * FROM t1;
+SELECT id,id2 FROM t1;
 --source check_errors.inc
 --let $error_codes = ER_LOCK_WAIT_TIMEOUT
 LOCK TABLE t1 READ;
@@ -94,7 +94,7 @@ UNLOCK TABLES;
 --let $create_definition = id $int_col, id2 $int_col
 --source create_table.inc
 LOCK TABLE t1 WRITE, t2 WRITE;
-INSERT INTO t2 SELECT * FROM t1;
+INSERT INTO t2 (id,id2) SELECT id,id2 FROM t1;
 UPDATE t1 SET id=1 WHERE id=-1;
 if ($mysql_errname)
 {
@@ -232,7 +232,7 @@ LOCK TABLE t1 WRITE, t2 WRITE;
 --source create_table.inc 
 FLUSH TABLE t1;
 DROP TEMPORARY TABLE t1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 UNLOCK TABLES;
 DROP TABLE t1, t2;
 
diff --git a/mysql-test/suite/storage_engine/parts/repair_table.result b/mysql-test/suite/storage_engine/parts/repair_table.result
index b156df6d7dc..8b08ee15fd0 100644
--- a/mysql-test/suite/storage_engine/parts/repair_table.result
+++ b/mysql-test/suite/storage_engine/parts/repair_table.result
@@ -10,7 +10,7 @@ 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
-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
@@ -22,7 +22,7 @@ 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
-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
@@ -76,7 +76,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	Error	Failed to read from the .par file
 test.t1	check	Error	Incorrect information in file: './test/t1.frm'
 test.t1	check	error	Corrupt
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 ERROR HY000: Failed to read from the .par file
 # Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). 
 # If you got a difference in error message, just add it to rdiff file
@@ -118,7 +118,7 @@ Table	Op	Msg_type	Msg_text
 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
@@ -142,7 +142,7 @@ test.t1	check	error	Record-count is not ok; is 3   Should be: 2
 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
@@ -166,7 +166,7 @@ Table	Op	Msg_type	Msg_text
 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
@@ -193,7 +193,7 @@ test.t1	check	error	Record-count is not ok; is 4   Should be: 3
 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
@@ -218,7 +218,7 @@ Restoring <DATADIR>/test/t1.par
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 8	h
 10	j
diff --git a/mysql-test/suite/storage_engine/parts/repair_table.test b/mysql-test/suite/storage_engine/parts/repair_table.test
index f77b2ef8de4..06be8de1f56 100644
--- a/mysql-test/suite/storage_engine/parts/repair_table.test
+++ b/mysql-test/suite/storage_engine/parts/repair_table.test
@@ -35,7 +35,7 @@ if (!$mysql_errname)
   let $alter_definition = REPAIR PARTITION p0;
   --source ../alter_table.inc
 
-  INSERT INTO t1 VALUES (3,'c');
+  INSERT INTO t1 (a,b) VALUES (3,'c');
 
   let $alter_definition = REPAIR PARTITION NO_WRITE_TO_BINLOG p0, p1;
   --source ../alter_table.inc
@@ -57,7 +57,7 @@ if (!$mysql_errname)
   let $alter_definition = REPAIR PARTITION LOCAL ALL EXTENDED;
   --source ../alter_table.inc
 
-  INSERT INTO t1 VALUES (10,'j');
+  INSERT INTO t1 (a,b) VALUES (10,'j');
 
   let $alter_definition = REPAIR PARTITION p1 QUICK USE_FRM;
   --source ../alter_table.inc
diff --git a/mysql-test/suite/storage_engine/parts/truncate_table.result b/mysql-test/suite/storage_engine/parts/truncate_table.result
index e46f4c97de5..e3b18d57989 100644
--- a/mysql-test/suite/storage_engine/parts/truncate_table.result
+++ b/mysql-test/suite/storage_engine/parts/truncate_table.result
@@ -3,7 +3,7 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTO
 TRUNCATE TABLE t1;
 INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c');
 TRUNCATE TABLE t1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN> KEY AUTO_INCREMENT, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
@@ -46,23 +46,23 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (a)
 PARTITIONS 2 */
-SELECT * FROM t1;
+SELECT a,c FROM t1;
 a	c
 1	d
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(2,'d'),(4,'e'),(100,'f'),(101,'g');
 ALTER TABLE t1 TRUNCATE PARTITION p0;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 101	g
 3	c
-EXPLAIN PARTITIONS SELECT * FROM t1;
+EXPLAIN PARTITIONS SELECT a,b FROM t1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0,p1	#	#	#	#	#	#	
 INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c');
 ALTER TABLE t1 TRUNCATE PARTITION ALL;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/parts/truncate_table.test b/mysql-test/suite/storage_engine/parts/truncate_table.test
index 20f316d5297..9d921f013f4 100644
--- a/mysql-test/suite/storage_engine/parts/truncate_table.test
+++ b/mysql-test/suite/storage_engine/parts/truncate_table.test
@@ -33,7 +33,7 @@ if (!$mysql_errname)
 
   INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c');
   TRUNCATE TABLE t1;
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 }
@@ -64,7 +64,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (c) VALUES ('d');
   --source ../mask_engine.inc
   SHOW CREATE TABLE t1;
-  SELECT * FROM t1;
+  SELECT a,c FROM t1;
   DROP TABLE t1;
 }
 
@@ -93,16 +93,16 @@ if (!$mysql_errname)
   }
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   --replace_column 5 # 6 # 7 # 8 # 9 # 10 #
-  EXPLAIN PARTITIONS SELECT * FROM t1;
+  EXPLAIN PARTITIONS SELECT a,b FROM t1;
 
   INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c');
 
   let $alter_definition = TRUNCATE PARTITION ALL;
   --source ../alter_table.inc
 
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 }
diff --git a/mysql-test/suite/storage_engine/repair_table.inc b/mysql-test/suite/storage_engine/repair_table.inc
index 83d2f02e20a..be3e5ba35c2 100644
--- a/mysql-test/suite/storage_engine/repair_table.inc
+++ b/mysql-test/suite/storage_engine/repair_table.inc
@@ -64,7 +64,7 @@ INSERT INTO t1 (a,b) VALUES (14,'n');
 --source check_errors.inc
 CHECK TABLE t1;
 --let $error_codes = 0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 --source check_errors.inc
 --enable_warnings
 REPAIR TABLE t1;
@@ -143,7 +143,7 @@ if ($have_default_index)
   EOF
       CHECK TABLE t1;
       --let $error_codes = 0,ER_NOT_KEYFILE,144
-      SELECT * FROM t1;
+      SELECT a,b FROM t1;
       --source check_errors.inc
     }
   }
diff --git a/mysql-test/suite/storage_engine/repair_table.result b/mysql-test/suite/storage_engine/repair_table.result
index f1af943fd7b..a20b9be3ba1 100644
--- a/mysql-test/suite/storage_engine/repair_table.result
+++ b/mysql-test/suite/storage_engine/repair_table.result
@@ -46,7 +46,7 @@ CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	Error	Incorrect file format 't1'
 test.t1	check	error	Corrupt
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 ERROR HY000: Incorrect file format 't1'
 # Statement ended with one of expected results (0,130,ER_FAILED_READ_FROM_PAR_FILE,ER_OPEN_AS_READONLY). 
 # If you got a difference in error message, just add it to rdiff file
@@ -84,7 +84,7 @@ CHECK TABLE t1;
 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
@@ -99,7 +99,7 @@ Table	Op	Msg_type	Msg_text
 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/mysql-test/suite/storage_engine/replace.result b/mysql-test/suite/storage_engine/replace.result
index c8fbca8f534..85988c740b2 100644
--- a/mysql-test/suite/storage_engine/replace.result
+++ b/mysql-test/suite/storage_engine/replace.result
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 REPLACE INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	b
@@ -9,7 +9,7 @@ a	b
 4	d
 5	e
 REPLACE t1 (a,b) VALUE (10,'foo'),(10,'foo');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 10	foo
@@ -26,7 +26,7 @@ ERROR 23000: Duplicate entry '2' for key 'a'
 # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
 # If you got a difference in error message, just add it to rdiff file
 REPLACE INTO t1 (a,b) VALUES (2,'d');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	d
@@ -39,7 +39,7 @@ ERROR 23000: Duplicate entry 'b' for key 'PRIMARY'
 # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
 # If you got a difference in error message, just add it to rdiff file
 REPLACE INTO t1 (a,b) VALUES (4,'b');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 3	c
diff --git a/mysql-test/suite/storage_engine/replace.test b/mysql-test/suite/storage_engine/replace.test
index 368ed62a300..0a00734abec 100644
--- a/mysql-test/suite/storage_engine/replace.test
+++ b/mysql-test/suite/storage_engine/replace.test
@@ -13,11 +13,11 @@ DROP TABLE IF EXISTS t1;
 
 REPLACE INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 REPLACE t1 (a,b) VALUE (10,'foo'),(10,'foo');
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 DROP TABLE t1;
 
@@ -37,7 +37,7 @@ if (!$mysql_errname)
   --source check_errors.inc
   REPLACE INTO t1 (a,b) VALUES (2,'d');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 }
@@ -58,7 +58,7 @@ if (!$mysql_errname)
   --source check_errors.inc
   REPLACE INTO t1 (a,b) VALUES (4,'b');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 }
diff --git a/mysql-test/suite/storage_engine/select.result b/mysql-test/suite/storage_engine/select.result
index d2331f4d869..015ed80b771 100644
--- a/mysql-test/suite/storage_engine/select.result
+++ b/mysql-test/suite/storage_engine/select.result
@@ -144,7 +144,7 @@ a	b	a	b
 200	bar	200	bar
 200	bar	200	bar
 200	bar	200	bar
-SELECT alias1.* FROM ( SELECT * FROM t1 ) alias1, t2 WHERE t2.a IN (100,200);
+SELECT alias1.* FROM ( SELECT a,b FROM t1 ) alias1, t2 WHERE t2.a IN (100,200);
 a	b
 1	z
 1	z
@@ -233,7 +233,7 @@ SUM(t2.a)
 SELECT MIN(t2.a) FROM t1 RIGHT OUTER JOIN t2 USING (b,a);
 MIN(t2.a)
 1
-SELECT alias.b FROM t1 NATURAL JOIN ( SELECT * FROM t1 ) alias WHERE b > '';
+SELECT alias.b FROM t1 NATURAL JOIN ( SELECT a,b FROM t1 ) alias WHERE b > '';
 b
 bar
 bar
@@ -247,7 +247,7 @@ z
 z
 z
 z
-SELECT t2.b FROM ( SELECT * FROM t1 ) alias NATURAL LEFT JOIN t2 WHERE b IS NOT NULL;
+SELECT t2.b FROM ( SELECT a,b FROM t1 ) alias NATURAL LEFT JOIN t2 WHERE b IS NOT NULL;
 b
 bar
 bar
@@ -306,15 +306,15 @@ z
 z
 z
 z
-SELECT ( SELECT MIN(a) FROM ( SELECT * FROM t1 ) alias1 ) AS min_a FROM t2;
+SELECT ( SELECT MIN(a) FROM ( SELECT a,b FROM t1 ) alias1 ) AS min_a FROM t2;
 min_a
 1
 1
 1
-SELECT * FROM t2 WHERE a = ( SELECT MIN(a) FROM t1 );
+SELECT a,b FROM t2 WHERE a = ( SELECT MIN(a) FROM t1 );
 a	b
 1	z
-SELECT * FROM t2 WHERE b LIKE ( SELECT b FROM t1 ORDER BY b LIMIT 1 );
+SELECT a,b FROM t2 WHERE b LIKE ( SELECT b FROM t1 ORDER BY b LIMIT 1 );
 a	b
 200	bar
 SELECT t2.* FROM t1 t1_outer, t2 WHERE ( t1_outer.a, t2.b ) IN ( SELECT a, b FROM t2 WHERE a = t1_outer.a );
@@ -325,19 +325,19 @@ a	b
 100	foobar
 200	bar
 200	bar
-SELECT * FROM t2 WHERE b = ANY ( SELECT b FROM t1 WHERE a > 1 );
+SELECT a,b FROM t2 WHERE b = ANY ( SELECT b FROM t1 WHERE a > 1 );
 a	b
 100	foobar
 200	bar
-SELECT * FROM t2 WHERE b > ALL ( SELECT b FROM t1 WHERE b < 'foo' );
+SELECT a,b FROM t2 WHERE b > ALL ( SELECT b FROM t1 WHERE b < 'foo' );
 a	b
 1	z
 100	foobar
-SELECT * FROM t1 WHERE ROW(a, b) = ( SELECT a, b FROM t2 ORDER BY a, b LIMIT 1 );
+SELECT a,b FROM t1 WHERE ROW(a, b) = ( SELECT a, b FROM t2 ORDER BY a, b LIMIT 1 );
 a	b
 1	z
 1	z
-SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2 WHERE t2.b > t1.b );
+SELECT a,b FROM t1 WHERE EXISTS ( SELECT a,b FROM t2 WHERE t2.b > t1.b );
 a	b
 100	foobar
 100	foobar
@@ -371,12 +371,12 @@ a	b
 100	foobar
 200	bar
 200	bar
-SELECT * FROM t1 UNION SELECT * FROM t2 UNION DISTINCT SELECT * FROM t1;
+SELECT a,b FROM t1 UNION SELECT a,b FROM t2 UNION DISTINCT SELECT a,b FROM t1;
 a	b
 1	z
 100	foobar
 200	bar
-SELECT * FROM t1 UNION SELECT * FROM t2 UNION ALL SELECT * FROM t1;
+SELECT a,b FROM t1 UNION SELECT a,b FROM t2 UNION ALL SELECT a,b FROM t1;
 a	b
 1	z
 1	z
diff --git a/mysql-test/suite/storage_engine/select.test b/mysql-test/suite/storage_engine/select.test
index 528fa64cfb2..34cfd99d344 100644
--- a/mysql-test/suite/storage_engine/select.test
+++ b/mysql-test/suite/storage_engine/select.test
@@ -108,7 +108,7 @@ SELECT t1_1.*, t2.* FROM t2, t1 AS t1_1, t1 AS t1_2
   WHERE t1_1.a = t1_2.a AND t2.a = t1_1.a;
 
 --sorted_result
-SELECT alias1.* FROM ( SELECT * FROM t1 ) alias1, t2 WHERE t2.a IN (100,200);
+SELECT alias1.* FROM ( SELECT a,b FROM t1 ) alias1, t2 WHERE t2.a IN (100,200);
 
 --sorted_result
 SELECT t1.a FROM { OJ t1 LEFT OUTER JOIN t2 ON t1.a = t2.a+10 };
@@ -134,10 +134,10 @@ SELECT SUM(t2.a) FROM t1 RIGHT JOIN t2 ON t2.b = t1.b;
 SELECT MIN(t2.a) FROM t1 RIGHT OUTER JOIN t2 USING (b,a);
 
 --sorted_result
-SELECT alias.b FROM t1 NATURAL JOIN ( SELECT * FROM t1 ) alias WHERE b > '';
+SELECT alias.b FROM t1 NATURAL JOIN ( SELECT a,b FROM t1 ) alias WHERE b > '';
 
 --sorted_result
-SELECT t2.b FROM ( SELECT * FROM t1 ) alias NATURAL LEFT JOIN t2 WHERE b IS NOT NULL;
+SELECT t2.b FROM ( SELECT a,b FROM t1 ) alias NATURAL LEFT JOIN t2 WHERE b IS NOT NULL;
 
 --sorted_result
 SELECT t1.*, t2.* FROM t1 NATURAL LEFT OUTER JOIN t2;
@@ -151,15 +151,15 @@ SELECT t1_2.b FROM t1 t1_1 NATURAL RIGHT OUTER JOIN t1 t1_2 INNER JOIN t2;
 # Subquery as scalar operand, subquery in the FROM clause
 
 --sorted_result
-SELECT ( SELECT MIN(a) FROM ( SELECT * FROM t1 ) alias1 ) AS min_a FROM t2;
+SELECT ( SELECT MIN(a) FROM ( SELECT a,b FROM t1 ) alias1 ) AS min_a FROM t2;
 
 # Comparison using subqueries
 
 --sorted_result
-SELECT * FROM t2 WHERE a = ( SELECT MIN(a) FROM t1 );
+SELECT a,b FROM t2 WHERE a = ( SELECT MIN(a) FROM t1 );
 
 --sorted_result
-SELECT * FROM t2 WHERE b LIKE ( SELECT b FROM t1 ORDER BY b LIMIT 1 );
+SELECT a,b FROM t2 WHERE b LIKE ( SELECT b FROM t1 ORDER BY b LIMIT 1 );
 
 # Subquery with IN, correlated subquery
 
@@ -169,20 +169,20 @@ SELECT t2.* FROM t1 t1_outer, t2 WHERE ( t1_outer.a, t2.b ) IN ( SELECT a, b FRO
 # Subquery with ANY, ALL
 
 --sorted_result
-SELECT * FROM t2 WHERE b = ANY ( SELECT b FROM t1 WHERE a > 1 );
+SELECT a,b FROM t2 WHERE b = ANY ( SELECT b FROM t1 WHERE a > 1 );
 
 --sorted_result
-SELECT * FROM t2 WHERE b > ALL ( SELECT b FROM t1 WHERE b < 'foo' );
+SELECT a,b FROM t2 WHERE b > ALL ( SELECT b FROM t1 WHERE b < 'foo' );
 
 # Row subqueries
 
 --sorted_result
-SELECT * FROM t1 WHERE ROW(a, b) = ( SELECT a, b FROM t2 ORDER BY a, b LIMIT 1 );
+SELECT a,b FROM t1 WHERE ROW(a, b) = ( SELECT a, b FROM t2 ORDER BY a, b LIMIT 1 );
 
 # Subquery with EXISTS
 
 --sorted_result
-SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2 WHERE t2.b > t1.b );
+SELECT a,b FROM t1 WHERE EXISTS ( SELECT a,b FROM t2 WHERE t2.b > t1.b );
 
 # Subquery in ORDER BY
 
@@ -197,10 +197,10 @@ SELECT a, b FROM t1 HAVING a IN ( SELECT a FROM t2 WHERE b = t1.b );
 # Union
 
 --sorted_result
-SELECT * FROM t1 UNION SELECT * FROM t2 UNION DISTINCT SELECT * FROM t1;
+SELECT a,b FROM t1 UNION SELECT a,b FROM t2 UNION DISTINCT SELECT a,b FROM t1;
 
 --sorted_result
-SELECT * FROM t1 UNION SELECT * FROM t2 UNION ALL SELECT * FROM t1;
+SELECT a,b FROM t1 UNION SELECT a,b FROM t2 UNION ALL SELECT a,b FROM t1;
 
 
 # Cleanup
diff --git a/mysql-test/suite/storage_engine/select_high_prio.result b/mysql-test/suite/storage_engine/select_high_prio.result
index b3b70df3731..10226ae0f39 100644
--- a/mysql-test/suite/storage_engine/select_high_prio.result
+++ b/mysql-test/suite/storage_engine/select_high_prio.result
@@ -12,7 +12,7 @@ LOCK TABLE t1 READ;
 connection con0;
 UPDATE t1 SET b = CONCAT(b,b);
 connection con2;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 connection con1;
 UNLOCK TABLES;
 connection con0;
diff --git a/mysql-test/suite/storage_engine/select_high_prio.test b/mysql-test/suite/storage_engine/select_high_prio.test
index 385752e8d4e..49cd91ebbfd 100644
--- a/mysql-test/suite/storage_engine/select_high_prio.test
+++ b/mysql-test/suite/storage_engine/select_high_prio.test
@@ -49,12 +49,12 @@ let $condition = LIKE 'Waiting for table%';
 let $wait_timeout = 2;
 --source include/wait_show_condition.inc
 --send
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 --connection con1
 let $show_statement = SHOW PROCESSLIST;
 let $field = Info;
-let $condition = = 'SELECT * FROM t1';
+let $condition = = 'SELECT a,b FROM t1';
 let $wait_timeout = 2;
 --source include/wait_show_condition.inc
 if (!$found)
diff --git a/mysql-test/suite/storage_engine/truncate_table.result b/mysql-test/suite/storage_engine/truncate_table.result
index 0a774c4b8dd..d8dc5046442 100644
--- a/mysql-test/suite/storage_engine/truncate_table.result
+++ b/mysql-test/suite/storage_engine/truncate_table.result
@@ -3,7 +3,7 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTO
 TRUNCATE TABLE t1;
 INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c');
 TRUNCATE TABLE t1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN> KEY AUTO_INCREMENT, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
@@ -22,7 +22,7 @@ INSERT INTO t1 (c) VALUES ('d');
 SHOW TABLE STATUS LIKE 't1';
 Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
 t1	#	#	#	#	#	#	#	#	#	2	#	#	#	#	#	#	#
-SELECT * FROM t1;
+SELECT a,c FROM t1;
 a	c
 1	d
 DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/truncate_table.test b/mysql-test/suite/storage_engine/truncate_table.test
index c84fba143b7..a9277b39619 100644
--- a/mysql-test/suite/storage_engine/truncate_table.test
+++ b/mysql-test/suite/storage_engine/truncate_table.test
@@ -19,7 +19,7 @@ if (!$mysql_errname)
 {
   INSERT INTO t1 (a,b) VALUES (1,'a'), (2,'b'), (3,'c');
   TRUNCATE TABLE t1;
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 }
 DROP TABLE t1;
 
@@ -51,7 +51,7 @@ if (!$mysql_errname)
   --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
   SHOW TABLE STATUS LIKE 't1';
 
-  SELECT * FROM t1;
+  SELECT a,c FROM t1;
   DROP TABLE t1;
 }
 
diff --git a/mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result b/mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result
index a52f18fc623..3b0bdb3b560 100644
--- a/mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result
+++ b/mysql-test/suite/storage_engine/trx/cons_snapshot_repeatable_read.result
@@ -9,7 +9,7 @@ connection con2;
 INSERT INTO t1 (a) VALUES (1);
 connection con1;
 # If consistent read works on this isolation level (REPEATABLE READ), the following SELECT should not return the value we inserted (1)
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 COMMIT;
 connection default;
diff --git a/mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result b/mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result
index 8d75ea075a2..691039e8d96 100644
--- a/mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result
+++ b/mysql-test/suite/storage_engine/trx/cons_snapshot_serializable.result
@@ -9,7 +9,7 @@ connection con2;
 INSERT INTO t1 (a) VALUES (1);
 connection con1;
 # If consistent read works on this isolation level (SERIALIZABLE), the following SELECT should not return the value we inserted (1)
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 COMMIT;
 connection default;
diff --git a/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc b/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc
index 8dc9d6c4bb1..7f0dfe04214 100644
--- a/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc
+++ b/mysql-test/suite/storage_engine/trx/consistent_snapshot.inc
@@ -38,7 +38,7 @@ if ($mysql_errname)
 
 connection con1;
 --echo # If consistent read works on this isolation level ($trx_isolation), the following SELECT should not return the value we inserted (1)
-SELECT * FROM t1; 
+SELECT a FROM t1; 
 COMMIT;
 
 connection default;
diff --git a/mysql-test/suite/storage_engine/trx/delete.result b/mysql-test/suite/storage_engine/trx/delete.result
index 827877a7e30..14e5389dcfb 100644
--- a/mysql-test/suite/storage_engine/trx/delete.result
+++ b/mysql-test/suite/storage_engine/trx/delete.result
@@ -4,7 +4,7 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(6,'f'),(7,'
 INSERT INTO t1 (a,b) SELECT a, b FROM t1;
 BEGIN;
 DELETE FROM t1 WHERE b IN ('c');
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 1	a
@@ -24,7 +24,7 @@ a	b
 8	h
 DELETE FROM t1 WHERE a < 0 OR b = 'a';
 COMMIT;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 10000	foobar
 10000	foobar
@@ -46,7 +46,7 @@ SAVEPOINT spt1;
 DELETE FROM t1;
 RELEASE SAVEPOINT spt1;
 ROLLBACK;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 10000	foobar
 10000	foobar
diff --git a/mysql-test/suite/storage_engine/trx/delete.test b/mysql-test/suite/storage_engine/trx/delete.test
index 0898eebb49a..50da1f20153 100644
--- a/mysql-test/suite/storage_engine/trx/delete.test
+++ b/mysql-test/suite/storage_engine/trx/delete.test
@@ -22,11 +22,11 @@ if ($mysql_errname)
   --source ../unexpected_result.inc
 }
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 DELETE FROM t1 WHERE a < 0 OR b = 'a';
 COMMIT;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 BEGIN;
 DELETE FROM t1 WHERE a <= 4 ORDER BY b DESC LIMIT 1;
@@ -35,7 +35,7 @@ DELETE FROM t1;
 RELEASE SAVEPOINT spt1;
 ROLLBACK;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 BEGIN;
 DELETE FROM t1 WHERE a <= 4 ORDER BY b DESC LIMIT 1;
diff --git a/mysql-test/suite/storage_engine/trx/insert.result b/mysql-test/suite/storage_engine/trx/insert.result
index 986d63b2a07..1d8aca98687 100644
--- a/mysql-test/suite/storage_engine/trx/insert.result
+++ b/mysql-test/suite/storage_engine/trx/insert.result
@@ -4,7 +4,7 @@ BEGIN;
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(100,'foo');
 INSERT t1 (a,b) VALUE (10,'foo'),(11,'abc');
 COMMIT;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 10	foo
@@ -21,7 +21,7 @@ INSERT INTO t1 (a,b) VALUES (DEFAULT,DEFAULT);
 RELEASE SAVEPOINT spt1;
 INSERT INTO t1 (a,b) VALUES (DEFAULT,DEFAULT);
 ROLLBACK;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 10	foo
@@ -39,7 +39,7 @@ INSERT t1 SET b = DEFAULT;
 ROLLBACK TO SAVEPOINT spt1;
 INSERT INTO t1 (b,a) VALUES ('test1',10);
 COMMIT;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 10	NULL
diff --git a/mysql-test/suite/storage_engine/trx/insert.test b/mysql-test/suite/storage_engine/trx/insert.test
index c458f90b1bb..1a736584b03 100644
--- a/mysql-test/suite/storage_engine/trx/insert.test
+++ b/mysql-test/suite/storage_engine/trx/insert.test
@@ -15,7 +15,7 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(100,'foo');
 INSERT t1 (a,b) VALUE (10,'foo'),(11,'abc');
 COMMIT;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 BEGIN;
 INSERT INTO t1 (b,a) VALUES ('test',0);
@@ -25,7 +25,7 @@ RELEASE SAVEPOINT spt1;
 INSERT INTO t1 (a,b) VALUES (DEFAULT,DEFAULT);
 ROLLBACK;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 BEGIN;
 INSERT t1 (a) VALUE (10),(20);
@@ -36,7 +36,7 @@ ROLLBACK TO SAVEPOINT spt1;
 INSERT INTO t1 (b,a) VALUES ('test1',10);
 COMMIT;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/storage_engine/trx/level_read_committed.result b/mysql-test/suite/storage_engine/trx/level_read_committed.result
index 12c0c2f42a8..ce1b126dc1a 100644
--- a/mysql-test/suite/storage_engine/trx/level_read_committed.result
+++ b/mysql-test/suite/storage_engine/trx/level_read_committed.result
@@ -6,7 +6,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 connection con1;
 CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 START TRANSACTION;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 BEGIN;
@@ -14,53 +14,53 @@ INSERT INTO t1 (a) VALUES(1);
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 INSERT INTO t1 (a) VALUES (2);
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 INSERT INTO t1 (a) SELECT a+100 FROM t1;
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 COMMIT;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 INSERT INTO t1 (a) SELECT a+200 FROM t1;
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 201
 202
 COMMIT;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 201
 202
 connection con2;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
@@ -81,7 +81,7 @@ connection con2;
 INSERT INTO t1 (a) VALUES (1);
 connection con1;
 # If consistent read works on this isolation level (READ COMMITTED), the following SELECT should not return the value we inserted (1)
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 COMMIT;
diff --git a/mysql-test/suite/storage_engine/trx/level_read_uncommitted.result b/mysql-test/suite/storage_engine/trx/level_read_uncommitted.result
index 2bf93768b00..68fbe5632cb 100644
--- a/mysql-test/suite/storage_engine/trx/level_read_uncommitted.result
+++ b/mysql-test/suite/storage_engine/trx/level_read_uncommitted.result
@@ -6,7 +6,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 connection con1;
 CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 START TRANSACTION;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 BEGIN;
@@ -14,7 +14,7 @@ INSERT INTO t1 (a) VALUES(1);
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 connection con2;
@@ -22,35 +22,35 @@ INSERT INTO t1 (a) VALUES (2);
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 INSERT INTO t1 (a) SELECT a+100 FROM t1;
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 101
 102
 2
 connection con2;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 101
 102
 2
 COMMIT;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 101
 102
 2
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 101
@@ -59,7 +59,7 @@ a
 INSERT INTO t1 (a) SELECT a+200 FROM t1;
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 101
@@ -70,7 +70,7 @@ a
 301
 302
 COMMIT;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 101
@@ -81,7 +81,7 @@ a
 301
 302
 connection con2;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 101
@@ -106,7 +106,7 @@ connection con2;
 INSERT INTO t1 (a) VALUES (1);
 connection con1;
 # If consistent read works on this isolation level (READ UNCOMMITTED), the following SELECT should not return the value we inserted (1)
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 COMMIT;
diff --git a/mysql-test/suite/storage_engine/trx/level_repeatable_read.result b/mysql-test/suite/storage_engine/trx/level_repeatable_read.result
index 82324c16801..c828b18dba0 100644
--- a/mysql-test/suite/storage_engine/trx/level_repeatable_read.result
+++ b/mysql-test/suite/storage_engine/trx/level_repeatable_read.result
@@ -6,7 +6,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
 connection con1;
 CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 START TRANSACTION;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 BEGIN;
@@ -14,50 +14,50 @@ INSERT INTO t1 (a) VALUES(1);
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 INSERT INTO t1 (a) VALUES (2);
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 INSERT INTO t1 (a) SELECT a+100 FROM t1;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. 
 #          If it differs from the result file, it might indicate a problem.
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 COMMIT;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 INSERT INTO t1 (a) SELECT a+200 FROM t1;
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 201
 202
 COMMIT;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 201
 202
 connection con2;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
diff --git a/mysql-test/suite/storage_engine/trx/level_serializable.result b/mysql-test/suite/storage_engine/trx/level_serializable.result
index 0f990dfbf77..3f57395fa37 100644
--- a/mysql-test/suite/storage_engine/trx/level_serializable.result
+++ b/mysql-test/suite/storage_engine/trx/level_serializable.result
@@ -6,7 +6,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 connection con1;
 CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 START TRANSACTION;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 BEGIN;
@@ -15,7 +15,7 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. 
 #          If it differs from the result file, it might indicate a problem.
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 INSERT INTO t1 (a) VALUES (2);
@@ -23,32 +23,32 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. 
 #          If it differs from the result file, it might indicate a problem.
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 INSERT INTO t1 (a) SELECT a+100 FROM t1;
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 COMMIT;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 INSERT INTO t1 (a) SELECT a+200 FROM t1;
 # WARNING: Statement ended with errno 0, errname ''. 
 #          If it differs from the result file, it might indicate a problem.
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 COMMIT;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection default;
 disconnect con1;
diff --git a/mysql-test/suite/storage_engine/trx/select_for_update.result b/mysql-test/suite/storage_engine/trx/select_for_update.result
index 8b0de87de05..f5954489d91 100644
--- a/mysql-test/suite/storage_engine/trx/select_for_update.result
+++ b/mysql-test/suite/storage_engine/trx/select_for_update.result
@@ -3,23 +3,23 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTO
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'a');
 connect  con1,localhost,root,,;
 BEGIN;
-SELECT * FROM t1 WHERE b='a' FOR UPDATE;
+SELECT a,b FROM t1 WHERE b='a' FOR UPDATE;
 a	b
 1	a
 3	a
 connection default;
 SET lock_wait_timeout = 1;
-SELECT * FROM t1 WHERE b='a';
+SELECT a,b FROM t1 WHERE b='a';
 a	b
 1	a
 3	a
-SELECT * FROM t1 WHERE b='a' LOCK IN SHARE MODE;
+SELECT a,b FROM t1 WHERE b='a' LOCK IN SHARE MODE;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 UPDATE t1 SET b='c' WHERE b='a';
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 connection con1;
 COMMIT;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	b
@@ -27,7 +27,7 @@ a	b
 disconnect con1;
 connection default;
 UPDATE t1 SET b='c' WHERE b='a';
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	c
 2	b
diff --git a/mysql-test/suite/storage_engine/trx/select_for_update.test b/mysql-test/suite/storage_engine/trx/select_for_update.test
index 93ccc1915df..2a7dee2d3f4 100644
--- a/mysql-test/suite/storage_engine/trx/select_for_update.test
+++ b/mysql-test/suite/storage_engine/trx/select_for_update.test
@@ -22,7 +22,7 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'a');
 --connect (con1,localhost,root,,)
 BEGIN;
 --sorted_result
-SELECT * FROM t1 WHERE b='a' FOR UPDATE;
+SELECT a,b FROM t1 WHERE b='a' FOR UPDATE;
 if ($mysql_errname)
 {
   --let $functionality = SELECT .. FOR UPDATE
@@ -35,7 +35,7 @@ SET lock_wait_timeout = 1;
 # Should still be able to select 
 
 --sorted_result
-SELECT * FROM t1 WHERE b='a';
+SELECT a,b FROM t1 WHERE b='a';
 if ($mysql_errname)
 {
   --let $functionality = SELECT .. FOR UPDATE or locking
@@ -46,7 +46,7 @@ if ($mysql_errname)
 
 --sorted_result
 --let $error_codes = ER_LOCK_WAIT_TIMEOUT
-SELECT * FROM t1 WHERE b='a' LOCK IN SHARE MODE;
+SELECT a,b FROM t1 WHERE b='a' LOCK IN SHARE MODE;
 --source ../check_errors.inc
 if ($mysql_errname != ER_LOCK_WAIT_TIMEOUT)
 {
@@ -66,7 +66,7 @@ if ($mysql_errname != ER_LOCK_WAIT_TIMEOUT)
 --connection con1
 COMMIT;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 --disconnect con1
 --connection default
@@ -78,7 +78,7 @@ if ($mysql_errname)
   --source ../unexpected_result.inc
 }
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.result b/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.result
index 00610a03bd8..3d668d721ae 100644
--- a/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.result
+++ b/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.result
@@ -3,17 +3,17 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTO
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'a');
 connect  con1,localhost,root,,;
 BEGIN;
-SELECT * FROM t1 WHERE b='a' LOCK IN SHARE MODE;
+SELECT a,b FROM t1 WHERE b='a' LOCK IN SHARE MODE;
 a	b
 1	a
 3	a
 connection default;
 SET lock_wait_timeout = 1;
-SELECT * FROM t1 WHERE b='a';
+SELECT a,b FROM t1 WHERE b='a';
 a	b
 1	a
 3	a
-SELECT * FROM t1 WHERE b='a' LOCK IN SHARE MODE;
+SELECT a,b FROM t1 WHERE b='a' LOCK IN SHARE MODE;
 a	b
 1	a
 3	a
@@ -21,7 +21,7 @@ UPDATE t1 SET b='c' WHERE b='a';
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 connection con1;
 COMMIT;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 2	b
@@ -29,7 +29,7 @@ a	b
 disconnect con1;
 connection default;
 UPDATE t1 SET b='c' WHERE b='a';
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	c
 2	b
diff --git a/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test b/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test
index a50c86403e9..4c03b44640b 100644
--- a/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test
+++ b/mysql-test/suite/storage_engine/trx/select_lock_in_share_mode.test
@@ -22,7 +22,7 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'a');
 --connect (con1,localhost,root,,)
 BEGIN;
 --sorted_result
-SELECT * FROM t1 WHERE b='a' LOCK IN SHARE MODE;
+SELECT a,b FROM t1 WHERE b='a' LOCK IN SHARE MODE;
 if ($mysql_errname)
 {
   --let $functionality = LOCK IN SHARE MODE
@@ -35,14 +35,14 @@ SET lock_wait_timeout = 1;
 # Should still be able to select 
 
 --sorted_result
-SELECT * FROM t1 WHERE b='a';
+SELECT a,b FROM t1 WHERE b='a';
 if ($mysql_errname)
 {
   --let $functionality = LOCK IN SHARE MODE
   --source ../unexpected_result.inc
 }
 --sorted_result
-SELECT * FROM t1 WHERE b='a' LOCK IN SHARE MODE;
+SELECT a,b FROM t1 WHERE b='a' LOCK IN SHARE MODE;
 if ($mysql_errname)
 {
   --let $functionality = LOCK IN SHARE MODE
@@ -61,7 +61,7 @@ if ($mysql_errname != ER_LOCK_WAIT_TIMEOUT)
 --connection con1
 COMMIT;
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 --disconnect con1
 --connection default
@@ -73,7 +73,7 @@ if ($mysql_errname)
   --source ../unexpected_result.inc
 }
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/storage_engine/trx/transaction_isolation.inc b/mysql-test/suite/storage_engine/trx/transaction_isolation.inc
index c81071d99b6..9e07ff1b857 100644
--- a/mysql-test/suite/storage_engine/trx/transaction_isolation.inc
+++ b/mysql-test/suite/storage_engine/trx/transaction_isolation.inc
@@ -31,7 +31,7 @@ let $create_definition = a $int_col;
 
 START TRANSACTION; 
 --sorted_result
-SELECT * FROM t1; # First snapshot
+SELECT a FROM t1; # First snapshot
 
 connection con2;
 
@@ -42,7 +42,7 @@ INSERT INTO t1 (a) VALUES(1);
 
 connection con1;
 --sorted_result
-SELECT * FROM t1; # Second snapshot
+SELECT a FROM t1; # Second snapshot
 
 connection con2;
 --let $error_codes = 0,ER_LOCK_WAIT_TIMEOUT
@@ -51,25 +51,25 @@ INSERT INTO t1 (a) VALUES (2);
 
 connection con1;
 --sorted_result
-SELECT * FROM t1; # Third snapshot
+SELECT a FROM t1; # Third snapshot
 
 --let $error_codes = 0,ER_LOCK_WAIT_TIMEOUT
 INSERT INTO t1 (a) SELECT a+100 FROM t1; 
 --source ../strict_check_errors.inc
 
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 connection con2;
 --sorted_result
-SELECT * FROM t1; # Inside the transaction
+SELECT a FROM t1; # Inside the transaction
 COMMIT;
 --sorted_result
-SELECT * FROM t1; # Outside the transaction
+SELECT a FROM t1; # Outside the transaction
 
 connection con1;
 --sorted_result
-SELECT * FROM t1; # Inside the transaction
+SELECT a FROM t1; # Inside the transaction
 
 # Note: INSERT .. SELECT might be tricky, for example for InnoDB
 # even with REPEATABLE-READ it works as if it is executed with READ COMMITTED.
@@ -81,14 +81,14 @@ INSERT INTO t1 (a) SELECT a+200 FROM t1;
 --source ../strict_check_errors.inc
 
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 COMMIT;
 --sorted_result
-SELECT * FROM t1; # Outside the transaction
+SELECT a FROM t1; # Outside the transaction
 
 connection con2;
 --sorted_result
-SELECT * FROM t1; # After both transactions have committed
+SELECT a FROM t1; # After both transactions have committed
 
 connection default;
 disconnect con1;
diff --git a/mysql-test/suite/storage_engine/trx/update.result b/mysql-test/suite/storage_engine/trx/update.result
index e609bfcbc23..968674619bd 100644
--- a/mysql-test/suite/storage_engine/trx/update.result
+++ b/mysql-test/suite/storage_engine/trx/update.result
@@ -6,7 +6,7 @@ BEGIN;
 UPDATE t1 SET a=a+100;
 UPDATE t1 SET a=a-50, b=DEFAULT WHERE a>100;
 COMMIT;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 10050	NULL
 10050	NULL
@@ -31,7 +31,7 @@ UPDATE t1 SET b = '';
 ROLLBACK TO SAVEPOINT spt1;
 UPDATE t1 SET b = 'upd' WHERE a = 10050;
 COMMIT;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 10050	upd
 10050	upd
diff --git a/mysql-test/suite/storage_engine/trx/update.test b/mysql-test/suite/storage_engine/trx/update.test
index df65e244528..245b7554477 100644
--- a/mysql-test/suite/storage_engine/trx/update.test
+++ b/mysql-test/suite/storage_engine/trx/update.test
@@ -26,7 +26,7 @@ if (!$mysql_errname)
   UPDATE t1 SET a=a-50, b=DEFAULT WHERE a>100;
   COMMIT;
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   BEGIN;
   UPDATE t1 SET b = 'update' WHERE a <= 4 ORDER BY a DESC, b ASC LIMIT 3;
@@ -41,7 +41,7 @@ if (!$mysql_errname)
   UPDATE t1 SET b = 'upd' WHERE a = 10050;
   COMMIT;
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 }
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/trx/xa.result b/mysql-test/suite/storage_engine/trx/xa.result
index 3e2cb43a11c..72017018e2a 100644
--- a/mysql-test/suite/storage_engine/trx/xa.result
+++ b/mysql-test/suite/storage_engine/trx/xa.result
@@ -7,18 +7,18 @@ connection con2;
 XA START 'xa1';
 INSERT INTO t1 (a) VALUES (1);
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 INSERT INTO t1 (a) VALUES (2);
 XA END 'xa1';
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 XA PREPARE 'xa1';
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 connection con2;
 XA RECOVER;
@@ -26,7 +26,7 @@ formatID	gtrid_length	bqual_length	data
 1	3	0	xa1
 XA COMMIT 'xa1';
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
@@ -34,7 +34,7 @@ connection con2;
 XA START 'xa2';
 INSERT INTO t1 (a) VALUES (3);
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
@@ -42,14 +42,14 @@ connection con2;
 INSERT INTO t1 (a) VALUES (4);
 XA END 'xa2';
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
 connection con2;
 XA COMMIT 'xa2' ONE PHASE;
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
@@ -59,7 +59,7 @@ connection con2;
 XA START 'xa3';
 INSERT INTO t1 (a) VALUES (5);
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
@@ -69,7 +69,7 @@ connection con2;
 INSERT INTO t1 (a) VALUES (6);
 XA END 'xa3';
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
@@ -78,7 +78,7 @@ a
 connection con2;
 XA PREPARE 'xa3';
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
@@ -87,7 +87,7 @@ a
 connection con2;
 XA ROLLBACK 'xa3';
 connection con1;
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 1
 2
diff --git a/mysql-test/suite/storage_engine/trx/xa.test b/mysql-test/suite/storage_engine/trx/xa.test
index c64ba7cd27b..17cae7eae76 100644
--- a/mysql-test/suite/storage_engine/trx/xa.test
+++ b/mysql-test/suite/storage_engine/trx/xa.test
@@ -30,7 +30,7 @@ INSERT INTO t1 (a) VALUES (1);
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 --connection con2
 INSERT INTO t1 (a) VALUES (2);
@@ -38,14 +38,14 @@ XA END 'xa1';
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 --connection con2
 XA PREPARE 'xa1';
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 --connection con2
 XA RECOVER;
@@ -53,7 +53,7 @@ XA COMMIT 'xa1';
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 # One-phase COMMIT
 
@@ -63,7 +63,7 @@ INSERT INTO t1 (a) VALUES (3);
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 --connection con2
 INSERT INTO t1 (a) VALUES (4);
@@ -71,14 +71,14 @@ XA END 'xa2';
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 --connection con2
 XA COMMIT 'xa2' ONE PHASE;
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 # Rollback
 
@@ -88,7 +88,7 @@ INSERT INTO t1 (a) VALUES (5);
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 --connection con2
 INSERT INTO t1 (a) VALUES (6);
@@ -96,21 +96,21 @@ XA END 'xa3';
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 --connection con2
 XA PREPARE 'xa3';
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 --connection con2
 XA ROLLBACK 'xa3';
 
 --connection con1
 --sorted_result
-SELECT * FROM t1;
+SELECT a FROM t1;
 
 DROP TABLE t1;
 
diff --git a/mysql-test/suite/storage_engine/trx/xa_recovery.result b/mysql-test/suite/storage_engine/trx/xa_recovery.result
index e14e9a0bf1a..a9208a6e9d3 100644
--- a/mysql-test/suite/storage_engine/trx/xa_recovery.result
+++ b/mysql-test/suite/storage_engine/trx/xa_recovery.result
@@ -22,7 +22,7 @@ formatID	gtrid_length	bqual_length	data
 1	3	0	xa2
 XA ROLLBACK 'xa1';
 XA COMMIT 'xa2';
-SELECT * FROM t1;
+SELECT a FROM t1;
 a
 3
 4
diff --git a/mysql-test/suite/storage_engine/trx/xa_recovery.test b/mysql-test/suite/storage_engine/trx/xa_recovery.test
index d7ac2e782d1..4dab66b77dd 100644
--- a/mysql-test/suite/storage_engine/trx/xa_recovery.test
+++ b/mysql-test/suite/storage_engine/trx/xa_recovery.test
@@ -64,7 +64,7 @@ EOF
 XA RECOVER;
 XA ROLLBACK 'xa1';
 XA COMMIT 'xa2';
-SELECT * FROM t1;
+SELECT a FROM t1;
 DROP TABLE t1;
 
 --source ../cleanup_engine.inc
diff --git a/mysql-test/suite/storage_engine/type_binary.inc b/mysql-test/suite/storage_engine/type_binary.inc
index 812a1cc9527..dbee1d57274 100644
--- a/mysql-test/suite/storage_engine/type_binary.inc
+++ b/mysql-test/suite/storage_engine/type_binary.inc
@@ -27,16 +27,16 @@ if (!$mysql_errname)
 
   # Valid values 
 
-  INSERT INTO t1 VALUES ('','','','','');
-  INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
+  INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('','','','','');
+  INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
 
   --sorted_result
   SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1;
 
   # Invalid values
 
-  INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
-  INSERT INTO t1 SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1;
+  INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
+  INSERT INTO t1 (b,b0,b1,b20,b255) SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1;
 
   --sorted_result
   SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1;
diff --git a/mysql-test/suite/storage_engine/type_binary.result b/mysql-test/suite/storage_engine/type_binary.result
index 455dbb57a7e..8da8b04095b 100644
--- a/mysql-test/suite/storage_engine/type_binary.result
+++ b/mysql-test/suite/storage_engine/type_binary.result
@@ -12,20 +12,20 @@ b0	binary(0)	#	#	#	#
 b1	binary(1)	#	#	#	#
 b20	binary(20)	#	#	#	#
 b255	binary(255)	#	#	#	#
-INSERT INTO t1 VALUES ('','','','','');
-INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('','','','','');
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
 SELECT HEX(b), HEX(b0), HEX(b1), HEX(b20), HEX(b255) FROM t1;
 HEX(b)	HEX(b0)	HEX(b1)	HEX(b20)	HEX(b255)
 00		00	0000000000000000000000000000000000000000	000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 61		62	616263646566676869206B6C6D6E6F7071727374	4372656174696E6720616E2061727469636C6520666F7220746865204B6E6F776C65646765626173652069732073696D696C617220746F2061736B696E67207175657374696F6E732E2046697273742C206E6176696761746520746F207468652063617465676F727920776865726520796F75206665656C207468652061727469636C652073686F756C642062652E204F6E63652074686572652C20646F75626C6520636865636B207468617420616E2061727469636C6520646F65736E277420616C726561647920657869737420776869636820776F756C6420776F726B2E00000000000000000000000000000000000000000000000000000000000000
-INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
+INSERT INTO t1 (b,b0,b1,b20,b255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'b0' at row 1
 Warning	1265	Data truncated for column 'b1' at row 1
 Warning	1265	Data truncated for column 'b20' at row 1
 Warning	1265	Data truncated for column 'b255' at row 1
-INSERT INTO t1 SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1;
+INSERT INTO t1 (b,b0,b1,b20,b255) SELECT b255, b255, b255, b255, CONCAT(b255,b255) FROM t1;
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'b0' at row 1
diff --git a/mysql-test/suite/storage_engine/type_binary_indexes.result b/mysql-test/suite/storage_engine/type_binary_indexes.result
index 6f828aed100..96e0d6d601a 100644
--- a/mysql-test/suite/storage_engine/type_binary_indexes.result
+++ b/mysql-test/suite/storage_engine/type_binary_indexes.result
@@ -88,7 +88,7 @@ SHOW INDEX IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	1	v16	1	v16	#	#	10	NULL	#	#		
 INSERT INTO t1 (b,b20,v16,v128) VALUES ('a','char1','varchar1a','varchar1b'),('a','char2','varchar2a','varchar2b'),('b','char3','varchar1a','varchar1b'),('c','char4','varchar3a','varchar3b'),('d','char5','varchar4a','varchar3b'),('e','char6','varchar2a','varchar3b');
-INSERT INTO t1 SELECT * FROM t1;
+INSERT INTO t1 (b,b20,v16,v128) SELECT b,b20,v16,v128 FROM t1;
 EXPLAIN SELECT HEX(SUBSTRING(v16,0,3)) FROM t1 WHERE v16 LIKE 'varchar%';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 #	#	#	#	#	NULL	#	#	#	#
diff --git a/mysql-test/suite/storage_engine/type_binary_indexes.test b/mysql-test/suite/storage_engine/type_binary_indexes.test
index 24b16aa5175..943593027f8 100644
--- a/mysql-test/suite/storage_engine/type_binary_indexes.test
+++ b/mysql-test/suite/storage_engine/type_binary_indexes.test
@@ -130,7 +130,7 @@ if (!$mysql_errname)
   SHOW INDEX IN t1;
 
   INSERT INTO t1 (b,b20,v16,v128) VALUES ('a','char1','varchar1a','varchar1b'),('a','char2','varchar2a','varchar2b'),('b','char3','varchar1a','varchar1b'),('c','char4','varchar3a','varchar3b'),('d','char5','varchar4a','varchar3b'),('e','char6','varchar2a','varchar3b');
-  INSERT INTO t1 SELECT * FROM t1;
+  INSERT INTO t1 (b,b20,v16,v128) SELECT b,b20,v16,v128 FROM t1;
 
   --replace_column 1 # 2 # 3 # 4 # 5 # 7 # 8 # 9 # 10 #
   EXPLAIN SELECT HEX(SUBSTRING(v16,0,3)) FROM t1 WHERE v16 LIKE 'varchar%';
diff --git a/mysql-test/suite/storage_engine/type_bit.inc b/mysql-test/suite/storage_engine/type_bit.inc
index 1a232305e1c..eb7920f8d83 100644
--- a/mysql-test/suite/storage_engine/type_bit.inc
+++ b/mysql-test/suite/storage_engine/type_bit.inc
@@ -43,28 +43,28 @@ if (!$mysql_errname)
     SHOW COLUMNS IN t1;
   }
 
-  INSERT INTO t1 VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
+  INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
   --sorted_result
   SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0;
 
-  INSERT INTO t1 VALUES (1,0,-1,0);
+  INSERT INTO t1 (a,b,c,d) VALUES (1,0,-1,0);
   --sorted_result
   SELECT a+0, b+0, c+0 FROM t1 WHERE d<100;
 
-  INSERT INTO t1 VALUES (b'1', 'f', 0xFF, 0x0);
+  INSERT INTO t1 (a,b,c,d) VALUES (b'1', 'f', 0xFF, 0x0);
   --sorted_result
   SELECT a+0, b+0, c+0 FROM t1 WHERE d IN (0, 2);
 
   # Out of range values
   # (should produce warnings)
 
-  INSERT INTO t1 VALUES (0x10,0,0,1);
+  INSERT INTO t1 (a,b,c,d) VALUES (0x10,0,0,1);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b,c,d FROM t1;
 
-  INSERT INTO t1 VALUES (0x01,0,0x10000000000000000,0);
+  INSERT INTO t1 (a,b,c,d) VALUES (0x01,0,0x10000000000000000,0);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b,c,d FROM t1;
 
   DROP TABLE t1;
 
diff --git a/mysql-test/suite/storage_engine/type_bit.result b/mysql-test/suite/storage_engine/type_bit.result
index 69b9ac53d76..3c88b297d8a 100644
--- a/mysql-test/suite/storage_engine/type_bit.result
+++ b/mysql-test/suite/storage_engine/type_bit.result
@@ -18,29 +18,29 @@ a	bit(1)	#	#	#
 b	bit(20)	#	#	#	
 c	bit(64)	#	#	#	
 d	bit(1)	#	#	#	
-INSERT INTO t1 VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
+INSERT INTO t1 (a,b,c,d) VALUES (0,POW(2,20)-1,b'1111111111111111111111111111111111111111111111111111111111111111',1);
 SELECT BIN(a), HEX(b), c+0 FROM t1 WHERE d>0;
 BIN(a)	HEX(b)	c+0
 0	FFFFF	18446744073709551615
-INSERT INTO t1 VALUES (1,0,-1,0);
+INSERT INTO t1 (a,b,c,d) VALUES (1,0,-1,0);
 SELECT a+0, b+0, c+0 FROM t1 WHERE d<100;
 a+0	b+0	c+0
 0	1048575	18446744073709551615
 1	0	18446744073709551615
-INSERT INTO t1 VALUES (b'1', 'f', 0xFF, 0x0);
+INSERT INTO t1 (a,b,c,d) VALUES (b'1', 'f', 0xFF, 0x0);
 SELECT a+0, b+0, c+0 FROM t1 WHERE d IN (0, 2);
 a+0	b+0	c+0
 1	0	18446744073709551615
 1	102	255
-INSERT INTO t1 VALUES (0x10,0,0,1);
+INSERT INTO t1 (a,b,c,d) VALUES (0x10,0,0,1);
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-SELECT * FROM t1;
+SELECT a,b,c,d FROM t1;
 a	b	c	d
-INSERT INTO t1 VALUES (0x01,0,0x10000000000000000,0);
+INSERT INTO t1 (a,b,c,d) VALUES (0x01,0,0x10000000000000000,0);
 Warnings:
 Warning	1264	Out of range value for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c,d FROM t1;
 a	b	c	d
 DROP TABLE t1;
 CREATE TABLE t1 (a BIT(65) <CUSTOM_COL_OPTIONS>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
diff --git a/mysql-test/suite/storage_engine/type_blob.inc b/mysql-test/suite/storage_engine/type_blob.inc
index 93a52fc9971..626c556102e 100644
--- a/mysql-test/suite/storage_engine/type_blob.inc
+++ b/mysql-test/suite/storage_engine/type_blob.inc
@@ -33,7 +33,7 @@ if (!$mysql_errname)
   # Valid values 
   # (cannot get MAX for all columns due to max_allowed_packet limitations)
 
-  INSERT INTO t1 VALUES
+  INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES
   ('','','','','','','','','',''),
   ('a','b','c','d','e','f','g','h','i','j'),
   ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'),
@@ -44,7 +44,7 @@ if (!$mysql_errname)
 
   # Invalid values (produce warnings, except for mediumblob and longblob columns for which the values are within limits)
 
-  INSERT INTO t1 VALUES
+  INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES
   ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) );
 
   --sorted_result
diff --git a/mysql-test/suite/storage_engine/type_blob.result b/mysql-test/suite/storage_engine/type_blob.result
index a93391f749a..9a9e14709e5 100644
--- a/mysql-test/suite/storage_engine/type_blob.result
+++ b/mysql-test/suite/storage_engine/type_blob.result
@@ -22,7 +22,7 @@ b17m	longblob	#	#	#
 t	tinyblob	#	#	#	
 m	mediumblob	#	#	#	
 l	longblob	#	#	#	
-INSERT INTO t1 VALUES
+INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES
 ('','','','','','','','','',''),
 ('a','b','c','d','e','f','g','h','i','j'),
 ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'),
@@ -33,7 +33,7 @@ LENGTH(b)	LENGTH(b0)	LENGTH(b1)	LENGTH(b300)	LENGTH(bm)	LENGTH(b70k)	LENGTH(b17m
 1	1	1	1	1	1	1	1	1	1
 5	5	5	5	5	5	5	5	5	6
 65535	65535	255	65535	65535	1048576	2097152	255	1048576	2097152
-INSERT INTO t1 VALUES
+INSERT INTO t1 (b,b0,b1,b300,bm,b70k,b17m,t,m,l) VALUES
 ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) );
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
diff --git a/mysql-test/suite/storage_engine/type_bool.inc b/mysql-test/suite/storage_engine/type_bool.inc
index ae7d0043c49..b14f658c973 100644
--- a/mysql-test/suite/storage_engine/type_bool.inc
+++ b/mysql-test/suite/storage_engine/type_bool.inc
@@ -25,40 +25,40 @@ if (!$mysql_errname)
 
   # Valid values 
 
-  INSERT INTO t1 VALUES (1,TRUE);
+  INSERT INTO t1 (b1,b2) VALUES (1,TRUE);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT b1,b2 FROM t1;
 
-  INSERT INTO t1 VALUES (FALSE,0);
+  INSERT INTO t1 (b1,b2) VALUES (FALSE,0);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT b1,b2 FROM t1;
 
-  INSERT INTO t1 VALUES (2,3);
+  INSERT INTO t1 (b1,b2) VALUES (2,3);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT b1,b2 FROM t1;
 
-  INSERT INTO t1 VALUES (-1,-2);
+  INSERT INTO t1 (b1,b2) VALUES (-1,-2);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT b1,b2 FROM t1;
 
   --sorted_result
   SELECT IF(b1,'true','false') AS a, IF(b2,'true','false') AS b FROM t1;
 
   --sorted_result
-  SELECT * FROM t1 WHERE b1 = TRUE;
+  SELECT b1,b2 FROM t1 WHERE b1 = TRUE;
 
   --sorted_result
-  SELECT * FROM t1 WHERE b2 = FALSE;
+  SELECT b1,b2 FROM t1 WHERE b2 = FALSE;
 
   # Invalid values
 
-  INSERT INTO t1 VALUES ('a','b');
+  INSERT INTO t1 (b1,b2) VALUES ('a','b');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT b1,b2 FROM t1;
 
-  INSERT INTO t1 VALUES (128,-129);
+  INSERT INTO t1 (b1,b2) VALUES (128,-129);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT b1,b2 FROM t1;
 
   # This is why we don't have zerofill and unsigned tests
   # for boolean columns:
diff --git a/mysql-test/suite/storage_engine/type_bool.result b/mysql-test/suite/storage_engine/type_bool.result
index 89beaa11a16..87308ed63fc 100644
--- a/mysql-test/suite/storage_engine/type_bool.result
+++ b/mysql-test/suite/storage_engine/type_bool.result
@@ -6,23 +6,23 @@ SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 b1	tinyint(1)	#	#	#	
 b2	tinyint(1)	#	#	#	
-INSERT INTO t1 VALUES (1,TRUE);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (1,TRUE);
+SELECT b1,b2 FROM t1;
 b1	b2
 1	1
-INSERT INTO t1 VALUES (FALSE,0);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (FALSE,0);
+SELECT b1,b2 FROM t1;
 b1	b2
 0	0
 1	1
-INSERT INTO t1 VALUES (2,3);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (2,3);
+SELECT b1,b2 FROM t1;
 b1	b2
 0	0
 1	1
 2	3
-INSERT INTO t1 VALUES (-1,-2);
-SELECT * FROM t1;
+INSERT INTO t1 (b1,b2) VALUES (-1,-2);
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
@@ -34,28 +34,28 @@ false	false
 true	true
 true	true
 true	true
-SELECT * FROM t1 WHERE b1 = TRUE;
+SELECT b1,b2 FROM t1 WHERE b1 = TRUE;
 b1	b2
 1	1
-SELECT * FROM t1 WHERE b2 = FALSE;
+SELECT b1,b2 FROM t1 WHERE b2 = FALSE;
 b1	b2
 0	0
-INSERT INTO t1 VALUES ('a','b');
+INSERT INTO t1 (b1,b2) VALUES ('a','b');
 Warnings:
 Warning	1366	Incorrect integer value: 'a' for column 'b1' at row 1
 Warning	1366	Incorrect integer value: 'b' for column 'b2' at row 1
-SELECT * FROM t1;
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
 0	0
 1	1
 2	3
-INSERT INTO t1 VALUES (128,-129);
+INSERT INTO t1 (b1,b2) VALUES (128,-129);
 Warnings:
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b2' at row 1
-SELECT * FROM t1;
+SELECT b1,b2 FROM t1;
 b1	b2
 -1	-2
 0	0
diff --git a/mysql-test/suite/storage_engine/type_char.inc b/mysql-test/suite/storage_engine/type_char.inc
index 8484fc23b10..8e666299736 100644
--- a/mysql-test/suite/storage_engine/type_char.inc
+++ b/mysql-test/suite/storage_engine/type_char.inc
@@ -27,19 +27,19 @@ if (!$mysql_errname)
 
   # Valid values 
 
-  INSERT INTO t1 VALUES ('','','','','');
-  INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
+  INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('','','','','');
+  INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT c,c0,c1,c20,c255 FROM t1;
 
   # Invalid values
 
-  INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
-  INSERT INTO t1 SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1;
+  INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
+  INSERT INTO t1 (c,c0,c1,c20,c255) SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1;
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT c,c0,c1,c20,c255 FROM t1;
 
   --sorted_result
   SELECT DISTINCT c20, REPEAT('a',LENGTH(c20)), COUNT(*) FROM t1 GROUP BY c1, c20;
diff --git a/mysql-test/suite/storage_engine/type_char.result b/mysql-test/suite/storage_engine/type_char.result
index 61d3cf2419d..ce6d6f11b19 100644
--- a/mysql-test/suite/storage_engine/type_char.result
+++ b/mysql-test/suite/storage_engine/type_char.result
@@ -12,20 +12,20 @@ c0	char(0)	#	#	#
 c1	char(1)	#	#	#	
 c20	char(20)	#	#	#	
 c255	char(255)	#	#	#	
-INSERT INTO t1 VALUES ('','','','','');
-INSERT INTO t1 VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
-SELECT * FROM t1;
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('','','','','');
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('a','','b','abcdefghi klmnopqrst', 'Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn\'t already exist which would work.');
+SELECT c,c0,c1,c20,c255 FROM t1;
 c	c0	c1	c20	c255
 				
 a		b	abcdefghi klmnopqrst	Creating an article for the Knowledgebase is similar to asking questions. First, navigate to the category where you feel the article should be. Once there, double check that an article doesn't already exist which would work.
-INSERT INTO t1 VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
+INSERT INTO t1 (c,c0,c1,c20,c255) VALUES ('abc', 'a', 'abc', REPEAT('a',21), REPEAT('x',256));
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
 Warning	1265	Data truncated for column 'c0' at row 1
 Warning	1265	Data truncated for column 'c1' at row 1
 Warning	1265	Data truncated for column 'c20' at row 1
 Warning	1265	Data truncated for column 'c255' at row 1
-INSERT INTO t1 SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1;
+INSERT INTO t1 (c,c0,c1,c20,c255) SELECT c255, c255, c255, c255, CONCAT(c255,c1) FROM t1;
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 2
 Warning	1265	Data truncated for column 'c0' at row 2
@@ -36,7 +36,7 @@ Warning	1265	Data truncated for column 'c0' at row 3
 Warning	1265	Data truncated for column 'c1' at row 3
 Warning	1265	Data truncated for column 'c20' at row 3
 Warning	1265	Data truncated for column 'c255' at row 3
-SELECT * FROM t1;
+SELECT c,c0,c1,c20,c255 FROM t1;
 c	c0	c1	c20	c255
 				
 				
diff --git a/mysql-test/suite/storage_engine/type_char_indexes.result b/mysql-test/suite/storage_engine/type_char_indexes.result
index f02fcef3ef0..33594e2581f 100644
--- a/mysql-test/suite/storage_engine/type_char_indexes.result
+++ b/mysql-test/suite/storage_engine/type_char_indexes.result
@@ -96,10 +96,10 @@ varchar1b	2
 varchar2b	1
 varchar3b	1
 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
-SELECT * FROM t1 WHERE c > 'a';
+SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
 c	c20	v16	v128
 b	char3	varchar1a	varchar1b
 c	char4	varchar3a	varchar3b
@@ -133,10 +133,10 @@ r1a
 r1a
 r2a
 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	#	#	#	#
-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
 b	char3	varchar1a	varchar1b
diff --git a/mysql-test/suite/storage_engine/type_char_indexes.test b/mysql-test/suite/storage_engine/type_char_indexes.test
index 582800eabba..6fff8a6f73e 100644
--- a/mysql-test/suite/storage_engine/type_char_indexes.test
+++ b/mysql-test/suite/storage_engine/type_char_indexes.test
@@ -135,9 +135,9 @@ if (!$mysql_errname)
 
   SET SESSION optimizer_switch = 'engine_condition_pushdown=on';
   --replace_column 1 # 2 # 3 # 7 # 8 # 9 # 
-  EXPLAIN SELECT * FROM t1 WHERE c > 'a';
+  EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
   --sorted_result
-  SELECT * FROM t1 WHERE c > 'a';
+  SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
   SET SESSION optimizer_switch = @@global.optimizer_switch;
 
   DROP TABLE t1;
@@ -175,9 +175,9 @@ if (!$mysql_errname)
   SELECT SUBSTRING(v16,7,3) FROM t1 IGNORE INDEX (v16) WHERE v16 LIKE 'varchar%';
 
   --replace_column 1 # 2 # 3 # 5 # 7 # 8 # 9 # 10 #
-  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;
   --sorted_result
-  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;
 
   DROP TABLE t1;
 }
diff --git a/mysql-test/suite/storage_engine/type_date_time.inc b/mysql-test/suite/storage_engine/type_date_time.inc
index d0b953984be..29bfcf630f0 100644
--- a/mysql-test/suite/storage_engine/type_date_time.inc
+++ b/mysql-test/suite/storage_engine/type_date_time.inc
@@ -32,22 +32,22 @@ if (!$mysql_errname)
 
   # Valid values 
   # '1970-01-01 00:00:01'
-  INSERT INTO t1 VALUES
+  INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
   ('1000-01-01', '1000-01-01 00:00:00', FROM_UNIXTIME(1), '-838:59:59', '1901', '1901', '00'),
   ('9999-12-31', '9999-12-31 23:59:59', FROM_UNIXTIME(2147483647), '838:59:59', '2155', '2155', '99'),
   ('0000-00-00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '00:00:00', '0', '0', '0'),
   (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm)); 
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 
   # Invalid values
 
-  INSERT INTO t1 VALUES
+  INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
   ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' );
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 
   DROP TABLE t1;
 }
diff --git a/mysql-test/suite/storage_engine/type_date_time.result b/mysql-test/suite/storage_engine/type_date_time.result
index 06b92d3149f..73c9a2ec7ed 100644
--- a/mysql-test/suite/storage_engine/type_date_time.result
+++ b/mysql-test/suite/storage_engine/type_date_time.result
@@ -19,18 +19,18 @@ y	year(4)	#	#	#
 y4	year(4)	#	#	#	
 y2	year(2)	#	#	#	
 SET @tm = '2012-04-09 05:27:00';
-INSERT INTO t1 VALUES
+INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('1000-01-01', '1000-01-01 00:00:00', FROM_UNIXTIME(1), '-838:59:59', '1901', '1901', '00'),
 ('9999-12-31', '9999-12-31 23:59:59', FROM_UNIXTIME(2147483647), '838:59:59', '2155', '2155', '99'),
 ('0000-00-00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '00:00:00', '0', '0', '0'),
 (DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm),YEAR(@tm),YEAR(@tm));
-SELECT * FROM t1;
+SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
 1000-01-01	1000-01-01 00:00:00	1970-01-01 03:00:01	-838:59:59	1901	1901	00
 2012-04-09	2012-04-09 05:27:00	2012-04-09 05:27:00	05:27:00	2012	2012	12
 9999-12-31	9999-12-31 23:59:59	2038-01-19 07:14:07	838:59:59	2155	2155	99
-INSERT INTO t1 VALUES
+INSERT INTO t1 (d,dt,ts,t,y,y4,y2) VALUES
 ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1' );
 Warnings:
 Warning	1265	Data truncated for column 'd' at row 1
@@ -40,7 +40,7 @@ Warning	1264	Out of range value for column 't' at row 1
 Warning	1264	Out of range value for column 'y' at row 1
 Warning	1264	Out of range value for column 'y4' at row 1
 Warning	1264	Out of range value for column 'y2' at row 1
-SELECT * FROM t1;
+SELECT d,dt,ts,t,y,y4,y2 FROM t1;
 d	dt	ts	t	y	y4	y2
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	-838:59:59	0000	0000	00
 0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	2000	2000	00
diff --git a/mysql-test/suite/storage_engine/type_enum.inc b/mysql-test/suite/storage_engine/type_enum.inc
index 6b9b83fc52e..2e747e50ef4 100644
--- a/mysql-test/suite/storage_engine/type_enum.inc
+++ b/mysql-test/suite/storage_engine/type_enum.inc
@@ -28,16 +28,16 @@ if (!$mysql_errname)
   --replace_column 3 # 4 # 5 #
   SHOW COLUMNS IN t1;
 
-  INSERT INTO t1 VALUES ('','test2','4'),('',5,2);
+  INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b,c FROM t1;
 
   # Out of range values 
   # (should produce warnings)
 
-  INSERT INTO t1 VALUES (0,'test6',-1);
+  INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b,c FROM t1;
 
   # Non-unique values in enum
   # (should produce a warning)
@@ -53,14 +53,14 @@ if (!$mysql_errname)
   --replace_column 3 # 4 # 5 #
   SHOW COLUMNS IN t1;
 
-  INSERT INTO t1 VALUES ('','test3','75','A');
+  INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b,c,e FROM t1;
 
   # Simple comparison
 
   --sorted_result
-  SELECT * FROM t1 WHERE b='test2' OR a != '';
+  SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != '';
 
   DROP TABLE t1;
 }
diff --git a/mysql-test/suite/storage_engine/type_enum.result b/mysql-test/suite/storage_engine/type_enum.result
index 920aa5c7807..c2efd87ffb7 100644
--- a/mysql-test/suite/storage_engine/type_enum.result
+++ b/mysql-test/suite/storage_engine/type_enum.result
@@ -8,17 +8,17 @@ Field	Type	Null	Key	Default	Extra
 a	enum('')	#	#	#	
 b	enum('test1','test2','test3','test4','test5')	#	#	#	
 c	enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75')	#	#	#	
-INSERT INTO t1 VALUES ('','test2','4'),('',5,2);
-SELECT * FROM t1;
+INSERT INTO t1 (a,b,c) VALUES ('','test2','4'),('',5,2);
+SELECT a,b,c FROM t1;
 a	b	c
 	test2	4
 	test5	2
-INSERT INTO t1 VALUES (0,'test6',-1);
+INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1);
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 1
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 		
 	test2	4
@@ -33,14 +33,14 @@ a	enum('')	#	#	#
 b	enum('test1','test2','test3','test4','test5')	#	#	#	
 c	enum('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i','3j','3k','3l','3m','3n','3o','3p','3q','3r','3s','3t','3u','3v','3w','3x','3y','3z','40','41','42','43','44','45','46','47','48','49','4a','4b','4c','4d','4e','4f','4g','4h','4i','4j','4k','4l','4m','4n','4o','4p','4q','4r','4s','4t','4u','4v','4w','4x','4y','4z','50','51','52','53','54','55','56','57','58','59','5a','5b','5c','5d','5e','5f','5g','5h','5i','5j','5k','5l','5m','5n','5o','5p','5q','5r','5s','5t','5u','5v','5w','5x','5y','5z','60','61','62','63','64','65','66','67','68','69','6a','6b','6c','6d','6e','6f','6g','6h','6i','6j','6k','6l','6m','6n','6o','6p','6q','6r','6s','6t','6u','6v','6w','6x','6y','6z','70','71','72','73','74','75')	#	#	#	
 e	enum('a','A')	#	#	#	
-INSERT INTO t1 VALUES ('','test3','75','A');
-SELECT * FROM t1;
+INSERT INTO t1 (a,b,c,e) VALUES ('','test3','75','A');
+SELECT a,b,c,e FROM t1;
 a	b	c	e
 			NULL
 	test2	4	NULL
 	test3	75	a
 	test5	2	NULL
-SELECT * FROM t1 WHERE b='test2' OR a != '';
+SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != '';
 a	b	c	e
 	test2	4	NULL
 DROP TABLE t1;
diff --git a/mysql-test/suite/storage_engine/type_fixed.inc b/mysql-test/suite/storage_engine/type_fixed.inc
index 6765fb575bc..3b4ade9ff6d 100644
--- a/mysql-test/suite/storage_engine/type_fixed.inc
+++ b/mysql-test/suite/storage_engine/type_fixed.inc
@@ -32,40 +32,40 @@ if (!$mysql_errname)
 
   # Always valid values 
 
-  INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
-  INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-  INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
+  INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
+  INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0);
+  INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 
   # Values which can be valid or not, 
   # depending on whether columns are SIGNED or UNSIGNED
   # (if not valid should produce warnings)
 
-  INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
-  INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
+  INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
+  INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 
   --sorted_result
-  SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
+  SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
 
   # Invalid values
 
-  INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
+  INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 
-  INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
+  INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 
-  INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
+  INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 
   --let $error_codes = ER_TOO_BIG_PRECISION
   --let $alter_definition = ADD COLUMN n66 NUMERIC(66)
diff --git a/mysql-test/suite/storage_engine/type_fixed.result b/mysql-test/suite/storage_engine/type_fixed.result
index 2c1566538db..5eea911a323 100644
--- a/mysql-test/suite/storage_engine/type_fixed.result
+++ b/mysql-test/suite/storage_engine/type_fixed.result
@@ -22,30 +22,30 @@ n0_0	decimal(10,0)	#	#	#
 n1	decimal(1,0)	#	#	#	
 n20_4	decimal(20,4)	#	#	#	
 n65_4	decimal(65,4)	#	#	#	
-INSERT INTO t1 VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
-SELECT * FROM t1;
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (100,123456,0.3,40000.25,123456789123456789.10001,1024,7000.0,8.0,999999.9,9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.0,9999999999.0,0.9,99999999.99,99999999999999999999999999999999999999999999999999.9999999999,9999999999.0,9999999999.0,9.0,9999999999999999.9999,9999999999999999999999999999999999999999999999999999999999999.9999);
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
-INSERT INTO t1 VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
-SELECT * FROM t1;
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-100,-123456,-0.3,-40000.25,-123456789123456789.10001,-1024,-7000.0,-8.0,-999999.9,-9223372036854775807);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (-9999999999.0,-9999999999.0,-0.9,-99999999.99,-99999999999999999999999999999999999999999999999999.9999999999,-9999999999.0,-9999999999.0,-9.0,-9999999999999999.9999,-9999999999999999999999999999999999999999999999999999999999999.9999);
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-SELECT * FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1 WHERE n20_4 = 9999999999999999.9999 OR d < 100;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
 0	0	0.0	0.00	0.0000000000	0	0	0	0.0000	0.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) SELECT n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4, n65_4 FROM t1 WHERE n65_4 = ( SELECT MAX(n65_4) FROM t1 );
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -56,7 +56,7 @@ Warning	1264	Out of range value for column 'n' at row 1
 Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
@@ -64,7 +64,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 100	123456	0.3	40000.25	123456789123456789.1000100000	1024	7000	8	999999.9000	9223372036854775807.0000
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (10000000000.0,10000000000.0,1.1,100000000.99,100000000000000000000000000000000000000000000000000.0,10000000000.0,10000000000.0,10.0,10000000000000000.9999,10000000000000000000000000000000000000000000000000000000000000.9999);
 Warnings:
 Warning	1264	Out of range value for column 'd' at row 1
 Warning	1264	Out of range value for column 'd0' at row 1
@@ -76,7 +76,7 @@ Warning	1264	Out of range value for column 'n0_0' at row 1
 Warning	1264	Out of range value for column 'n1' at row 1
 Warning	1264	Out of range value for column 'n20_4' at row 1
 Warning	1264	Out of range value for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
@@ -85,7 +85,7 @@ d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
 9999999999	9999999999	0.9	99999999.99	99999999999999999999999999999999999999999999999999.9999999999	9999999999	9999999999	9	9999999999999999.9999	9999999999999999999999999999999999999999999999999999999999999.9999
-INSERT INTO t1 VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
+INSERT INTO t1 (d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4) VALUES (9999999999.1,9999999999.1,1.9,99999999.001,99999999999999999999999999999999999999999999999999.99999999991,9999999999.1,9999999999.1,9.1,9999999999999999.00001,9999999999999999999999999999999999999999999999999999999999999.11111);
 Warnings:
 Note	1265	Data truncated for column 'd' at row 1
 Note	1265	Data truncated for column 'd0' at row 1
@@ -97,7 +97,7 @@ Note	1265	Data truncated for column 'n0_0' at row 1
 Note	1265	Data truncated for column 'n1' at row 1
 Note	1265	Data truncated for column 'n20_4' at row 1
 Note	1265	Data truncated for column 'n65_4' at row 1
-SELECT * FROM t1;
+SELECT d,d0,d1_1,d10_2,d60_10,n,n0_0,n1,n20_4,n65_4 FROM t1;
 d	d0	d1_1	d10_2	d60_10	n	n0_0	n1	n20_4	n65_4
 -100	-123456	-0.3	-40000.25	-123456789123456789.1000100000	-1024	-7000	-8	-999999.9000	-9223372036854775807.0000
 -9999999999	-9999999999	-0.9	-99999999.99	-99999999999999999999999999999999999999999999999999.9999999999	-9999999999	-9999999999	-9	-9999999999999999.9999	-9999999999999999999999999999999999999999999999999999999999999.9999
diff --git a/mysql-test/suite/storage_engine/type_float.inc b/mysql-test/suite/storage_engine/type_float.inc
index 7e355f01e0d..1b8f0102755 100644
--- a/mysql-test/suite/storage_engine/type_float.inc
+++ b/mysql-test/suite/storage_engine/type_float.inc
@@ -32,13 +32,13 @@ if (!$mysql_errname)
 
   # Always valid values 
 
-  INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
+  INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
 
   --sorted_result
-  --query_vertical SELECT * FROM t1
+  --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1
 
-  INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-  INSERT INTO t1 VALUES (
+  INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0);
+  INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
     99999999999999999999999999999999999999,
     99999999999999999999999999999999999999.9999999999999999,
     0.9,
@@ -52,28 +52,28 @@ if (!$mysql_errname)
   );
 
   --sorted_result
-  --query_vertical SELECT * FROM t1
+  --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1
 
   # Values which can be valid or not, 
   # depending on whether columns are SIGNED or UNSIGNED
   # (if not valid should produce warnings)
 
-  INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
+  INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
 
   --sorted_result
-  --query_vertical SELECT * FROM t1
+  --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1
 
   --sorted_result
   --query_vertical SELECT MAX(f), MAX(f0), MAX(r1_1), MAX(f23_0), MAX(f20_3), MAX(d), MAX(d1_0), MAX(d10_10), MAX(d53), MAX(d53_10) FROM t1
 
   # Invalid values
 
-  INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
+  INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
 
   --sorted_result
-  --query_vertical SELECT * FROM t1
+  --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1
 
-  INSERT INTO t1 VALUES (
+  INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
     999999999999999999999999999999999999999,
     999999999999999999999999999999999999999.9999999999999999,
     1.9,
@@ -87,7 +87,7 @@ if (!$mysql_errname)
   );
 
   --sorted_result
-  --query_vertical SELECT * FROM t1
+  --query_vertical SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1
 
   --let $error_codes = ER_TOO_BIG_DISPLAYWIDTH
   --let $alter_definition = ADD COLUMN d0_0 DOUBLE(0,0)
diff --git a/mysql-test/suite/storage_engine/type_float.result b/mysql-test/suite/storage_engine/type_float.result
index 1f863505430..5cd76673a3c 100644
--- a/mysql-test/suite/storage_engine/type_float.result
+++ b/mysql-test/suite/storage_engine/type_float.result
@@ -22,8 +22,8 @@ d1_0	double(1,0)	#	#	#
 d10_10	double(10,10)	#	#	#	
 d53	double(53,0)	#	#	#	
 d53_10	double(53,10)	#	#	#	
-INSERT INTO t1 VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
-SELECT * FROM t1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (12345.12345,12345.12345,0.9,123456789.123,56789.987,11111111.111,8.0,0.0123456789,1234566789123456789,99999999999999999.99999999);
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	11111111.111
 d10_10	0.0123456789
@@ -34,8 +34,8 @@ f0	12345.1
 f20_3	56789.988
 f23_0	123457000
 r1_1	0.9
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 99999999999999999999999999999999999999,
 99999999999999999999999999999999999999.9999999999999999,
 0.9,
@@ -50,7 +50,7 @@ INSERT INTO t1 VALUES (
 Warnings:
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	0
 d	11111111.111
@@ -81,8 +81,8 @@ f23_0	1e38
 r1_1	0.0
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
-SELECT * FROM t1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (-999999999999999999999999,-99999999999.999999999999,-0.9,-999.99999999999999999999,-99999999999999999.999,-999999999999999999999999999999999999999999999999999999999999-0.999,-9,-.9999999999,-999999999999999999999999999999.99999999999999999999999,-9999999999999999999999999999999999999999999.9999999999);
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
@@ -134,7 +134,7 @@ MAX(f0)	9.999999680285692e37
 MAX(f20_3)	99999998430674940.000
 MAX(f23_0)	9.999999680285692e37
 MAX(r1_1)	0.9
-INSERT INTO t1 SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) SELECT d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10, d53_10 FROM t1 ORDER BY d53_10 DESC LIMIT 1;
 Warnings:
 Warning	1264	Out of range value for column 'f' at row 1
 Warning	1264	Out of range value for column 'f0' at row 1
@@ -142,7 +142,7 @@ Warning	1264	Out of range value for column 'r1_1' at row 1
 Warning	1264	Out of range value for column 'f23_0' at row 1
 Warning	1264	Out of range value for column 'f20_3' at row 1
 Warning	1264	Out of range value for column 'd1_0' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
@@ -193,7 +193,7 @@ r1_1	0.0
 r1_1	0.9
 r1_1	0.9
 r1_1	0.9
-INSERT INTO t1 VALUES (
+INSERT INTO t1 (f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10) VALUES (
 999999999999999999999999999999999999999,
 999999999999999999999999999999999999999.9999999999999999,
 1.9,
@@ -216,7 +216,7 @@ Warning	1264	Out of range value for column 'd1_0' at row 1
 Warning	1264	Out of range value for column 'd10_10' at row 1
 Warning	1264	Out of range value for column 'd53' at row 1
 Warning	1264	Out of range value for column 'd53_10' at row 1
-SELECT * FROM t1;
+SELECT f,f0,r1_1,f23_0,f20_3,d,d1_0,d10_10,d53,d53_10 FROM t1;
 f	12345.1
 d	-1e60
 d	0
diff --git a/mysql-test/suite/storage_engine/type_int.inc b/mysql-test/suite/storage_engine/type_int.inc
index 5aaea78fcd5..058b18a24d5 100644
--- a/mysql-test/suite/storage_engine/type_int.inc
+++ b/mysql-test/suite/storage_engine/type_int.inc
@@ -42,32 +42,32 @@ if (!$mysql_errname)
 
   # Always valid values 
 
-  INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-  INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-  INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
+  INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
+  INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+  INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 
   # Values which can be valid or not, 
   # depending on whether columns are SIGNED or UNSIGNED
   # (if not valid should produce warnings)
 
-  INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
-  INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
+  INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
+  INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 
   # Invalid values
 
-  INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
+  INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
 
-  INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
+  INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
 
-  INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
+  INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 
   --let $error_codes = ER_TOO_BIG_DISPLAYWIDTH
   --let $alter_definition = ADD COLUMN i257 INT(257)
diff --git a/mysql-test/suite/storage_engine/type_int.result b/mysql-test/suite/storage_engine/type_int.result
index 47f4ebad93a..8f462648a6a 100644
--- a/mysql-test/suite/storage_engine/type_int.result
+++ b/mysql-test/suite/storage_engine/type_int.result
@@ -42,16 +42,16 @@ b	bigint(20)	#	#	#
 b0	bigint(20)	#	#	#	
 b1	bigint(1)	#	#	#	
 b20	bigint(20)	#	#	#	
-INSERT INTO t1 VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-INSERT INTO t1 VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO t1 VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
-SELECT * FROM t1;
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (2147483647,2147483647,2147483647,2147483647,127,127,127,127,32767,32767,32767,32767,8388607,8388607,8388607,8388607,9223372036854775807,9223372036854775807,9223372036854775807,9223372036854775807);
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
-INSERT INTO t1 VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
-INSERT INTO t1 VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483648,-2147483648,-2147483648,-2147483648,-128,-128,-128,-128,-32768,-32768,-32768,-32768,-8388608,-8388608,-8388608,-8388608,-9223372036854775808,-9223372036854775808,-9223372036854775808,-9223372036854775808);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967295,4294967295,4294967295,4294967295,255,255,255,255,65535,65535,65535,65535,16777215,16777215,16777215,16777215,18446744073709551615,18446744073709551615,18446744073709551615,18446744073709551615);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -73,14 +73,14 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-SELECT * FROM t1;
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
 0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16	17	18	19	20
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
 2147483647	2147483647	2147483647	2147483647	127	127	127	127	32767	32767	32767	32767	8388607	8388607	8388607	8388607	9223372036854775807	9223372036854775807	9223372036854775807	9223372036854775807
-INSERT INTO t1 VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (-2147483649,-2147483649,-2147483649,-2147483649,-129,-129,-129,-129,-32769,-32769,-32769,-32769,-8388609,-8388609,-8388609,-8388609,-9223372036854775809,-9223372036854775809,-9223372036854775809,-9223372036854775809);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -102,7 +102,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) VALUES (4294967296,4294967296,4294967296,4294967296,256,256,256,256,65536,65536,65536,65536,16777216,16777216,16777216,16777216,18446744073709551616,18446744073709551616,18446744073709551616,18446744073709551616);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -124,7 +124,7 @@ Warning	1264	Out of range value for column 'b' at row 1
 Warning	1264	Out of range value for column 'b0' at row 1
 Warning	1264	Out of range value for column 'b1' at row 1
 Warning	1264	Out of range value for column 'b20' at row 1
-INSERT INTO t1 SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
+INSERT INTO t1 (i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20) SELECT b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b FROM t1 WHERE b IN (-9223372036854775808,9223372036854775807,18446744073709551615);
 Warnings:
 Warning	1264	Out of range value for column 'i' at row 1
 Warning	1264	Out of range value for column 'i0' at row 1
@@ -190,7 +190,7 @@ Warning	1264	Out of range value for column 'm' at row 4
 Warning	1264	Out of range value for column 'm0' at row 4
 Warning	1264	Out of range value for column 'm1' at row 4
 Warning	1264	Out of range value for column 'm20' at row 4
-SELECT * FROM t1;
+SELECT i,i0,i1,i20,t,t0,t1,t20,s,s0,s1,s20,m,m0,m1,m20,b,b0,b1,b20 FROM t1;
 i	i0	i1	i20	t	t0	t1	t20	s	s0	s1	s20	m	m0	m1	m20	b	b0	b1	b20
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
 -2147483648	-2147483648	-2147483648	-2147483648	-128	-128	-128	-128	-32768	-32768	-32768	-32768	-8388608	-8388608	-8388608	-8388608	-9223372036854775808	-9223372036854775808	-9223372036854775808	-9223372036854775808
diff --git a/mysql-test/suite/storage_engine/type_set.inc b/mysql-test/suite/storage_engine/type_set.inc
index b4844b00ec7..bc927cf8014 100644
--- a/mysql-test/suite/storage_engine/type_set.inc
+++ b/mysql-test/suite/storage_engine/type_set.inc
@@ -25,19 +25,19 @@ if (!$mysql_errname)
   --replace_column 3 # 4 # 5 #
   SHOW COLUMNS IN t1;
 
-  INSERT INTO t1 VALUES 
+  INSERT INTO t1 (a,b,c) VALUES 
   ('','test2,test3','01,34,44,,23'),
   ('',5,2),
   (',','test4,test2','');
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b,c FROM t1;
 
   # Out of range values 
   # (should produce warnings)
 
-  INSERT INTO t1 VALUES (0,'test6',-1);
+  INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b,c FROM t1;
 
   # Non-unique values in set
   # (should produce a warning)
@@ -62,7 +62,7 @@ if (!$mysql_errname)
   # Simple comparison
 
   --sorted_result
-  SELECT * FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != '';
+  SELECT a,b,c,e FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != '';
 
   DROP TABLE t1;
 }
diff --git a/mysql-test/suite/storage_engine/type_set.result b/mysql-test/suite/storage_engine/type_set.result
index 210b07748bc..2248ce9f7e0 100644
--- a/mysql-test/suite/storage_engine/type_set.result
+++ b/mysql-test/suite/storage_engine/type_set.result
@@ -8,22 +8,22 @@ Field	Type	Null	Key	Default	Extra
 a	set('')	#	#	#	
 b	set('test1','test2','test3','test4','test5')	#	#	#	
 c	set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50''51','52','53','54','55','56','57','58','59','60','61','62','63','64')	#	#	#	
-INSERT INTO t1 VALUES 
+INSERT INTO t1 (a,b,c) VALUES 
 ('','test2,test3','01,34,44,,23'),
 ('',5,2),
 (',','test4,test2','');
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 	test1,test3	02
 	test2,test3	01,23,34,44
 	test2,test4	
-INSERT INTO t1 VALUES (0,'test6',-1);
+INSERT INTO t1 (a,b,c) VALUES (0,'test6',-1);
 Warnings:
 Warning	1265	Data truncated for column 'b' at row 1
 Warning	1265	Data truncated for column 'c' at row 1
-SELECT * FROM t1;
+SELECT a,b,c FROM t1;
 a	b	c
 		01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50'51,52,53,54,55,56,57,58,59,60,61,62,63,64
 	test1,test3	02
@@ -41,7 +41,7 @@ c	set('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15'
 e	set('a','A')	#	#	#	
 ALTER TABLE t1 ADD COLUMN f SET('1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',' ','11','12','13','14','15','16','17','18','19','1a','1b','1c','1d','1e','1f','1g','1h','1i','1j','1k','1l','1m','1n','1o','1p','1q','1r','1s','1t','1u','1v','1w','1x','1y','1z','20','21','22','23','24','25','26','27','28','29','2a','2b','2c','2d','2e','2f','2g','2h','2i','2j','2k','2l','2m','2n','2o','2p','2q','2r','2s','2t','2u','2v','2w','2x','2y','2z','30','31','32','33','34','35','36','37','38','39','3a','3b','3c','3d','3e','3f','3g','3h','3i') <CUSTOM_COL_OPTIONS>;
 ERROR HY000: Too many strings for column f and SET
-SELECT * FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != '';
+SELECT a,b,c,e FROM t1 WHERE FIND_IN_SET('test2',b)>0 OR a != '';
 a	b	c	e
 	test2,test3	01,23,34,44	NULL
 	test2,test4		NULL
diff --git a/mysql-test/suite/storage_engine/type_spatial.inc b/mysql-test/suite/storage_engine/type_spatial.inc
index 5195f779bcc..212786d60bf 100644
--- a/mysql-test/suite/storage_engine/type_spatial.inc
+++ b/mysql-test/suite/storage_engine/type_spatial.inc
@@ -372,50 +372,50 @@ if (!$mysql_errname)
   SHOW FIELDS FROM gis_geometrycollection;
   SHOW FIELDS FROM gis_geometry;
 
-  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;
   SELECT fid, AsText(g) FROM gis_line;
@@ -475,7 +475,7 @@ if (!$mysql_errname)
   USE gis_ogs;
 
   --echo # Lakes
-  INSERT INTO lakes VALUES ( 
+  INSERT INTO lakes (fid,name,shore) VALUES ( 
   101, 'BLUE LAKE', 
   PolyFromText( 
   'POLYGON( 
@@ -486,37 +486,37 @@ if (!$mysql_errname)
 
   --echo # 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)); 
 
   --echo # 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)); 
 
   --echo # 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)))', 
@@ -524,28 +524,28 @@ if (!$mysql_errname)
 
   --echo # Bridges 
 
-  INSERT INTO bridges VALUES(110, 'Cam Bridge', PointFromText( 
+  INSERT INTO bridges (fid,name,position) VALUES(110, 'Cam Bridge', PointFromText( 
   'POINT( 44 31 )', 101)); 
 
   --echo # 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)); 
 
   --echo # 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( 
@@ -554,24 +554,24 @@ if (!$mysql_errname)
 
   --echo # 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)); 
 
   --echo # 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)); 
 
   --echo # 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)); 
 
diff --git a/mysql-test/suite/storage_engine/type_spatial.result b/mysql-test/suite/storage_engine/type_spatial.result
index c6b856ab8b0..94e3b22fd3c 100644
--- a/mysql-test/suite/storage_engine/type_spatial.result
+++ b/mysql-test/suite/storage_engine/type_spatial.result
@@ -77,43 +77,43 @@ SHOW FIELDS FROM gis_geometry;
 Field	Type	Null	Key	Default	Extra
 fid	int(11)	YES		NULL	
 g	geometry	YES		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)
@@ -431,7 +431,7 @@ first	second	w	c	o	e	d	t	i	r
 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( 
@@ -440,68 +440,68 @@ PolyFromText(
   )', 
 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/mysql-test/suite/storage_engine/type_spatial_indexes.result b/mysql-test/suite/storage_engine/type_spatial_indexes.result
index a3c2a4d4e75..cebcb80d14f 100644
--- a/mysql-test/suite/storage_engine/type_spatial_indexes.result
+++ b/mysql-test/suite/storage_engine/type_spatial_indexes.result
@@ -77,43 +77,43 @@ SHOW FIELDS FROM gis_geometry;
 Field	Type	Null	Key	Default	Extra
 fid	int(11)	YES		NULL	
 g	geometry	YES		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)
@@ -431,7 +431,7 @@ first	second	w	c	o	e	d	t	i	r
 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( 
@@ -440,68 +440,68 @@ PolyFromText(
   )', 
 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) 
@@ -777,43 +777,43 @@ SHOW FIELDS FROM gis_geometry;
 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)
@@ -1131,7 +1131,7 @@ first	second	w	c	o	e	d	t	i	r
 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( 
@@ -1140,68 +1140,68 @@ PolyFromText(
   )', 
 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/mysql-test/suite/storage_engine/type_text.inc b/mysql-test/suite/storage_engine/type_text.inc
index 0f31e91c776..86521e5fb1e 100644
--- a/mysql-test/suite/storage_engine/type_text.inc
+++ b/mysql-test/suite/storage_engine/type_text.inc
@@ -33,7 +33,7 @@ if (!$mysql_errname)
   # Valid values 
   # (cannot get MAX for all columns due to max_allowed_packet limitations)
 
-  INSERT INTO t1 VALUES
+  INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES
   ('','','','','','','','','',''),
   ('a','b','c','d','e','f','g','h','i','j'),
   ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'),
@@ -44,7 +44,7 @@ if (!$mysql_errname)
 
   # Invalid values (produce warnings, except for mediumtext and longtext columns for which the values are within limits)
 
-  INSERT INTO t1 VALUES
+  INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES
   ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) );
 
   --sorted_result
diff --git a/mysql-test/suite/storage_engine/type_text.result b/mysql-test/suite/storage_engine/type_text.result
index b3ca7a8d9da..88204e2235e 100644
--- a/mysql-test/suite/storage_engine/type_text.result
+++ b/mysql-test/suite/storage_engine/type_text.result
@@ -22,7 +22,7 @@ t17m	longtext	#	#	#
 tt	tinytext	#	#	#	
 m	mediumtext	#	#	#	
 l	longtext	#	#	#	
-INSERT INTO t1 VALUES
+INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES
 ('','','','','','','','','',''),
 ('a','b','c','d','e','f','g','h','i','j'),
 ('test1','test2','test3','test4','test5','test6','test7','test8','test9','test10'),
@@ -33,7 +33,7 @@ LENGTH(t)	LENGTH(t0)	LENGTH(t1)	LENGTH(t300)	LENGTH(tm)	LENGTH(t70k)	LENGTH(t17m
 1	1	1	1	1	1	1	1	1	1
 5	5	5	5	5	5	5	5	5	6
 65535	65535	255	65535	65535	1048576	1048576	255	1048576	1048576
-INSERT INTO t1 VALUES
+INSERT INTO t1 (t,t0,t1,t300,tm,t70k,t17m,tt,m,l) VALUES
 ( REPEAT('a',65536), REPEAT('b',65536), REPEAT('c',256), REPEAT('d',65536), REPEAT('e',65536), REPEAT('f',1048576), REPEAT('g',1048576), REPEAT('h',256), REPEAT('i',1048576), REPEAT('j',1048576) );
 Warnings:
 Warning	1265	Data truncated for column 't' at row 1
diff --git a/mysql-test/suite/storage_engine/type_varchar.inc b/mysql-test/suite/storage_engine/type_varchar.inc
index 472f74e0dd1..e2da3deba39 100644
--- a/mysql-test/suite/storage_engine/type_varchar.inc
+++ b/mysql-test/suite/storage_engine/type_varchar.inc
@@ -72,7 +72,7 @@ if (!$mysql_errname)
             o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. ');
 
   --sorted_result
-  SELECT * FROM t1;
+  SELECT v0,v1,v64,v65000 FROM t1;
 
   # Invalid values
 
diff --git a/mysql-test/suite/storage_engine/type_varchar.result b/mysql-test/suite/storage_engine/type_varchar.result
index 055c8dcd7ca..f5e9bb416fe 100644
--- a/mysql-test/suite/storage_engine/type_varchar.result
+++ b/mysql-test/suite/storage_engine/type_varchar.result
@@ -51,7 +51,7 @@ INSERT INTO t1 (v0,v1,v64,v65000) VALUES ('','y','Once there, double check that
 
       * MySQL 5.0 Certification Study Guide, By Paul DuBois, Stefan Hinz, Carsten Pedersen
             o This is the official guide to cover the passing of the two MySQL Certification examinations. It is valid till version 5.0 of the server, so while it misses all the features available in MySQL 5.1 and greater (including MariaDB 5.1 and greater), it provides a good basic understanding of MySQL for the end-user. ');
-SELECT * FROM t1;
+SELECT v0,v1,v64,v65000 FROM t1;
 v0	v1	v64	v65000
 
 
diff --git a/mysql-test/suite/storage_engine/update.result b/mysql-test/suite/storage_engine/update.result
index 3b96558c7c5..a07a1b57a5c 100644
--- a/mysql-test/suite/storage_engine/update.result
+++ b/mysql-test/suite/storage_engine/update.result
@@ -3,7 +3,7 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTO
 INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(10000,'foobar');
 INSERT INTO t1 (a,b) SELECT a, b FROM t1;
 UPDATE t1 SET a=a+100;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 101	a
 101	a
@@ -18,7 +18,7 @@ a	b
 105	e
 105	e
 UPDATE t1 SET a=a-100, b=DEFAULT WHERE a>100;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	NULL
 1	NULL
@@ -33,7 +33,7 @@ a	b
 5	NULL
 5	NULL
 UPDATE t1 SET b = 'update' WHERE a <= 4 ORDER BY b DESC, a ASC LIMIT 1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	NULL
 1	update
diff --git a/mysql-test/suite/storage_engine/update.test b/mysql-test/suite/storage_engine/update.test
index 4f892fa547d..ad36382f8be 100644
--- a/mysql-test/suite/storage_engine/update.test
+++ b/mysql-test/suite/storage_engine/update.test
@@ -24,16 +24,16 @@ if ($mysql_errname)
 if (!$mysql_errname)
 {
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   UPDATE t1 SET a=a-100, b=DEFAULT WHERE a>100;
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   # ORDER BY and LIMIT
   UPDATE t1 SET b = 'update' WHERE a <= 4 ORDER BY b DESC, a ASC LIMIT 1;
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 }
 
 # Cleanup
diff --git a/mysql-test/suite/storage_engine/update_ignore.result b/mysql-test/suite/storage_engine/update_ignore.result
index 26b7168196a..27e62c4f966 100644
--- a/mysql-test/suite/storage_engine/update_ignore.result
+++ b/mysql-test/suite/storage_engine/update_ignore.result
@@ -5,7 +5,7 @@ INSERT INTO t1 (a,b) SELECT a, b FROM t1;
 CREATE TABLE t2 (c <CHAR_COLUMN>, d <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t2 (c,d) SELECT b, a FROM t1;
 UPDATE IGNORE t1 SET b = 'upd1' WHERE b IS NOT NULL ORDER BY a LIMIT 1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 1	upd1
@@ -23,7 +23,7 @@ UPDATE IGNORE t1, t2 SET b = 'upd2a', c = 'upd2b'
 WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 );
 Warnings:
 Warning	1242	Subquery returns more than 1 row
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 1	upd2a
@@ -37,7 +37,7 @@ a	b
 4	upd2a
 5	upd2a
 5	upd2a
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 upd2b	1
 upd2b	1
diff --git a/mysql-test/suite/storage_engine/update_ignore.test b/mysql-test/suite/storage_engine/update_ignore.test
index ddd4f7405a3..98f817b0e77 100644
--- a/mysql-test/suite/storage_engine/update_ignore.test
+++ b/mysql-test/suite/storage_engine/update_ignore.test
@@ -26,14 +26,14 @@ if ($mysql_errname)
 if (!$mysql_errname)
 {
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   UPDATE IGNORE t1, t2 SET b = 'upd2a', c = 'upd2b' 
     WHERE c < b OR a != ( SELECT 1 UNION SELECT 2 );
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   --sorted_result
-  SELECT * FROM t2;
+  SELECT c,d FROM t2;
 }
 
 # Cleanup
diff --git a/mysql-test/suite/storage_engine/update_low_prio.result b/mysql-test/suite/storage_engine/update_low_prio.result
index 31a31b6be62..1e038103870 100644
--- a/mysql-test/suite/storage_engine/update_low_prio.result
+++ b/mysql-test/suite/storage_engine/update_low_prio.result
@@ -19,7 +19,7 @@ a+SLEEP(1)
 11
 12
 connection default;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 21	foobar
 22	b
@@ -37,7 +37,7 @@ a+SLEEP(1)
 21
 22
 connection default;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 41	foobar
 42	b
@@ -56,7 +56,7 @@ a+SLEEP(1)
 41
 42
 connection default;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 71	foobar
 72	b
diff --git a/mysql-test/suite/storage_engine/update_low_prio.test b/mysql-test/suite/storage_engine/update_low_prio.test
index 6c089c7172f..8cc1ad07d5c 100644
--- a/mysql-test/suite/storage_engine/update_low_prio.test
+++ b/mysql-test/suite/storage_engine/update_low_prio.test
@@ -76,7 +76,7 @@ if ($mysql_errname)
 }
 
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 # UPDATE LOW_PRIORITY
 
@@ -107,7 +107,7 @@ SELECT a+SLEEP(1) FROM t1;
 --connection default
 --reap
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 SET LOW_PRIORITY_UPDATES = 1;
 
@@ -152,7 +152,7 @@ if ($mysql_errname)
   --source unexpected_result.inc
 }
 --sorted_result
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 
 --disconnect con1
 --disconnect con2
diff --git a/mysql-test/suite/storage_engine/update_multi.result b/mysql-test/suite/storage_engine/update_multi.result
index 42b2f239dd2..909cce8213d 100644
--- a/mysql-test/suite/storage_engine/update_multi.result
+++ b/mysql-test/suite/storage_engine/update_multi.result
@@ -5,7 +5,7 @@ INSERT INTO t1 (a,b) SELECT a, b FROM t1;
 CREATE TABLE t2 (c <CHAR_COLUMN>, d <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 INSERT INTO t2 (c,d) SELECT b, a FROM t1;
 UPDATE t1, t2 SET t1.a = t2.d+100, t2.c = 'multi' WHERE c < b AND a + d != 1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 1	a
@@ -19,7 +19,7 @@ a	b
 101	e
 101	foobar
 101	foobar
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 foobar	10000
 foobar	10000
@@ -34,7 +34,7 @@ multi	4
 multi	5
 multi	5
 UPDATE t2, t1 SET t2.d = DEFAULT WHERE c = 'foobar' and b = c;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	a
 1	a
@@ -48,7 +48,7 @@ a	b
 101	e
 101	foobar
 101	foobar
-SELECT * FROM t2;
+SELECT c,d FROM t2;
 c	d
 foobar	NULL
 foobar	NULL
diff --git a/mysql-test/suite/storage_engine/update_multi.test b/mysql-test/suite/storage_engine/update_multi.test
index 589a8319382..4820eb5df46 100644
--- a/mysql-test/suite/storage_engine/update_multi.test
+++ b/mysql-test/suite/storage_engine/update_multi.test
@@ -26,15 +26,15 @@ if ($mysql_errname)
 if (!$mysql_errname)
 {
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   --sorted_result
-  SELECT * FROM t2;
+  SELECT c,d FROM t2;
 
   UPDATE t2, t1 SET t2.d = DEFAULT WHERE c = 'foobar' and b = c;
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
   --sorted_result
-  SELECT * FROM t2;
+  SELECT c,d FROM t2;
 }
 
 # Cleanup
diff --git a/mysql-test/suite/storage_engine/update_with_keys.result b/mysql-test/suite/storage_engine/update_with_keys.result
index 8250f31a19e..ed62c96a5e6 100644
--- a/mysql-test/suite/storage_engine/update_with_keys.result
+++ b/mysql-test/suite/storage_engine/update_with_keys.result
@@ -5,7 +5,7 @@ UPDATE t1 SET a=100, b='f' WHERE b IN ('b','c');
 UPDATE t1 SET b='m' WHERE b = 'f';
 UPDATE t1 SET b='z' WHERE a < 2;
 UPDATE t1 SET b='';
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 1	
 100	
@@ -25,7 +25,7 @@ ERROR 23000: Duplicate entry '205' for key 'a'
 # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
 # If you got a difference in error message, just add it to rdiff file
 UPDATE t1 SET a=12345 ORDER BY a, b LIMIT 1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 12345	a
 200	f
@@ -51,7 +51,7 @@ ERROR 23000: Duplicate entry '4-d' for key 'a'
 # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
 # If you got a difference in error message, just add it to rdiff file
 UPDATE t1 SET a=a+1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 101	a
 2	a
@@ -74,7 +74,7 @@ ERROR 23000: Duplicate entry '205' for key 'PRIMARY'
 # Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
 # If you got a difference in error message, just add it to rdiff file
 UPDATE t1 SET a=12345 ORDER BY a DESC, b LIMIT 1;
-SELECT * FROM t1;
+SELECT a,b FROM t1;
 a	b
 0	a
 12345	e
diff --git a/mysql-test/suite/storage_engine/update_with_keys.test b/mysql-test/suite/storage_engine/update_with_keys.test
index 578ee3b3294..77843365cef 100644
--- a/mysql-test/suite/storage_engine/update_with_keys.test
+++ b/mysql-test/suite/storage_engine/update_with_keys.test
@@ -32,7 +32,7 @@ if (!$mysql_errname)
     UPDATE t1 SET b='z' WHERE a < 2;
     UPDATE t1 SET b='';
     --sorted_result
-    SELECT * FROM t1;
+    SELECT a,b FROM t1;
   }
   DROP TABLE t1;
 }
@@ -62,7 +62,7 @@ if (!$mysql_errname)
     --source check_errors.inc
     UPDATE t1 SET a=12345 ORDER BY a, b LIMIT 1;
     --sorted_result
-    SELECT * FROM t1;
+    SELECT a,b FROM t1;
     
     # We'll check that the next update causes an error,
     # but won't check the result because it might be different depending
@@ -101,7 +101,7 @@ if (!$mysql_errname)
     --source check_errors.inc
     UPDATE t1 SET a=a+1;
     --sorted_result
-    SELECT * FROM t1;
+    SELECT a,b FROM t1;
     --let $error_codes = ER_DUP_ENTRY,ER_DUP_KEY
     UPDATE t1 SET b='z';
     --source check_errors.inc
@@ -135,7 +135,7 @@ if (!$mysql_errname)
     UPDATE t1 SET a=12345 ORDER BY a DESC, b LIMIT 1;
 
     --sorted_result
-    SELECT * FROM t1;
+    SELECT a,b FROM t1;
 
     # We'll check that the next update causes an error,
     # but won't check the result because it might be different depending
diff --git a/mysql-test/suite/storage_engine/vcol.result b/mysql-test/suite/storage_engine/vcol.result
index bae7636f6cb..d51ab038576 100644
--- a/mysql-test/suite/storage_engine/vcol.result
+++ b/mysql-test/suite/storage_engine/vcol.result
@@ -9,7 +9,7 @@ INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 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
@@ -26,7 +26,7 @@ INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 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
@@ -43,7 +43,7 @@ INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 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
@@ -60,7 +60,7 @@ INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 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
diff --git a/mysql-test/suite/storage_engine/vcol.test b/mysql-test/suite/storage_engine/vcol.test
index 90819ffbd47..e6257ab324b 100644
--- a/mysql-test/suite/storage_engine/vcol.test
+++ b/mysql-test/suite/storage_engine/vcol.test
@@ -24,7 +24,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a) VALUES (1),(2);
   INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 
@@ -37,7 +37,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a) VALUES (1),(2);
   INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 
@@ -50,7 +50,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a) VALUES (1),(2);
   INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 
@@ -63,7 +63,7 @@ if (!$mysql_errname)
   INSERT INTO t1 (a) VALUES (1),(2);
   INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
   --sorted_result
-  SELECT * FROM t1;
+  SELECT a,b FROM t1;
 
   DROP TABLE t1;
 }
author	Elena Stepanova <elenst@ubuntu11.home>	2013-02-03 02:53:57 +0400
committer	Elena Stepanova <elenst@ubuntu11.home>	2013-02-03 02:53:57 +0400
commit	7f444caa0ad6b2eddc730de3cd9c94bfb9037b51 (patch)
tree	2ce4331394ace7fff468791666e8f03286720990 /mysql-test/suite/storage_engine
parent	1701ee335740c970696fab081cfeac582991076d (diff)
download	mariadb-git-7f444caa0ad6b2eddc730de3cd9c94bfb9037b51.tar.gz