diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-10-06 11:03:37 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-10-06 11:03:37 +0400 |
| commit | 30df032e28bada8aabc1c850799795c728cd96b7 (patch) | |
| tree | 4d7d8b6e481197bcd1cf04368d7c19316b047527 /sql/item_func.cc | |
| parent | 79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff) | |
| parent | 4d8be2d4f6d7a7b669b7931f1a0ccb5de130fee6 (diff) | |
| download | mariadb-git-30df032e28bada8aabc1c850799795c728cd96b7.tar.gz | |
SHOW EXPLAIN: merge with 5.5-main
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 441eb37d701..9923b158f3d 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4299,7 +4299,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; |