summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-05-16 19:20:00 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-05-16 19:20:00 +0400
commitdfbd777fd83d236cc559750048f0cabee87d93a0 (patch)
treefb6cb698aa6f12c54e5a3d67835b9112ea07291d /sql/item_func.cc
parentddd3e261b253856720bd9dc2343a655ecc297e81 (diff)
parent404a1565bfe02e3ce06843f6c5bf243503a2fe99 (diff)
downloadmariadb-git-dfbd777fd83d236cc559750048f0cabee87d93a0.tar.gz
MWL#182: SHOW EXPLAIN: Merge 5.3->5.5
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 9b2e8e5e614..7b701ca848a 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4298,7 +4298,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;