diff options
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | myisam/ft_static.c | 2 | ||||
| -rw-r--r-- | mysql-test/r/fulltext_var.result | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/my_global.h b/include/my_global.h index 7fd781f69cf..27781b230fd 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -188,8 +188,8 @@ # endif #endif /* TIME_WITH_SYS_TIME */ #ifdef HAVE_UNISTD_H -#ifdef HAVE_OPENSSL -#define crypt dummy +#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) +#define crypt unistd_crypt #endif #include <unistd.h> #ifdef HAVE_OPENSSL diff --git a/myisam/ft_static.c b/myisam/ft_static.c index 184ce01b86b..3efb3a3ec74 100644 --- a/myisam/ft_static.c +++ b/myisam/ft_static.c @@ -21,7 +21,7 @@ ulong ft_min_word_len=4; ulong ft_max_word_len=HA_FT_MAXLEN; ulong ft_max_word_len_for_sort=20; -const char *ft_boolean_syntax="+ -><()~*"; +const char *ft_boolean_syntax="+ -><()~*:\"\"&|"; const MI_KEYSEG ft_keysegs[FT_SEGS]={ { diff --git a/mysql-test/r/fulltext_var.result b/mysql-test/r/fulltext_var.result index d9c37df56be..eb71e87538d 100644 --- a/mysql-test/r/fulltext_var.result +++ b/mysql-test/r/fulltext_var.result @@ -3,4 +3,4 @@ Variable_name Value ft_min_word_len 4 ft_max_word_len 254 ft_max_word_len_for_sort 20 -ft_boolean_syntax + -><()~* +ft_boolean_syntax + -><()~*:""&| diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 1e319c4c988..c044d17f0a9 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -875,8 +875,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, } thd->free_list=0; table_list.name=table_list.real_name=thd->strdup(packet); - thd->query_length=strlen(thd->query); thd->query=fields=thd->strdup(strend(packet)+1); + thd->query_length=strlen(thd->query); mysql_log.write(thd,command,"%s %s",table_list.real_name,fields); remove_escape(table_list.real_name); // This can't have wildcards |