1
0
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:
Oleksandr Byelkin
2024-07-18 16:25:33 +02:00
131 changed files with 2812 additions and 1854 deletions

View File

@@ -19,6 +19,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_err.h>
@@ -137,6 +138,13 @@ MRN_API my_bool mroonga_snippet_init(UDF_INIT *init, UDF_ARGS *args, char *messa
st_mrn_snip_info *snip_info = NULL;
bool can_open_snippet = TRUE;
init->ptr = NULL;
if (!mrn_initialized)
{
snprintf(message,
MYSQL_ERRMSG_SIZE,
"mroonga_snippet(): Mroonga isn't initialized");
goto error;
}
if (args->arg_count < 11 || (args->arg_count - 11) % 3)
{
sprintf(message, "Incorrect number of arguments for mroonga_snippet(): %u",