bk commit into 5.2 tree (istruewing:1.2538)

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.2 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-06 17:11:45+02:00, istruewing@stripped +5 -0
  Post merge fixes
  Test result fixes
  Typo fix

  mysql-test/r/ctype_cp932_binlog_stm.result@stripped, 2007-07-06 17:11:41+02:00,
istruewing@stripped +3 -3
    Post merge fixes
    Test result fixes

  mysql-test/r/show_check.result@stripped, 2007-07-06 17:11:41+02:00, istruewing@stripped
+7 -5
    Post merge fixes
    Test result fixes

  mysql-test/r/subselect_no_opts.result@stripped, 2007-07-06 17:11:41+02:00,
istruewing@stripped +33 -0
    Post merge fixes
    Test result fixes

  mysql-test/r/subselect_no_semijoin.result@stripped, 2007-07-06 17:11:41+02:00,
istruewing@stripped +33 -0
    Post merge fixes
    Test result fixes

  sql/table.cc@stripped, 2007-07-06 17:11:41+02:00, istruewing@stripped +2 -1
    Post merge fixes
    Typo fix

diff -Nrup a/mysql-test/r/ctype_cp932_binlog_stm.result
b/mysql-test/r/ctype_cp932_binlog_stm.result
--- a/mysql-test/r/ctype_cp932_binlog_stm.result	2007-07-06 12:36:22 +02:00
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2007-07-06 17:11:41 +02:00
@@ -40,9 +40,9 @@ IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	783	Query	1	1002	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932
0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	1002	Query	1	1091	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1091	Query	1	1170	use `test`; DROP TABLE t4
+master-bin.000001	783	Query	1	999	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932
0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	999	Query	1	1085	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1085	Query	1	1161	use `test`; DROP TABLE t4
 End of 5.0 tests
 SHOW BINLOG EVENTS FROM 364;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
diff -Nrup a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
--- a/mysql-test/r/show_check.result	2007-07-06 12:36:22 +02:00
+++ b/mysql-test/r/show_check.result	2007-07-06 17:11:41 +02:00
@@ -73,6 +73,7 @@ def			STATISTICS	PACKED	Packed	253	10	0	
 def			STATISTICS	NULLABLE	Null	253	3	0	N	1	0	8
 def			STATISTICS	INDEX_TYPE	Index_type	253	16	5	N	1	0	8
 def			STATISTICS	COMMENT	Comment	253	16	0	Y	0	0	8
+def			STATISTICS	INDEX_COMMENT	Index_Comment	253	1024	0	N	1	0	8
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
 t1	0	PRIMARY	1	a	A	5	NULL	NULL		BTREE		
 t1	1	b	1	b	A	1	NULL	NULL		BTREE		
@@ -133,7 +134,7 @@ def			TABLES	CHECK_TIME	Check_time	12	19
 def			TABLES	TABLE_COLLATION	Collation	253	64	0	Y	0	0	8
 def			TABLES	CHECKSUM	Checksum	8	21	0	Y	32800	0	63
 def			TABLES	CREATE_OPTIONS	Create_options	253	255	0	Y	0	0	8
-def			TABLES	TABLE_COMMENT	Comment	253	80	0	N	1	0	8
+def			TABLES	TABLE_COMMENT	Comment	253	2048	0	N	1	0	8
 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
 show databases;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max
length	Is_null	Flags	Decimals	Charsetnr
@@ -871,8 +872,9 @@ def			STATISTICS	PACKED	Packed	253	30	0	
 def			STATISTICS	NULLABLE	Null	253	9	0	N	1	0	33
 def			STATISTICS	INDEX_TYPE	Index_type	253	48	5	N	1	0	33
 def			STATISTICS	COMMENT	Comment	253	48	0	Y	0	0	33
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-t1	0	PRIMARY	1	c	A	0	NULL	NULL		BTREE	
+def			STATISTICS	INDEX_COMMENT	Index_Comment	253	3072	0	N	1	0	33
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
+t1	0	PRIMARY	1	c	A	0	NULL	NULL		BTREE		
 ----------------------------------------------------------------
 SELECT
 TABLE_CATALOG,
@@ -895,7 +897,7 @@ def			TABLES	ENGINE	ENGINE	253	192	6	Y	0
 def			TABLES	ROW_FORMAT	ROW_FORMAT	253	30	5	Y	0	0	33
 def			TABLES	TABLE_COLLATION	TABLE_COLLATION	253	192	17	Y	0	0	33
 def			TABLES	CREATE_OPTIONS	CREATE_OPTIONS	253	765	0	Y	0	0	33
-def			TABLES	TABLE_COMMENT	TABLE_COMMENT	253	240	0	N	1	0	33
+def			TABLES	TABLE_COMMENT	TABLE_COMMENT	253	6144	0	N	1	0	33
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	ROW_FORMAT	TABLE_COLLATION	CREATE_OPTIONS	TABLE_COMMENT
 NULL	test	t1	BASE TABLE	MyISAM	Fixed	latin1_swedish_ci		
 ----------------------------------------------------------------
@@ -930,7 +932,7 @@ def			COLUMNS	COLUMN_TYPE	COLUMN_TYPE	25
 def			COLUMNS	COLUMN_KEY	COLUMN_KEY	253	9	3	N	1	0	33
 def			COLUMNS	EXTRA	EXTRA	253	60	0	N	1	0	33
 def			COLUMNS	PRIVILEGES	PRIVILEGES	253	240	31	N	1	0	33
-def			COLUMNS	COLUMN_COMMENT	COLUMN_COMMENT	253	765	0	N	1	0	33
+def			COLUMNS	COLUMN_COMMENT	COLUMN_COMMENT	253	3072	0	N	1	0	33
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	test	t1	c	NULL	NO	int	NULL	NULL	int(11)	PRI		select,insert,update,references	
 ----------------------------------------------------------------
diff -Nrup a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
--- a/mysql-test/r/subselect_no_opts.result	2007-07-01 00:53:26 +02:00
+++ b/mysql-test/r/subselect_no_opts.result	2007-07-06 17:11:41 +02:00
@@ -4101,6 +4101,39 @@ d1
 1
 1
 DROP TABLE t1,t2;
+CREATE TABLE t1 (a INTEGER, b INTEGER);
+CREATE TABLE t2 (x INTEGER);
+INSERT INTO t1 VALUES (1,11), (2,22), (2,22);
+INSERT INTO t2 VALUES (1), (2);
+SELECT a, COUNT(b), (SELECT COUNT(b) FROM t2) FROM t1 GROUP BY a;
+ERROR 21000: Subquery returns more than 1 row
+SELECT a, COUNT(b), (SELECT COUNT(b)+0 FROM t2) FROM t1 GROUP BY a;
+ERROR 21000: Subquery returns more than 1 row
+SELECT (SELECT SUM(t1.a)/AVG(t2.x) FROM t2) FROM t1;
+(SELECT SUM(t1.a)/AVG(t2.x) FROM t2)
+3.3333
+DROP TABLE t1,t2;
+CREATE TABLE t1 (a INT, b INT);
+INSERT INTO t1 VALUES (1, 2), (1,3), (1,4), (2,1), (2,2);
+SELECT a1.a, COUNT(*) FROM t1 a1 WHERE a1.a = 1
+AND EXISTS( SELECT a2.a FROM t1 a2 WHERE a2.a = a1.a)
+GROUP BY a1.a;
+a	COUNT(*)
+1	3
+DROP TABLE t1;
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (a INT);
+INSERT INTO t1 VALUES (1),(2);
+INSERT INTO t2 VALUES (1),(2);
+SELECT (SELECT SUM(t1.a) FROM t2 WHERE a=0) FROM t1;
+(SELECT SUM(t1.a) FROM t2 WHERE a=0)
+NULL
+SELECT (SELECT SUM(t1.a) FROM t2 WHERE a!=0) FROM t1;
+ERROR 21000: Subquery returns more than 1 row
+SELECT (SELECT SUM(t1.a) FROM t2 WHERE a=1) FROM t1;
+(SELECT SUM(t1.a) FROM t2 WHERE a=1)
+3
+DROP TABLE t1,t2;
 End of 5.0 tests.
 CREATE TABLE t1 (a int, b int);
 INSERT INTO t1 VALUES (2,22),(1,11),(2,22);
diff -Nrup a/mysql-test/r/subselect_no_semijoin.result
b/mysql-test/r/subselect_no_semijoin.result
--- a/mysql-test/r/subselect_no_semijoin.result	2007-07-01 00:53:26 +02:00
+++ b/mysql-test/r/subselect_no_semijoin.result	2007-07-06 17:11:41 +02:00
@@ -4101,6 +4101,39 @@ d1
 1
 1
 DROP TABLE t1,t2;
+CREATE TABLE t1 (a INTEGER, b INTEGER);
+CREATE TABLE t2 (x INTEGER);
+INSERT INTO t1 VALUES (1,11), (2,22), (2,22);
+INSERT INTO t2 VALUES (1), (2);
+SELECT a, COUNT(b), (SELECT COUNT(b) FROM t2) FROM t1 GROUP BY a;
+ERROR 21000: Subquery returns more than 1 row
+SELECT a, COUNT(b), (SELECT COUNT(b)+0 FROM t2) FROM t1 GROUP BY a;
+ERROR 21000: Subquery returns more than 1 row
+SELECT (SELECT SUM(t1.a)/AVG(t2.x) FROM t2) FROM t1;
+(SELECT SUM(t1.a)/AVG(t2.x) FROM t2)
+3.3333
+DROP TABLE t1,t2;
+CREATE TABLE t1 (a INT, b INT);
+INSERT INTO t1 VALUES (1, 2), (1,3), (1,4), (2,1), (2,2);
+SELECT a1.a, COUNT(*) FROM t1 a1 WHERE a1.a = 1
+AND EXISTS( SELECT a2.a FROM t1 a2 WHERE a2.a = a1.a)
+GROUP BY a1.a;
+a	COUNT(*)
+1	3
+DROP TABLE t1;
+CREATE TABLE t1 (a INT);
+CREATE TABLE t2 (a INT);
+INSERT INTO t1 VALUES (1),(2);
+INSERT INTO t2 VALUES (1),(2);
+SELECT (SELECT SUM(t1.a) FROM t2 WHERE a=0) FROM t1;
+(SELECT SUM(t1.a) FROM t2 WHERE a=0)
+NULL
+SELECT (SELECT SUM(t1.a) FROM t2 WHERE a!=0) FROM t1;
+ERROR 21000: Subquery returns more than 1 row
+SELECT (SELECT SUM(t1.a) FROM t2 WHERE a=1) FROM t1;
+(SELECT SUM(t1.a) FROM t2 WHERE a=1)
+3
+DROP TABLE t1,t2;
 End of 5.0 tests.
 CREATE TABLE t1 (a int, b int);
 INSERT INTO t1 VALUES (2,22),(1,11),(2,22);
diff -Nrup a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2007-07-06 12:36:22 +02:00
+++ b/sql/table.cc	2007-07-06 17:11:41 +02:00
@@ -2392,7 +2392,8 @@ File create_frm(THD *thd, const char *na
       9 extra bytes (padding for safety? alignment?)
       comments
     */
-    key_length= keys * (8 + MAX_REF_PARTS * 9 + NAME_LEN + 1) + 16 +
key_comments_total_bytes;
+    key_length= (keys * (8 + MAX_REF_PARTS * 9 + NAME_LEN + 1) + 16 +
+                 key_comment_total_bytes);
     length= next_io_size((ulong) (IO_SIZE+key_length+reclength+
                                   create_info->extra_size));
     int4store(fileinfo+10,length);