Commit c314fd8c authored by Sergei Golubchik's avatar Sergei Golubchik

compilation failure on clang 11.1.0

returning NULL (a.k.a. nullptr) from a bool function.

followup for add782a1
parent 3b052f81
...@@ -18426,7 +18426,7 @@ static bool make_json_valid_expr(TABLE *table, Field *field) ...@@ -18426,7 +18426,7 @@ static bool make_json_valid_expr(TABLE *table, Field *field)
Item *expr, *item_field; Item *expr, *item_field;
if (!table->expr_arena && table->init_expr_arena(thd->mem_root)) if (!table->expr_arena && table->init_expr_arena(thd->mem_root))
return NULL; return 1;
thd->set_n_backup_active_arena(table->expr_arena, &backup_arena); thd->set_n_backup_active_arena(table->expr_arena, &backup_arena);
if ((item_field= new (thd->mem_root) Item_field(thd, field)) && if ((item_field= new (thd->mem_root) Item_field(thd, field)) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment