diff options
Diffstat (limited to 'innobase/row/row0sel.c')
| -rw-r--r-- | innobase/row/row0sel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index 9ebd47c25bf..a516699edf9 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -2115,8 +2115,14 @@ row_sel_store_mysql_rec( extern_field_heap = NULL; } } else { - mysql_rec[templ->mysql_null_byte_offset] |= + if (!templ->mysql_null_bit_mask) { + fprintf(stderr, +"InnoDB: Error: trying to return an SQL NULL field in a non-null\n" +"innoDB: column! Table name %s\n", prebuilt->table->name); + } else { + mysql_rec[templ->mysql_null_byte_offset] |= (byte) (templ->mysql_null_bit_mask); + } } } } |