diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-19 16:30:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-19 22:05:55 +0200 |
| commit | 91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9 (patch) | |
| tree | 2a21bd15ac2547c12f0f60a8a5f680f0c996cd9b /sql/item.cc | |
| parent | f76a17e355f4ee031f3cabbbd679643d85347834 (diff) | |
| parent | c1b5d2801e81443c8ad02823e12d54f662e4c801 (diff) | |
| download | mariadb-git-91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item.cc b/sql/item.cc index 00d812cb3d7..be04f64862c 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8457,10 +8457,10 @@ bool Item_insert_value::fix_fields(THD *thd, Item **items) } else { - Field *tmp_field= field_arg->field; - /* charset doesn't matter here, it's to avoid sigsegv only */ - tmp_field= new Field_null(0, 0, Field::NONE, field_arg->field->field_name, - &my_charset_bin); + static uchar null_bit=1; + /* charset doesn't matter here */ + Field *tmp_field= new Field_string(0, 0, &null_bit, 1, Field::NONE, + field_arg->field->field_name, &my_charset_bin); if (tmp_field) { tmp_field->init(field_arg->field->table); |