diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2003-03-27 16:11:01 +0200 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2003-03-27 16:11:01 +0200 |
| commit | 85fb265c3c39b8fe737ad54bff798386fa4352b4 (patch) | |
| tree | c19ed3aaad5801a5aed97d10705217b6ee85631d /sql/item_timefunc.h | |
| parent | 5754decd5bc362a057e41e8f49b6da1622a22663 (diff) | |
| download | mariadb-git-85fb265c3c39b8fe737ad54bff798386fa4352b4.tar.gz | |
Fixing a bug #195
Fixing UNION's popping up in 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() |