bk commit into 5.0 tree (svoj:1.2385)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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-01-25 01:26:57+04:00, svoj@stripped +5 -0
  Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
  into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
  MERGE: 1.2341.4.21

  mysql-test/r/myisam.result@stripped, 2007-01-25 01:26:55+04:00, svoj@stripped +21 -21
    Manually merged.
    MERGE: 1.90.1.6

  mysql-test/r/symlink.result@stripped, 2007-01-25 01:22:47+04:00, svoj@stripped +0 -21
    Auto merged
    MERGE: 1.26.1.2

  mysql-test/t/myisam.test@stripped, 2007-01-25 01:26:55+04:00, svoj@stripped +27 -27
    Manually merged.
    MERGE: 1.70.2.6

  mysql-test/t/symlink.test@stripped, 2007-01-25 01:22:47+04:00, svoj@stripped +0 -37
    Auto merged
    MERGE: 1.18.1.2

  sql/table.cc@stripped, 2007-01-25 01:22:47+04:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.237.1.6

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/merge/mysql-5.0-engines/RESYNC

--- 1.240/sql/table.cc	2007-01-25 01:27:03 +04:00
+++ 1.241/sql/table.cc	2007-01-25 01:27:03 +04:00
@@ -452,6 +452,8 @@ int openfrm(THD *thd, const char *name, 
   memcpy(comment_pos, disk_buff+read_length-com_length, com_length);
 
   fix_type_pointers(&int_array, &share->fieldnames, 1, &names);
+  if (share->fieldnames.count != share->fields)
+    goto err;
   fix_type_pointers(&int_array, share->intervals, interval_count,
 		    &names);
 

--- 1.95/mysql-test/r/myisam.result	2007-01-25 01:27:03 +04:00
+++ 1.96/mysql-test/r/myisam.result	2007-01-25 01:27:03 +04:00
@@ -922,6 +922,27 @@ SET @@myisam_repair_threads=1;
 SHOW VARIABLES LIKE 'myisam_repair%';
 Variable_name	Value
 myisam_repair_threads	1
+CREATE TABLE t1(a VARCHAR(16));
+INSERT INTO t1 VALUES('aaaaaaaa'),(NULL);
+UPDATE t1 AS ta1, t1 AS ta2 SET ta1.a='aaaaaaaaaaaaaaaa';
+SELECT * FROM t1;
+a
+aaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaa
+DROP TABLE t1;
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(1),(2);
+UPDATE t1,t1 AS t2 SET t1.a=t1.a+2 WHERE t1.a=t2.a-1;
+SELECT * FROM t1 ORDER BY a;
+a
+2
+3
+DROP TABLE t1;
+CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100;
+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	MyISAM	10	Dynamic	X	X	X	72057594037927935	X	X	X	X	X	X	latin1_swedish_ci	X	max_rows=4100100100
avg_row_length=70100	
+DROP TABLE t1;
 End of 4.1 tests
 set storage_engine=MyISAM;
 drop table if exists t1,t2,t3;

--- 1.75/mysql-test/t/myisam.test	2007-01-25 01:27:03 +04:00
+++ 1.76/mysql-test/t/myisam.test	2007-01-25 01:27:03 +04:00
@@ -847,6 +847,33 @@ DROP TABLE t1;
 SET @@myisam_repair_threads=1;
 SHOW VARIABLES LIKE 'myisam_repair%';
 
+#
+# BUG#21310 - Trees in SQL causing a "crashed" table with MyISAM storage
+#             engine
+#
+
+# A simplified test case that reflect crashed table issue.
+CREATE TABLE t1(a VARCHAR(16));
+INSERT INTO t1 VALUES('aaaaaaaa'),(NULL);
+UPDATE t1 AS ta1, t1 AS ta2 SET ta1.a='aaaaaaaaaaaaaaaa';
+SELECT * FROM t1;
+DROP TABLE t1;
+
+# A test case that reflect wrong result set.
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES(1),(2);
+UPDATE t1,t1 AS t2 SET t1.a=t1.a+2 WHERE t1.a=t2.a-1;
+SELECT * FROM t1 ORDER BY a;
+DROP TABLE t1;
+
+#
+# Bug#24607 - MyISAM pointer size determined incorrectly
+#
+CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100;
+--replace_column 5 X 6 X 7 X 9 X 10 X 11 X 12 X 13 X 14 X 16 X
+SHOW TABLE STATUS LIKE 't1';
+DROP TABLE t1;
+
 --echo End of 4.1 tests