mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-21166 Add Mroonga initialized check to Mroonga UDFs
Mroonga UDFs can't be used without loading Mroonga.
This commit is contained in:
committed by
Daniel Black
parent
49dff5a4b6
commit
383d53edbc
@@ -18,6 +18,7 @@
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
|
||||
*/
|
||||
|
||||
#include <mrn.hpp>
|
||||
#include <mrn_mysql.h>
|
||||
#include <mrn_mysql_compat.h>
|
||||
#include <mrn_encoding.hpp>
|
||||
@@ -53,6 +54,15 @@ MRN_API my_bool mroonga_normalize_init(UDF_INIT *init, UDF_ARGS *args,
|
||||
String *result_str = NULL;
|
||||
|
||||
init->ptr = NULL;
|
||||
|
||||
if (!mrn_initialized)
|
||||
{
|
||||
snprintf(message,
|
||||
MYSQL_ERRMSG_SIZE,
|
||||
"mroonga_normalize(): Mroonga isn't initialized");
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!(1 <= args->arg_count && args->arg_count <= 2)) {
|
||||
sprintf(message,
|
||||
"mroonga_normalize(): Incorrect number of arguments: %u for 1..2",
|
||||
|
Reference in New Issue
Block a user