Merge mysql.com:/home/gluh/MySQL/Merge/5.0

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/select.result:
  manual merge
mysql-test/t/select.test:
  manual merge

1 files changed, 47 insertions, 3 deletions

diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index fee426a8646..56396f8a93f 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -3504,9 +3504,6 @@ CREATE VIEW v1 AS SELECT 1 AS `  `;
 --error 1166
 CREATE VIEW v1 AS SELECT (SELECT 1 AS `  `);
 
-CREATE VIEW v1 AS SELECT 1 AS ` x`;
-SELECT `x` FROM v1;
-
 --error 1166
 ALTER VIEW v1 AS SELECT 1 AS ` `;
 
@@ -3613,5 +3610,52 @@ SELECT c32 FROM t1, t2, t3 WHERE t1.c11 IN (1, 3, 5) AND
                            ORDER BY c32 DESC; 
 
 DROP TABLE t1, t2, t3;
+###########################################################################
+
+--echo
+--echo #
+--echo # Bug#30736: Row Size Too Large Error Creating a Table and
+--echo # Inserting Data.
+--echo #
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+--enable_warnings
+
+--echo
+
+CREATE TABLE t1(
+  c1 DECIMAL(10, 2),
+  c2 FLOAT);
+
+--echo
+
+INSERT INTO t1 VALUES (0, 1), (2, 3), (4, 5);
+
+--echo
+
+CREATE TABLE t2(
+  c3 DECIMAL(10, 2))
+  SELECT
+    c1 * c2 AS c3
+  FROM t1;
+
+--echo
+
+SELECT * FROM t1;
+
+--echo
+
+SELECT * FROM t2;
+
+--echo
+
+DROP TABLE t1;
+DROP TABLE t2;
+
+--echo
+
+###########################################################################
 
 --echo End of 5.0 tests