1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 10.6 into 10.11

This commit is contained in:
Marko Mäkelä
2023-12-21 13:19:17 +02:00
30 changed files with 205 additions and 233 deletions

View File

@@ -5828,12 +5828,17 @@ int spider_db_mbase_util::print_item_func(
item_count -= 2;
break;
}
} else if (func_name_length == 6 &&
!strncasecmp("istrue", func_name, func_name_length)
) {
last_str = SPIDER_SQL_IS_TRUE_STR;
last_str_length = SPIDER_SQL_IS_TRUE_LEN;
break;
} else if (func_name_length == 6)
{
if (!strncasecmp("istrue", func_name, func_name_length))
{
last_str= SPIDER_SQL_IS_TRUE_STR;
last_str_length= SPIDER_SQL_IS_TRUE_LEN;
break;
}
else if (!strncasecmp("regexp", func_name, func_name_length))
/* Keep the infix expression */
break;
} else if (func_name_length == 7)
{
if (!strncasecmp("isfalse", func_name, func_name_length))