diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-19 15:59:05 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-19 15:59:05 +0100 |
| commit | 5480cbd69ec553dbb266533474989ce62774516c (patch) | |
| tree | 3f1a6986c8f700958371ae168aab9940cd26789b /sql/field.cc | |
| parent | 55d284d424c954888536f615731a61d039d80ac1 (diff) | |
| parent | 94f75ffcce4daddfb709bd269fc90d1513833966 (diff) | |
| download | mariadb-git-5480cbd69ec553dbb266533474989ce62774516c.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/union.result:
Bug#32848: Manual merge
mysql-test/t/union.test:
Bug#32848: Manual merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 3f00b6750bc..b1cc3701f3d 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1304,7 +1304,8 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg, field_name(field_name_arg), query_id(0), key_start(0), part_of_key(0), part_of_sortkey(0), unireg_check(unireg_check_arg), - field_length(length_arg), null_bit(null_bit_arg) + field_length(length_arg), null_bit(null_bit_arg), + is_created_from_null_item(FALSE) { flags=null_ptr ? 0: NOT_NULL_FLAG; comment.str= (char*) ""; |