From svnnotify ¡÷ sourceforge.jp Wed Mar 24 13:53:18 2010 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 24 Mar 2010 13:53:18 +0900 Subject: [Tritonn-commit 163] [svn] [179] added a new function in boolean mode Message-ID: <1269406398.405373.8867.nullmailer@users.sourceforge.jp> Revision: 179 http://sourceforge.jp/projects/tritonn/svn/view?view=rev&revision=179 Author: myuka Date: 2010-03-24 13:53:18 +0900 (Wed, 24 Mar 2010) Log Message: ----------- added a new function in boolean mode *sen_records_sort Modified Paths: -------------- tags/tritonn-1.0.12-mysql-5.0.83/myisam/Makefile.in tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c -------------- next part -------------- Modified: tags/tritonn-1.0.12-mysql-5.0.83/myisam/Makefile.in =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/myisam/Makefile.in 2009-11-26 09:10:05 UTC (rev 178) +++ tags/tritonn-1.0.12-mysql-5.0.83/myisam/Makefile.in 2010-03-24 04:53:18 UTC (rev 179) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -32,11 +32,15 @@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -144,18 +148,17 @@ sp_test_SOURCES = sp_test.c sp_test_OBJECTS = sp_test.$(OBJEXT) sp_test_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. ¡÷ am__isrc@ -I$(top_builddir)/include -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include +depcomp = +am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \ myisam_ftdump.c myisamchk.c myisamlog.c myisampack.c rt_test.c \ sp_test.c @@ -170,19 +173,30 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARFLAGS = @ARFLAGS@ AS = @AS@ ASFLAGS = @ASFLAGS@ +ASSEMBLER_FALSE = @ASSEMBLER_FALSE@ +ASSEMBLER_TRUE = @ASSEMBLER_TRUE@ +ASSEMBLER_sparc32_FALSE = @ASSEMBLER_sparc32_FALSE@ +ASSEMBLER_sparc32_TRUE = @ASSEMBLER_sparc32_TRUE@ +ASSEMBLER_sparc64_FALSE = @ASSEMBLER_sparc64_FALSE@ +ASSEMBLER_sparc64_TRUE = @ASSEMBLER_sparc64_TRUE@ +ASSEMBLER_x86_FALSE = @ASSEMBLER_x86_FALSE@ +ASSEMBLER_x86_TRUE = @ASSEMBLER_x86_TRUE@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AVAILABLE_LANGUAGES = @AVAILABLE_LANGUAGES@ AWK = @AWK@ +BUILD_INNODB_TOOLS_FALSE = @BUILD_INNODB_TOOLS_FALSE@ +BUILD_INNODB_TOOLS_TRUE = @BUILD_INNODB_TOOLS_TRUE@ CC = @CC@ CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CC_VERSION = @CC_VERSION@ @@ -193,6 +207,8 @@ CLIENT_LIBS = @CLIENT_LIBS@ CMP = @CMP@ COMPILATION_COMMENT = @COMPILATION_COMMENT@ +COMPILE_PSTACK_FALSE = @COMPILE_PSTACK_FALSE@ +COMPILE_PSTACK_TRUE = @COMPILE_PSTACK_TRUE@ CONF_COMMAND = @CONF_COMMAND@ CP = @CP@ CPP = @CPP@ @@ -204,26 +220,32 @@ CXXLDFLAGS = @CXXLDFLAGS@ CXX_VERSION = @CXX_VERSION@ CYGPATH_W = @CYGPATH_W@ +DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@ +DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@ DEFS = -DMAP_TO_USE_RAID DEPDIR = @DEPDIR@ DOT_FRM_VERSION = @DOT_FRM_VERSION@ DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ DVIS = @DVIS@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -FGREP = @FGREP@ +F77 = @F77@ +FFLAGS = @FFLAGS@ FIND_PROC = @FIND_PROC@ GETCONF = @GETCONF@ -GREP = @GREP@ GXX = @GXX@ +HAVE_NDBCLUSTER_DB_FALSE = @HAVE_NDBCLUSTER_DB_FALSE@ +HAVE_NDBCLUSTER_DB_TRUE = @HAVE_NDBCLUSTER_DB_TRUE@ +HAVE_NETWARE_FALSE = @HAVE_NETWARE_FALSE@ +HAVE_NETWARE_TRUE = @HAVE_NETWARE_TRUE@ +HAVE_YASSL_FALSE = @HAVE_YASSL_FALSE@ +HAVE_YASSL_TRUE = @HAVE_YASSL_TRUE@ HOSTNAME = @HOSTNAME@ ICHECK = @ICHECK@ -INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -238,7 +260,6 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@ -LIPO = @LIPO@ LM_CFLAGS = @LM_CFLAGS@ LN = @LN@ LN_CP_F = @LN_CP_F@ @@ -249,7 +270,8 @@ MAKEINFO = @MAKEINFO@ MAKE_BINARY_DISTRIBUTION_OPTIONS = @MAKE_BINARY_DISTRIBUTION_OPTIONS@ MAKE_SHELL = @MAKE_SHELL@ -MKDIR_P = @MKDIR_P@ +MECAB_INCLUDES = @MECAB_INCLUDES@ +MECAB_LIBS = @MECAB_LIBS@ MV = @MV@ MYSQLD_DEFAULT_SWITCHES = @MYSQLD_DEFAULT_SWITCHES@ MYSQLD_EXTRA_LDFLAGS = @MYSQLD_EXTRA_LDFLAGS@ @@ -280,13 +302,9 @@ NDB_VERSION_MINOR = @NDB_VERSION_MINOR@ NDB_VERSION_STATUS = @NDB_VERSION_STATUS@ NM = @NM@ -NMEDIT = @NMEDIT@ NOINST_LDFLAGS = @NOINST_LDFLAGS@ NON_THREADED_LIBS = @NON_THREADED_LIBS@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -310,6 +328,8 @@ SAVE_CXXLDFLAGS = @SAVE_CXXLDFLAGS@ SAVE_LDFLAGS = @SAVE_LDFLAGS@ SED = @SED@ +SENNA_INCLUDES = @SENNA_INCLUDES@ +SENNA_LIBS = @SENNA_LIBS@ SET_MAKE = @SET_MAKE@ SHARED_LIB_MAJOR_VERSION = @SHARED_LIB_MAJOR_VERSION@ SHARED_LIB_VERSION = @SHARED_LIB_VERSION@ @@ -327,13 +347,17 @@ ZLIB_DEPS = @ZLIB_DEPS@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_GETCONF = @ac_ct_GETCONF@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -349,12 +373,8 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -builddir = @builddir@ datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ docs_dirs = @docs_dirs@ -dvidir = @dvidir@ exec_prefix = @exec_prefix@ extra_docs = @extra_docs@ host = @host@ @@ -362,7 +382,6 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ innodb_includes = @innodb_includes@ @@ -375,9 +394,7 @@ linked_client_targets = @linked_client_targets@ linked_libmysqld_targets = @linked_libmysqld_targets@ linked_netware_sources = @linked_netware_sources@ -localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ man1_files = @man1_files@ man8_files = @man8_files@ man_dirs = @man_dirs@ @@ -396,10 +413,8 @@ oldincludedir = @oldincludedir@ openssl_includes = @openssl_includes@ openssl_libs = @openssl_libs@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ pstack_dirs = @pstack_dirs@ pstack_libs = @pstack_libs@ readline_basedir = @readline_basedir@ @@ -413,7 +428,6 @@ sql_client_dirs = @sql_client_dirs@ sql_server_dirs = @sql_server_dirs@ sql_union_dirs = @sql_union_dirs@ -srcdir = @srcdir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target = @target@ @@ -423,9 +437,6 @@ target_vendor = @target_vendor@ thread_dirs = @thread_dirs@ tools_dirs = @tools_dirs@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ uname_prog = @uname_prog@ yassl_dir = @yassl_dir@ yassl_h_ln_cmd = @yassl_h_ln_cmd@ @@ -434,11 +445,14 @@ zlib_dir = @zlib_dir@ EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt pkgdata_DATA = mi_test_all mi_test_all.res -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ + @SENNA_INCLUDES@ @MECAB_INCLUDES@ + LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ \ + @SENNA_LIBS@ @MECAB_LIBS@ pkglib_LIBRARIES = libmyisam.a myisamchk_DEPENDENCIES = $(LIBRARIES) @@ -480,14 +494,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu myisam/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps myisam/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu myisam/Makefile + $(AUTOMAKE) --gnu --ignore-deps myisam/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -507,7 +521,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pkglibLIBRARIES: $(pkglib_LIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" + test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ @@ -540,15 +554,15 @@ $(RANLIB) libmyisam.a install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -575,31 +589,31 @@ done mi_test1$(EXEEXT): $(mi_test1_OBJECTS) $(mi_test1_DEPENDENCIES) @rm -f mi_test1$(EXEEXT) - $(LINK) $(mi_test1_OBJECTS) $(mi_test1_LDADD) $(LIBS) + $(LINK) $(mi_test1_LDFLAGS) $(mi_test1_OBJECTS) $(mi_test1_LDADD) $(LIBS) mi_test2$(EXEEXT): $(mi_test2_OBJECTS) $(mi_test2_DEPENDENCIES) @rm -f mi_test2$(EXEEXT) - $(LINK) $(mi_test2_OBJECTS) $(mi_test2_LDADD) $(LIBS) + $(LINK) $(mi_test2_LDFLAGS) $(mi_test2_OBJECTS) $(mi_test2_LDADD) $(LIBS) mi_test3$(EXEEXT): $(mi_test3_OBJECTS) $(mi_test3_DEPENDENCIES) @rm -f mi_test3$(EXEEXT) - $(LINK) $(mi_test3_OBJECTS) $(mi_test3_LDADD) $(LIBS) + $(LINK) $(mi_test3_LDFLAGS) $(mi_test3_OBJECTS) $(mi_test3_LDADD) $(LIBS) myisam_ftdump$(EXEEXT): $(myisam_ftdump_OBJECTS) $(myisam_ftdump_DEPENDENCIES) @rm -f myisam_ftdump$(EXEEXT) - $(LINK) $(myisam_ftdump_OBJECTS) $(myisam_ftdump_LDADD) $(LIBS) + $(LINK) $(myisam_ftdump_LDFLAGS) $(myisam_ftdump_OBJECTS) $(myisam_ftdump_LDADD) $(LIBS) myisamchk$(EXEEXT): $(myisamchk_OBJECTS) $(myisamchk_DEPENDENCIES) @rm -f myisamchk$(EXEEXT) - $(LINK) $(myisamchk_OBJECTS) $(myisamchk_LDADD) $(LIBS) + $(LINK) $(myisamchk_LDFLAGS) $(myisamchk_OBJECTS) $(myisamchk_LDADD) $(LIBS) myisamlog$(EXEEXT): $(myisamlog_OBJECTS) $(myisamlog_DEPENDENCIES) @rm -f myisamlog$(EXEEXT) - $(LINK) $(myisamlog_OBJECTS) $(myisamlog_LDADD) $(LIBS) + $(LINK) $(myisamlog_LDFLAGS) $(myisamlog_OBJECTS) $(myisamlog_LDADD) $(LIBS) myisampack$(EXEEXT): $(myisampack_OBJECTS) $(myisampack_DEPENDENCIES) @rm -f myisampack$(EXEEXT) - $(LINK) $(myisampack_OBJECTS) $(myisampack_LDADD) $(LIBS) + $(LINK) $(myisampack_LDFLAGS) $(myisampack_OBJECTS) $(myisampack_LDADD) $(LIBS) rt_test$(EXEEXT): $(rt_test_OBJECTS) $(rt_test_DEPENDENCIES) @rm -f rt_test$(EXEEXT) - $(LINK) $(rt_test_OBJECTS) $(rt_test_LDADD) $(LIBS) + $(LINK) $(rt_test_LDFLAGS) $(rt_test_OBJECTS) $(rt_test_LDADD) $(LIBS) sp_test$(EXEEXT): $(sp_test_OBJECTS) $(sp_test_DEPENDENCIES) @rm -f sp_test$(EXEEXT) - $(LINK) $(sp_test_OBJECTS) $(sp_test_LDADD) $(LIBS) + $(LINK) $(sp_test_LDFLAGS) $(sp_test_OBJECTS) $(sp_test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -607,97 +621,27 @@ distclean-compile: -rm -f *.tab.c - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/ft_boolean_search.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/ft_nlq_search.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/ft_parser.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/ft_static.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/ft_stopwords.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/ft_update.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_cache.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_changed.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_check.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_checksum.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_close.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_create.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_dbug.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_delete.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_delete_all.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_delete_table.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_dynrec.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_extra.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_info.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_key.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_keycache.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_locking.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_log.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_open.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_packrec.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_page.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_panic.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_preload.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_range.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rename.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rfirst.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rkey.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rlast.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rnext.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rnext_same.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rprev.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rrnd.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rsame.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_rsamepos.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_scan.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_search.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_static.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_statrec.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_test1.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_test2.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_test3.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_unique.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_update.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/mi_write.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/myisam_ftdump.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/myisamchk.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/myisamlog.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/myisampack.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/rt_index.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/rt_key.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/rt_mbr.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/rt_split.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/rt_test.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/sort.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/sp_key.Po ¡÷ am__quote@ - ¡÷ AMDEP_TRUE@@am__include@ @am__quote ¡÷ ./$(DEPDIR)/sp_test.Po ¡÷ am__quote@ - .c.o: - ¡÷ am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - ¡÷ am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - ¡÷ AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - ¡÷ AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - ¡÷ am__fastdepCC_FALSE@ $(COMPILE) -c $< + $(COMPILE) -c $< .c.obj: - ¡÷ am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - ¡÷ am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - ¡÷ AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - ¡÷ AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - ¡÷ am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: - ¡÷ am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - ¡÷ am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - ¡÷ AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - ¡÷ AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - ¡÷ am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" @list='$(pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -718,8 +662,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -731,8 +675,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -742,12 +686,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -761,21 +706,22 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -791,7 +737,7 @@ all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -824,10 +770,9 @@ clean-noinstPROGRAMS clean-pkglibLIBRARIES mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags + distclean-libtool distclean-tags dvi: dvi-am @@ -841,24 +786,15 @@ install-data-am: install-pkgdataDATA -install-dvi: install-dvi-am - install-exec-am: install-binPROGRAMS install-pkglibLIBRARIES -install-html: install-html-am - install-info: install-info-am install-man: -install-pdf: install-pdf-am - -install-ps: install-ps-am - installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -875,26 +811,23 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-pkgdataDATA \ - uninstall-pkglibLIBRARIES +uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ + uninstall-pkgdataDATA uninstall-pkglibLIBRARIES -.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool clean-noinstPROGRAMS \ clean-pkglibLIBRARIES ctags distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgdataDATA \ - install-pkglibLIBRARIES install-ps install-ps-am install-strip \ + install-binPROGRAMS install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pkgdataDATA install-pkglibLIBRARIES install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-pkgdataDATA uninstall-pkglibLIBRARIES + uninstall-info-am uninstall-pkgdataDATA \ + uninstall-pkglibLIBRARIES # Move to automake rules ? Modified: tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c 2009-11-26 09:10:05 UTC (rev 178) +++ tags/tritonn-1.0.12-mysql-5.0.83/myisam/ft_boolean_search.c 2010-03-24 04:53:18 UTC (rev 179) @@ -438,8 +438,12 @@ SEN_LOG(sen_log_debug, "ft_init_boolean_search => sen_records_open"); ftb->sir = sen_records_open(sen_rec_document, sen_rec_none, 0); SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_query_exec: i=%p, q=%p, r=%p", i, q, ftb->sir); - sen_query_exec(i, q, ftb->sir, sen_sel_or); - SEN_LOG(sen_log_debug, "ft_init_boolean_search => sen_query_close: q=%p", q); + sen_query_exec(i, q, ftb->sir, sen_sel_or); +//20100324 yuka wrote + SEN_LOG(sen_log_info, "ft_init_boolean_search => sen_records_sort"); + sen_records_sort(ftb->sir,0,NULL); +//end 20100324 yuka wrote + SEN_LOG(sen_log_debug, "ft_init_boolean_search => sen_query_close: q=%p", q); sen_query_close(q); return ftb; } From svnnotify ¡÷ sourceforge.jp Thu Mar 25 12:05:14 2010 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 25 Mar 2010 12:05:14 +0900 Subject: [Tritonn-commit 164] [svn] [180] added a system variable Message-ID: <1269486314.015058.32354.nullmailer@users.sourceforge.jp> Revision: 180 http://sourceforge.jp/projects/tritonn/svn/view?view=rev&revision=180 Author: myuka Date: 2010-03-25 12:05:13 +0900 (Thu, 25 Mar 2010) Log Message: ----------- added a system variable * senna_score_sort Modified Paths: -------------- tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h -------------- next part -------------- Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc 2010-03-24 04:53:18 UTC (rev 179) +++ tags/tritonn-1.0.12-mysql-5.0.83/sql/mysqld.cc 2010-03-25 03:05:13 UTC (rev 180) @@ -5107,6 +5107,7 @@ OPT_SENNA_LOG_LEVEL, OPT_SENNA_2IND, OPT_SENNA_INDEX_TYPE, + OPT_SENNA_SCORE_SORT, /*yuka wrote 100324*/ #endif OPT_PROFILING, OPT_INNODB_ROLLBACK_ON_TIMEOUT, @@ -5813,6 +5814,11 @@ {"senna-log-level", OPT_SENNA_LOG_LEVEL, "Senna log level.", (gptr*) &opt_senna_log_level, (gptr*) &opt_senna_log_level, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"senna-score-sort", OPT_SENNA_SCORE_SORT, + "Enable sen_records_sort function. Default value is ON", + (gptr*) &global_system_variables.senna_score_sort, + (gptr*) &global_system_variables.senna_score_sort, + 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, /* yuka wrote 100324 */ #endif {"secure-file-priv", OPT_SECURE_FILE_PRIV, "Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within specified directory", @@ -7109,6 +7115,7 @@ opt_senna_log = 0; senna_log_level_options = senna_logger.max_level; global_system_variables.senna_2ind = 0; + global_system_variables.senna_score_sort = 1; /*yuka wrote 100324*/ #endif #if defined(__WIN__) || defined(__NETWARE__) @@ -7757,6 +7764,9 @@ case OPT_SENNA_2IND: global_system_variables.senna_2ind = 1; break; + case OPT_SENNA_SCORE_SORT: /* yuka wrote 100324 */ + global_system_variables.senna_score_sort=1; + break; /* end yuka wrote 100324 */ #endif } return 0; Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc 2010-03-24 04:53:18 UTC (rev 179) +++ tags/tritonn-1.0.12-mysql-5.0.83/sql/set_var.cc 2010-03-25 03:05:13 UTC (rev 180) @@ -504,6 +504,7 @@ sys_var_enum sys_senna_log_level("senna_log_level",&senna_log_level_options, &senna_log_level_typelib, fix_senna_log_level); sys_var_thd_bool sys_senna_2ind("senna_2ind", &SV::senna_2ind, fix_senna_2ind); +sys_var_thd_bool sys_senna_score_sort("senna_score_sort", &SV::senna_score_sort); /*yuka wrote 100324*/ #endif /* Condition pushdown to storage engine */ @@ -797,6 +798,7 @@ &sys_senna_2ind, &sys_senna_index_type, &sys_senna_log_level, + &sys_senna_score_sort, /* yuka wrote 100324 */ #endif &sys_server_id, #ifdef HAVE_REPLICATION @@ -1130,6 +1132,7 @@ {"senna_index_type", (char*) &sys_senna_index_type, SHOW_SYS}, {"senna_log", (char*) &opt_senna_log, SHOW_MY_BOOL}, {"senna_log_level", (char*) &sys_senna_log_level, SHOW_SYS}, + {"senna_score_sort", (char*) &sys_senna_score_sort, SHOW_SYS}, /*yuka wrote 100324*/ #endif #ifdef HAVE_SMEM {"shared_memory", (char*) &opt_enable_shared_memory, SHOW_MY_BOOL}, Modified: tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h =================================================================== --- tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h 2010-03-24 04:53:18 UTC (rev 179) +++ tags/tritonn-1.0.12-mysql-5.0.83/sql/sql_class.h 2010-03-25 03:05:13 UTC (rev 180) @@ -628,6 +628,7 @@ #ifdef ENABLE_SENNA my_bool senna_2ind; + my_bool senna_score_sort; //yuka wrote 100324 #endif };