Commit 300dde3d authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 

into krsna.patg.net:/home/patg/mysql-5.0
parents 84f2c407 efe1ca20

BUILD/SETUP.sh

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"

max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ brian@zim.(none) 
carsten@tsort.bitbybit.dk

cps@silver_beast.(none)

davida@isil.mysql.com

dean@mysql.com

dellis@goetia.(none)

dlenev@brandersnatch.localdomain

dlenev@build.mysql.com

configure.in

+0 −23
Original line number Diff line number Diff line
@@ -56,28 +56,6 @@ czech danish dutch english estonian french german greek hungarian \ 
italian japanese korean norwegian norwegian-ny polish portuguese \

romanian russian serbian slovak spanish swedish ukrainian"





# Generate make rules for all error messages

AVAILABLE_LANGUAGES_ERRORS=

AVAILABLE_LANGUAGES_ERRORS_RULES=$srcdir/ac_available_languages_fragment

rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES

for i in $AVAILABLE_LANGUAGES

do

  AVAILABLE_LANGUAGES_ERRORS="$AVAILABLE_LANGUAGES_ERRORS $i/errmsg.sys"

  case $host_os in

    netware*)

      echo "$i/errmsg.sys: $i/errmsg.txt

	\$(top_builddir)/extra/comp_err.linux -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \

      >> $AVAILABLE_LANGUAGES_ERRORS_RULES

      ;;

    *)

  echo "$i/errmsg.sys: $i/errmsg.txt

	\$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \

    >> $AVAILABLE_LANGUAGES_ERRORS_RULES

      ;;

  esac

done



#####

#####
@@ -93,7 +71,6 @@ AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION], 
AC_SUBST(SHARED_LIB_VERSION)

AC_SUBST(AVAILABLE_LANGUAGES)

AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)

AC_SUBST_FILE(AVAILABLE_LANGUAGES_ERRORS_RULES)



AC_SUBST([NDB_VERSION_MAJOR])

AC_SUBST([NDB_VERSION_MINOR])

include/config-win.h

+15 −8
Original line number Diff line number Diff line
@@ -31,18 +31,25 @@ functions */ 


#define HAVE_SMEM 1



#if defined(__NT__)

#define SYSTEM_TYPE	"NT"

#elif defined(__WIN2000__)

#define SYSTEM_TYPE	"WIN2000"

#if defined(_WIN64) || defined(WIN64) 

#define SYSTEM_TYPE	"Win64" 

#elif defined(_WIN32) || defined(WIN32) 

#define SYSTEM_TYPE	"Win32" 

#else

#define SYSTEM_TYPE	"Win95/Win98"

#define SYSTEM_TYPE	"Windows"

#endif



#if defined(_WIN64) || defined(WIN64)

#define MACHINE_TYPE	"ia64"		/* Define to machine type name */

#if defined(_M_IA64) 

#define MACHINE_TYPE	"ia64" 

#elif defined(_M_IX86) 

#define MACHINE_TYPE	"ia32" 

#elif defined(_M_ALPHA) 

#define MACHINE_TYPE	"axp" 

#else

#define MACHINE_TYPE	"i32"		/* Define to machine type name */

#define MACHINE_TYPE	"unknown"	/* Define to machine type name */

#endif 

 

#if !(defined(_WIN64) || defined(WIN64)) 

#ifndef _WIN32

#define _WIN32				/* Compatible with old source */

#endif

myisam/ft_nlq_search.c

+6 −1
Original line number Diff line number Diff line
@@ -261,6 +261,10 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query, 


  }



  /*

    If ndocs == 0, this will not allocate RAM for FT_INFO.doc[],

    so if ndocs == 0, FT_INFO.doc[] must not be accessed.

   */

  dlist=(FT_INFO *)my_malloc(sizeof(FT_INFO)+

			     sizeof(FT_DOC)*(aio.dtree.elements_in_tree-1),

			     MYF(0));
@@ -329,7 +333,8 @@ float ft_nlq_find_relevance(FT_INFO *handler, 
    else

      a=c;

  }

  if (docs[a].dpos == docid)

  /* bounds check to avoid accessing unallocated handler->doc  */

  if (a < handler->ndocs && docs[a].dpos == docid)

    return (float) docs[a].weight;

  else

    return 0.0;