summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/innodb.result10
-rw-r--r--mysql-test/r/myisam.result6
-rw-r--r--sql/sql_table.cc3
3 files changed, 10 insertions, 9 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 163b9302b5c..026ad53193d 100644
--- a/mysql-test/r/innodb.result
+++ b/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
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index f60996ba31f..7d18c96bf5f 100644
--- a/mysql-test/r/myisam.result
+++ b/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
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index b1a24543a6b..3c6ca618107 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4218,7 +4218,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);