diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-11 20:51:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-11 20:51:09 +0200 |
| commit | 7ae555c1148f190f91d00499c2541fe7c2d4f555 (patch) | |
| tree | 861c0054243efee45b7a4b72135f897afc8972ba /sql/item.cc | |
| parent | b9631e310b7cadf8711eef643e432d7e816680b4 (diff) | |
| parent | 754e7eff2872995e2b6e62f9da7448587a411c7b (diff) | |
| download | mariadb-git-7ae555c1148f190f91d00499c2541fe7c2d4f555.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
80% reverted
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item.cc b/sql/item.cc index abcf48fc270..3448b236640 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5902,10 +5902,6 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length) field= new Field_double((uchar*) 0, max_length, null_ptr, 0, Field::NONE, name, decimals, 0, unsigned_flag); break; - case MYSQL_TYPE_NULL: - field= new Field_null((uchar*) 0, max_length, Field::NONE, - name, &my_charset_bin); - break; case MYSQL_TYPE_INT24: field= new Field_medium((uchar*) 0, max_length, null_ptr, 0, Field::NONE, name, 0, unsigned_flag); @@ -5939,6 +5935,7 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length) DBUG_ASSERT(0); /* If something goes awfully wrong, it's better to get a string than die */ case MYSQL_TYPE_STRING: + case MYSQL_TYPE_NULL: if (fixed_length && !too_big_for_varchar()) { field= new Field_string(max_length, maybe_null, name, |