summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-01-03 23:16:16 +0100
committerSergey Petrunya <psergey@askmonty.org>2012-01-03 23:16:16 +0100
commitb01348879d066c3207ac70aa630ed021a2552920 (patch)
tree44b64f886288ac8b8b5c49ae9a94fe574ddc7c5f /sql/item_func.cc
parent7714496dc1c72d01fd214cb7737ca4216a982e0f (diff)
parentca020dfa9e8668ce52eaff92c157097bba671ec1 (diff)
downloadmariadb-git-b01348879d066c3207ac70aa630ed021a2552920.tar.gz
MWL#182: Explain running statements: merge with 5.3-main (needs fixing)
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index e5225de62f9..868f37e14f5 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -3871,7 +3871,7 @@ longlong Item_func_sleep::val_int()
#define extra_size sizeof(double)
-static user_var_entry *get_variable(HASH *hash, LEX_STRING &name,
+user_var_entry *get_variable(HASH *hash, LEX_STRING &name,
bool create_if_not_exists)
{
user_var_entry *entry;