Commit 565e5cc7 authored by unknown's avatar unknown

freebsd fix for openssl

horrible bug fixed


mysql-test/r/fulltext_multi.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_order_by.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_update.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext_var.result:
  Change mode to -rw-rw-r--
mysql-test/r/bulk_replace.result:
  Change mode to -rw-rw-r--
mysql-test/r/handler.result:
  Change mode to -rw-rw-r--
include/my_global.h:
  FreeBSD fix for openssl
myisam/ft_static.c:
  some boolean search operators added
sql/sql_parse.cc:
  fixed horrible bug that makes mysqld CRASH when mysql client is started
parent f40d6b61
......@@ -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
......
......@@ -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]={
{
......
......@@ -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 + -><()~*:""&|
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment