Merge mysql.com:/home/mydev/mysql-5.1

into  mysql.com:/home/mydev/mysql-5.1-bug8841

mysql-test/r/innodb.result

@@ -1457,16 +1457,16 @@ Error	1146	Table 'test.t4' doesn't exist
 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

mysql-test/r/myisam.result

@@ -531,14 +531,14 @@ Error	1146	Table 'test.t3' doesn't exist
 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

sql/sql_table.cc

@@ -5370,7 +5370,8 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt)
 	    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);