From d271fbd392b02ff8b98d552aef7164270c9d66fd Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 4 Apr 2022 08:50:24 +0400 Subject: [PATCH] MDEV-28224 error: cannot initialize return object of type 'bool' with an rvalue of type 'nullptr_t' Fixing a typo in the fix for MDEV-19804, wrong return value in a bool function: < return NULL; > return true; The problem was found because it did not compile on some platforms. Strangley, it did not have visible problems on other platforms, which did not fail to compile, although "return NULL" should compile to "return false" rather than "return true". --- sql/sql_lex.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index c70fef9709f..7f1b362d91d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -7906,18 +7906,18 @@ bool LEX::call_statement_start(THD *thd, const LEX_CSTRING &db, if (check_db_name((LEX_STRING*) const_cast(&db))) { my_error(ER_WRONG_DB_NAME, MYF(0), db.str); - return NULL; + return true; } if (check_routine_name(&pkg) || check_routine_name(&proc)) - return NULL; + return true; // Concat `pkg` and `name` to `pkg.name` LEX_CSTRING pkg_dot_proc; if (q_pkg_proc.make_qname(thd->mem_root, &pkg_dot_proc) || check_ident_length(&pkg_dot_proc) || !(spname= new (thd->mem_root) sp_name(&db, &pkg_dot_proc, true))) - return NULL; + return true; sp_handler_package_function.add_used_routine(thd->lex, thd, spname); sp_handler_package_body.add_used_routine(thd->lex, thd, &q_db_pkg);