diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-27 16:11:01 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-27 16:11:01 +0200 |
| commit | 691d4b31084d5f2bce52712d88dd4e9b16cb6bfb (patch) | |
| tree | c19ed3aaad5801a5aed97d10705217b6ee85631d /sql/item_timefunc.h | |
| parent | b5bbd3bd12b0647a1c8926d0e559a394b93f9654 (diff) | |
| download | mariadb-git-691d4b31084d5f2bce52712d88dd4e9b16cb6bfb.tar.gz | |
Fixing a bug #195
Fixing UNION's popping up in slow query log
mysql-test/r/cast.result:
Fixing a bug #195
mysql-test/t/cast.test:
Fixing a bug #195
sql/item_timefunc.h:
Fixing a bug #195
sql/sql_union.cc:
Fixing UNION's popping up in the slow query log
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 2ed126b58e5..87563cf9f47 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -527,7 +527,8 @@ public: { String *tmp=args[0]->val_str(a); null_value=args[0]->null_value; - tmp->set_charset(charset()); + if (tmp) + tmp->set_charset(charset()); return tmp; } void fix_length_and_dec() |