diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
| commit | a736a3174a4e7c0d92a38901ae61f563d4afede7 (patch) | |
| tree | 348d15f7c9cc883e86d852fbddc780f506669ee4 /sql/mysqld.cc | |
| parent | b44e12fef176bfc0884fb2c5f4ba7f42bf054f44 (diff) | |
| parent | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (diff) | |
| download | mariadb-git-a736a3174a4e7c0d92a38901ae61f563d4afede7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ba1d477882f..ec77366129a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8832,7 +8832,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", ft_boolean_syntax); |