database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/mydev/mysql-5.0-bug8841

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


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2006-02-14 09:29:37 +01:00
parent 99047a1837 08394605dc
commit ff6f76b0c2
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/innodb.result
View File

@ -1457,16 +1457,16 @@ Error 1146 Table 'test.t4' doesn't exist
checksum table t1, t2, t3, t4; checksum table t1, t2, t3, t4;
Table Checksum Table Checksum
test.t1 2948697075 test.t1 2948697075
test.t2 3835700799 test.t2 2948697075
test.t3 3835700799 test.t3 2948697075
test.t4 NULL test.t4 NULL
Warnings: Warnings:
Error 1146 Table 'test.t4' doesn't exist Error 1146 Table 'test.t4' doesn't exist
checksum table t1, t2, t3, t4 extended; checksum table t1, t2, t3, t4 extended;
Table Checksum Table Checksum
test.t1 3092701434 test.t1 2948697075
test.t2 3835700799 test.t2 2948697075
test.t3 3835700799 test.t3 2948697075
test.t4 NULL test.t4 NULL
Warnings: Warnings:
Error 1146 Table 'test.t4' doesn't exist Error 1146 Table 'test.t4' doesn't exist

6
mysql-test/r/myisam.result
View File

@ -531,14 +531,14 @@ Error 1146 Table 'test.t3' doesn't exist
checksum table t1, t2, t3; checksum table t1, t2, t3;
Table Checksum Table Checksum
test.t1 2948697075 test.t1 2948697075
test.t2 3092701434 test.t2 2948697075
test.t3 NULL test.t3 NULL
Warnings: Warnings:
Error 1146 Table 'test.t3' doesn't exist Error 1146 Table 'test.t3' doesn't exist
checksum table t1, t2, t3 extended; checksum table t1, t2, t3 extended;
Table Checksum Table Checksum
test.t1 3092701434 test.t1 2948697075
test.t2 3092701434 test.t2 2948697075
test.t3 NULL test.t3 NULL
Warnings: Warnings:
Error 1146 Table 'test.t3' doesn't exist Error 1146 Table 'test.t3' doesn't exist

3
sql/sql_table.cc
View File

@ -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++ ) for (uint i= 0; i < t->s->fields; i++ )
{ {
Field *f= t->field[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; String tmp;
f->val_str(&tmp); f->val_str(&tmp);