Commit 696d7fe4 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
parents 7d3bb433 df33aacd

include/ft_global.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern ulong ft_min_word_len; 
extern ulong ft_max_word_len;

extern ulong ft_query_expansion_limit;

extern char  ft_boolean_syntax[15];

extern struct st_mysql_ftparser ft_default_parser;



int ft_init_stopwords(void);

void ft_free_stopwords(void);

include/my_global.h

+9 −0
Original line number Diff line number Diff line
@@ -1380,4 +1380,13 @@ do { doubleget_union _tmp; \ 
#define dlerror() ""

#endif



/* FreeBSD 2.2.2 does not define RTLD_NOW) */

#ifndef RTLD_NOW

#define RTLD_NOW 1

#endif



#ifndef HAVE_DLERROR

#define dlerror() ""

#endif



#endif /* my_global_h */

include/myisam.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern "C" { 
#include "keycache.h"

#endif

#include "my_handler.h"

#include <plugin.h>



	/* defines used by myisam-funktions */
@@ -196,6 +197,7 @@ typedef struct st_mi_keydef /* Key definition with open & info */ 
  uint32 version;			/* For concurrent read/write */



  HA_KEYSEG *seg,*end;

  struct st_mysql_ftparser *parser;     /* Fulltext [pre]parser */

  int (*bin_search)(struct st_myisam_info *info,struct st_mi_keydef *keyinfo,

		    uchar *page,uchar *key,

		    uint key_len,uint comp_flag,uchar * *ret_pos,

libmysqld/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ 
MYSQLDATAdir =		$(localstatedir)

MYSQLSHAREdir =		$(pkgdatadir)

MYSQLBASEdir=		$(prefix)

MYSQLLIBdir=            $(libdir)



DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \

			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \

			-DDATADIR="\"$(MYSQLDATAdir)\"" \

			-DSHAREDIR="\"$(MYSQLSHAREdir)\""

			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \

			-DLIBDIR="\"$(MYSQLLIBdir)\""

INCLUDES=		@bdb_includes@ \

			-I$(top_builddir)/include -I$(top_srcdir)/include \

			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \

mysql-test/r/connect.result

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ help_keyword 
help_relation

help_topic

host

plugin

proc

procs_priv

tables_priv
@@ -36,6 +37,7 @@ help_keyword 
help_relation

help_topic

host

plugin

proc

procs_priv

tables_priv
@@ -71,6 +73,7 @@ help_keyword 
help_relation

help_topic

host

plugin

proc

procs_priv

tables_priv