mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge branch '10.5' into 10.6
This commit is contained in:
@@ -1879,9 +1879,6 @@ error:
|
||||
DBUG_RETURN(0);
|
||||
}
|
||||
|
||||
#undef my_error
|
||||
extern "C" void my_error(unsigned int nr, unsigned long MyFlags, ...);
|
||||
|
||||
my_bool spider_direct_sql_init_body(
|
||||
UDF_INIT *initid,
|
||||
UDF_ARGS *args,
|
||||
@@ -1892,7 +1889,7 @@ my_bool spider_direct_sql_init_body(
|
||||
DBUG_ENTER("spider_direct_sql_init_body");
|
||||
if (!spider_hton_ptr)
|
||||
{
|
||||
my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), "SPIDER");
|
||||
strcpy(message, "Plugin 'SPIDER' is not loaded");
|
||||
goto error;
|
||||
}
|
||||
if (args->arg_count != 3)
|
||||
|
Reference in New Issue
Block a user