summaryrefslogtreecommitdiff
path: root/sql/set_var.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-03-17 10:30:40 +0200
committerunknown <monty@mysql.com>2004-03-17 10:30:40 +0200
commitb523802138eef0c66d6ce89263b512c1494a277b (patch)
tree2f18de7b832ebd37828631dccd3562ffc5611fa7 /sql/set_var.h
parenta8aacf87648f64e7489220dab7d8729c5c01e13d (diff)
downloadmariadb-git-b523802138eef0c66d6ce89263b512c1494a277b.tar.gz
After merge fixes
Diffstat (limited to 'sql/set_var.h')
-rw-r--r--sql/set_var.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h
index 4c5d0a53657..ac20742da8c 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -179,7 +179,10 @@ public:
return 1;
}
SHOW_TYPE type() { return SHOW_CHAR; }
- byte *value_ptr(THD *thd, enum_var_type type) { return (byte*) value; }
+ byte *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base)
+ {
+ return (byte*) value;
+ }
bool check_update_type(Item_result type)
{
return 1;