summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSujatha Sivakumar <sujatha.sivakumar@oracle.com>2012-08-14 14:21:40 +0530
committerSujatha Sivakumar <sujatha.sivakumar@oracle.com>2012-08-14 14:21:40 +0530
commit069f5c7eac6ca6a65444a1b46c6785d532b967d2 (patch)
treefe7dfc9c3f8507c363aad5f85a63cfc90cd29e55 /sql
parent0614a8d9690af11222639f43f55ec259d7ce4694 (diff)
parentc6d8569d4116f7d9e78e4e48af26337f2b38208f (diff)
downloadmariadb-git-069f5c7eac6ca6a65444a1b46c6785d532b967d2.tar.gz
merge from 5.1 to 5.5
Diffstat (limited to 'sql')
-rw-r--r--sql/log_event.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 000c7420ca8..b0dc6fd8dc7 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -2568,7 +2568,7 @@ public:
User_var_log_event(THD* thd_arg, char *name_arg, uint name_len_arg,
char *val_arg, ulong val_len_arg, Item_result type_arg,
uint charset_number_arg, uchar flags_arg)
- :Log_event(), name(name_arg), name_len(name_len_arg), val(val_arg),
+ :Log_event(thd_arg,0,0), name(name_arg), name_len(name_len_arg), val(val_arg),
val_len(val_len_arg), type(type_arg), charset_number(charset_number_arg),
flags(flags_arg), deferred(false)
{ is_null= !val; }