summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 89bf1d78e0b..fe3d3918636 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4043,6 +4043,7 @@ void handler::print_error(int error, myf errflag)
if ((int) key_nr >= 0 && key_nr < table->s->keys)
{
print_keydup_error(table, &table->key_info[key_nr], errflag);
+ table->file->lookup_errkey= -1;
DBUG_VOID_RETURN;
}
}
@@ -5492,6 +5493,9 @@ int handler::calculate_checksum()
for (uint i= 0; i < table->s->fields; i++ )
{
Field *f= table->field[i];
+ if (!f->stored_in_db())
+ continue;
+
if (! thd->variables.old_mode && f->is_real_null(0))
{