bk commit into 5.1 tree (ingo:1.2099)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev 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
  1.2099 06/02/14 09:29:37 ingo@stripped +3 -0
  Merge mysql.com:/home/mydev/mysql-5.0-bug8841
  into  mysql.com:/home/mydev/mysql-5.1-bug8841

  sql/sql_table.cc
    1.305 06/02/14 09:29:30 ingo@stripped +0 -0
    Auto merged

  mysql-test/r/myisam.result
    1.74 06/02/14 09:29:29 ingo@stripped +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.160 06/02/14 09:29:29 ingo@stripped +0 -0
    Auto merged

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-bug8841/RESYNC

--- 1.304/sql/sql_table.cc	2006-02-13 08:53:43 +01:00
+++ 1.305/sql/sql_table.cc	2006-02-14 09:29:30 +01:00
@@ -5370,7 +5370,8 @@
 	    for (uint i= 0; i < t->s->fields; i++ )
 	    {
 	      Field *f= t->field[i];
-	      if (f->type() == FIELD_TYPE_BLOB)
+	      if ((f->type() == FIELD_TYPE_BLOB) ||
+                  (f->type() == MYSQL_TYPE_VARCHAR))
 	      {
 		String tmp;
 		f->val_str(&tmp);

--- 1.159/mysql-test/r/innodb.result	2006-02-10 19:34:30 +01:00
+++ 1.160/mysql-test/r/innodb.result	2006-02-14 09:29:29 +01:00
@@ -1457,16 +1457,16 @@
 checksum table t1, t2, t3, t4;
 Table	Checksum
 test.t1	2948697075
-test.t2	3835700799
-test.t3	3835700799
+test.t2	2948697075
+test.t3	2948697075
 test.t4	NULL
 Warnings:
 Error	1146	Table 'test.t4' doesn't exist
 checksum table t1, t2, t3, t4 extended;
 Table	Checksum
-test.t1	3092701434
-test.t2	3835700799
-test.t3	3835700799
+test.t1	2948697075
+test.t2	2948697075
+test.t3	2948697075
 test.t4	NULL
 Warnings:
 Error	1146	Table 'test.t4' doesn't exist

--- 1.73/mysql-test/r/myisam.result	2006-02-10 19:34:30 +01:00
+++ 1.74/mysql-test/r/myisam.result	2006-02-14 09:29:29 +01:00
@@ -531,14 +531,14 @@
 checksum table t1, t2, t3;
 Table	Checksum
 test.t1	2948697075
-test.t2	3092701434
+test.t2	2948697075
 test.t3	NULL
 Warnings:
 Error	1146	Table 'test.t3' doesn't exist
 checksum table t1, t2, t3 extended;
 Table	Checksum
-test.t1	3092701434
-test.t2	3092701434
+test.t1	2948697075
+test.t2	2948697075
 test.t3	NULL
 Warnings:
 Error	1146	Table 'test.t3' doesn't exist