summaryrefslogtreecommitdiff
path: root/sql/item_jsonfunc.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-02-14 18:04:35 +0100
committerSergei Golubchik <serg@mariadb.org>2017-02-14 20:43:41 +0100
commite0fa2ce40f03add01bb3d934480e74e3ee64dd6c (patch)
tree2e5e909ab00d282f9a70e30fc70831765bec22e7 /sql/item_jsonfunc.cc
parent8877f1c32566b32bf9c598052e8f866a361190fb (diff)
downloadmariadb-git-e0fa2ce40f03add01bb3d934480e74e3ee64dd6c.tar.gz
bugfix: uninitialized variable
fixes crashes on win32-debug
Diffstat (limited to 'sql/item_jsonfunc.cc')
-rw-r--r--sql/item_jsonfunc.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
index d955ddb53df..59d49b81d4a 100644
--- a/sql/item_jsonfunc.cc
+++ b/sql/item_jsonfunc.cc
@@ -2978,14 +2978,13 @@ String *Item_func_json_format::val_str(String *str)
{
String *js= args[0]->val_str(&tmp_js);
json_engine_t je;
- int tab_size;
+ int tab_size= 4;
if ((null_value= args[0]->null_value))
return 0;
if (fmt == DETAILED)
{
- tab_size= 4;
if (arg_count > 1)
{
tab_size= args[1]->val_int();