Commit fc3e066f authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

freebsd fix for openssl 

horrible bug fixed
parent 15f84e26

include/my_global.h

+2 −2
Original line number Diff line number Diff line
@@ -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

myisam/ft_static.c

+1 −1
Original line number Diff line number Diff line
@@ -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]={

{

mysql-test/r/fulltext_var.result

+1 −1
Original line number Diff line number Diff line
@@ -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	+ -><()~*:""&|

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -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