summaryrefslogtreecommitdiff
path: root/sql/set_var.h
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-02-14 21:50:09 +0100
committerserg@serg.mylan <>2005-02-14 21:50:09 +0100
commitfd828e5b4d7f20a64bccfc25a096ca94760bcec9 (patch)
treeea9dd08a255018554104b4f137dea7cfe36ece0a /sql/set_var.h
parent2b49bea59a594a0f4a87200adca21fb0cc3b2893 (diff)
parentdb13afd89db4a415e2a77b0c200a1391ea2f03fe (diff)
downloadmariadb-git-fd828e5b4d7f20a64bccfc25a096ca94760bcec9.tar.gz
manually merged
Diffstat (limited to 'sql/set_var.h')
-rw-r--r--sql/set_var.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h
index 3104fd38976..801ceeebb44 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -778,7 +778,7 @@ public:
} save_result;
LEX_STRING base; /* for structs */
- set_var(enum_var_type type_arg, sys_var *var_arg, LEX_STRING *base_name_arg,
+ set_var(enum_var_type type_arg, sys_var *var_arg, const LEX_STRING *base_name_arg,
Item *value_arg)
:var(var_arg), type(type_arg), base(*base_name_arg)
{