Commit 762f423d authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents df56b252 b7c3a281

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -355,3 +355,6 @@ support-files/mysql.server 
support-files/mysql.spec

tags

tmp/*

libmysqld/sql_command

libmysqld/backup_dir

libmysqld/simple-test

BitKeeper/etc/logging_ok

+1 −1
Original line number Diff line number Diff line 
jani@janikt.pp.saunalahti.fi

monty@hundin.mysql.fi

monty@work.mysql.com

mwagner@evoq.mwagner.org

sasha@mysql.sashanet.com

tonu@hundin.mysql.fi
 
monty@work.mysql.com

include/myisam.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ typedef struct st_mi_isaminfo /* Struct from h_info */ 
  ulong mean_reclength;			/* Mean recordlength (if packed) */

  ulonglong auto_increment;

  ulonglong key_map;			/* Which keys are used */

  char  *data_file_name, *index_file_name;

  uint  keys;				/* Number of keys in use */

  uint	options;			/* HA_OPTIONS_... used */

  int	errkey,				/* With key was dupplicated on err */
@@ -86,6 +87,7 @@ typedef struct st_mi_isaminfo /* Struct from h_info */ 


typedef struct st_mi_create_info

{

  char *index_file_name, *data_file_name;	/* If using symlinks */

  ha_rows max_rows;

  ha_rows reloc_rows;

  ulonglong auto_increment;

myisam/ft_boolean_search.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ FT_DOCLIST *ft_boolean_search(MI_INFO *info, uint keynr, byte *query, 
  aio.end=query+query_len;

  aio.total_yes=aio.total_no=0;



  init_tree(&aio.dtree,0,sizeof(FT_SUPERDOC),(qsort_cmp)&FT_SUPERDOC_cmp,0,

  init_tree(&aio.dtree,0,sizeof(FT_SUPERDOC),(qsort2_cmp) &FT_SUPERDOC_cmp,0,

            NULL);



  if (do_boolean(&aio,0,0,0,0))

myisam/ft_dump.c

+5 −5
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ static char *query=NULL; 
int main(int argc,char *argv[])

{

  int error=0;

  uint keylen, inx, doc_cnt;

  uint keylen, inx, doc_cnt=0;

  float weight;

  double gws, min_gws, avg_gws=0;

  double gws, min_gws=0, avg_gws=0;

  MI_INFO *info;

  char buf[MAX], buf2[MAX], buf_maxlen[MAX], buf_min_gws[MAX], *s;

  char buf[MAX], buf2[MAX], buf_maxlen[MAX], buf_min_gws[MAX];

  ulong total=0, maxlen=0, uniq=0, max_doc_cnt=0;

#ifdef EVAL_RUN

  uint	       cnt;
@@ -111,8 +111,8 @@ int main(int argc,char *argv[]) 
      cnt=*(byte *)(info->lastkey+keylen);

#endif /* EVAL_RUN */



      snprintf(buf,MAX,"%.*s",keylen,info->lastkey+1);

      for (s=buf;*s;s++) *s=tolower(*s);

      snprintf(buf,MAX,"%.*s",(int) keylen,info->lastkey+1);

      casedn_str(buf);

      total++;



      if (count || stats)