1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

freebsd fix for openssl

Browse Source 
horrible bug fixed
This commit is contained in:
serg@serg.mysql.com 2001-12-15 21:39:26 +01:00
parent 15f84e2617
commit fc3e066f36
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_global.h
View File

@ -188,8 +188,8 @@
# endif # endif
#endif /* TIME_WITH_SYS_TIME */ #endif /* TIME_WITH_SYS_TIME */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#ifdef HAVE_OPENSSL #if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT)
#define crypt dummy #define crypt unistd_crypt
#endif #endif
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL

2
myisam/ft_static.c
View File

@ -21,7 +21,7 @@
ulong ft_min_word_len=4; ulong ft_min_word_len=4;
ulong ft_max_word_len=HA_FT_MAXLEN; ulong ft_max_word_len=HA_FT_MAXLEN;
ulong ft_max_word_len_for_sort=20; 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]={ const MI_KEYSEG ft_keysegs[FT_SEGS]={
{ {

2
mysql-test/r/fulltext_var.result
View File

@ -3,4 +3,4 @@ Variable_name Value
ft_min_word_len 4 ft_min_word_len 4
ft_max_word_len 254 ft_max_word_len 254
ft_max_word_len_for_sort 20 ft_max_word_len_for_sort 20
ft_boolean_syntax + -><()~* ft_boolean_syntax + -><()~*:""&|

2
sql/sql_parse.cc
View File

@ -875,8 +875,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
} }
thd->free_list=0; thd->free_list=0;
table_list.name=table_list.real_name=thd->strdup(packet); 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=fields=thd->strdup(strend(packet)+1);
thd->query_length=strlen(thd->query);
mysql_log.write(thd,command,"%s %s",table_list.real_name,fields); mysql_log.write(thd,command,"%s %s",table_list.real_name,fields);
remove_escape(table_list.real_name); // This can't have wildcards remove_escape(table_list.real_name); // This can't have wildcards