database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-13 11:38:21 +03:00
parent ff77a09bda 2bb8d7c2f3
commit 4a7dfda373
36 changed files with 358 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@ -9808,7 +9808,9 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
if (global_system_variables.low_priority_updates)
thr_upgraded_concurrent_insert_lock= TL_WRITE_LOW_PRIORITY;
if (ft_boolean_check_syntax_string((uchar*) ft_boolean_syntax))
if (ft_boolean_check_syntax_string((uchar*) ft_boolean_syntax,
strlen(ft_boolean_syntax),
system_charset_info))
{
sql_print_error("Invalid ft-boolean-syntax string: %s\n",
ft_boolean_syntax);