summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-04-30 03:46:38 +0300
committermonty@mysql.com <>2005-04-30 03:46:38 +0300
commitc0e8a8d6251eac0bad2201004ea9f542bfef5f4f (patch)
tree8c0876b4d6e65974ff6a2ce510b69333467dc8e0 /sql/item_func.h
parentf35c1a18749b1a614deea6bd97486ceb637c8dcb (diff)
parent129c604032af4b86f7bf23bb06f4223795f75b61 (diff)
downloadmariadb-git-c0e8a8d6251eac0bad2201004ea9f542bfef5f4f.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index cb0b7dc02a4..a27f4382577 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1071,6 +1071,7 @@ class Item_func_set_user_var :public Item_func
char buffer[MAX_FIELD_WIDTH];
String value;
my_decimal decimal_buff;
+ bool null_item;
union
{
longlong vint;