diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 13:41:29 +0200 |
commit | c32f71af7e4b747de223bf6b44e691941f5997cf (patch) | |
tree | 03270b9a849e165f1c8605102ee06bced2331477 /sql/field_conv.cc | |
parent | 4d41f316c3c1c05fdd35cbdc1b626d596b89af40 (diff) | |
parent | 555c6632c69d707cc1641ef396e7b66a65f14bdc (diff) | |
download | mariadb-git-c32f71af7e4b747de223bf6b44e691941f5997cf.tar.gz |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r-- | sql/field_conv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 38457e91935..88fdb1387a3 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -230,7 +230,7 @@ static void do_skip(Copy_field *copy __attribute__((unused))) note: if the record we're copying from is NULL-complemetned (i.e. from_field->table->null_row==1), it will also have all NULLable columns to be - set to NULLs, so we dont need to check table->null_row here. + set to NULLs, so we don't need to check table->null_row here. */ static void do_copy_null(Copy_field *copy) |