diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-07-17 21:17:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-07-30 07:51:58 +0200 |
| commit | c314fd8c1ad45d7a2bb2b901c7c7634e6a605939 (patch) | |
| tree | 57aa36383ce3c1f2be0e58832fb7a93658a818df /sql | |
| parent | 3b052f8187aa36df1c2518a27d95381867eceffb (diff) | |
| download | mariadb-git-c314fd8c1ad45d7a2bb2b901c7c7634e6a605939.tar.gz | |
compilation failure on clang 11.1.0
returning NULL (a.k.a. nullptr) from a bool function.
followup for add782a13e5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 08de2565caf..fd30ba0af0f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -18426,7 +18426,7 @@ static bool make_json_valid_expr(TABLE *table, Field *field) Item *expr, *item_field; 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); if ((item_field= new (thd->mem_root) Item_field(thd, field)) && |