Skip to content

Commit c314fd8

Browse files
committed
compilation failure on clang 11.1.0
returning NULL (a.k.a. nullptr) from a bool function. followup for add782a
1 parent 3b052f8 commit c314fd8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sql/sql_select.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18426,7 +18426,7 @@ static bool make_json_valid_expr(TABLE *table, Field *field)
1842618426
Item *expr, *item_field;
1842718427

1842818428
if (!table->expr_arena && table->init_expr_arena(thd->mem_root))
18429-
return NULL;
18429+
return 1;
1843018430

1843118431
thd->set_n_backup_active_arena(table->expr_arena, &backup_arena);
1843218432
if ((item_field= new (thd->mem_root) Item_field(thd, field)) &&

0 commit comments

Comments
 (0)