From 85fb265c3c39b8fe737ad54bff798386fa4352b4 Mon Sep 17 00:00:00 2001
From: "Sinisa@sinisa.nasamreza.org" <>
Date: Thu, 27 Mar 2003 16:11:01 +0200
Subject: Fixing a bug #195 Fixing UNION's popping up in slow query log

---
 sql/item_timefunc.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sql/item_timefunc.h')

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()
-- 
cgit v1.2.1