summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mysql.com>2010-07-07 10:00:46 +0400
committerAlexander Barkov <bar@mysql.com>2010-07-07 10:00:46 +0400
commit72bb9b7acbacc20172512184dc2724fccbc7a741 (patch)
tree55b5304fd8264de2fd755569e2286674043578a3 /sql/item.h
parent6eb854de1f2cf96fe16a77cf89e7a97809b6dd4f (diff)
downloadmariadb-git-72bb9b7acbacc20172512184dc2724fccbc7a741.tar.gz
Bug#52159 returning time type from function and empty left join causes debug assertion
Problem: Item_copy did not set "fixed", which resulted in DBUG_ASSERT in some cases. Fix: adding initialization of the "fixed" member Adding tests: mysql-test/include/ctype_numconv.inc mysql-test/r/ctype_binary.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_latin1.result mysql-test/r/ctype_ucs.result Adding initialization of the "fixed" member: sql/item.h
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index e18fa43037a..35a0e8373f2 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -2791,6 +2791,7 @@ protected:
cached_field_type= item->field_type();
cached_result_type= item->result_type();
unsigned_flag= item->unsigned_flag;
+ fixed= item->fixed;
}
public: