Commit 38c8be9c authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Merge work:/home/bk/mysql 

into threads.polyesthetic.msg:/usr/local/src/my/work
parents 430cbbdf df3c60a6

Docs/manual.texi

+15 −0
Original line number Diff line number Diff line
@@ -4149,11 +4149,26 @@ USA [LinuxWired/Scottsdale, AZ] @ 
@uref{http://mysql.linuxwired.net/, WWW}

@uref{ftp://ftp.linuxwired.net/pub/mirrors/mysql/, FTP}













@item













@c EMAIL: dan@surfsouth.com (Dan Muntz)













@c @image{Flags/usa}













USA [Venoma.Org/Valdosta, GA] @













@uref{http://mysql.venoma.org/, WWW}



























@end itemize





























@strong{South America:}





























@itemize @bullet

























@item













@c Added 20001102













@c EMAIL: nico@bannerlandia.com (Nicolas Moldavsky)













@c @image{Flags/argentina}













Argentina [bannerlandia.com] @













@uref{http://mysql.bannerlandia.com.ar/, WWW}













@uref{ftp://mysql.bannerlandia.com.ar/mirrors/mysql/, FTP}



























@c @item















@c Not ok 20000919; Non-existent (Matt)















@c EMAIL: gaiser@matrix.com.br (Roberto Gaiser)

























myisam/ft_search.c



+0
−4






























Original line number
Diff line number
Diff line








@@ -158,7 +158,6 @@ FT_DOCLIST * ft_init_search(void *info, uint keynr, byte *key,













  ALL_IN_ONE aio;















  FT_DOCLIST *dlist;















  FT_DOC     *dptr;













  my_off_t    saved_lastpos;































/* black magic ON */















  if ((int) (keynr = _mi_check_index((MI_INFO *)info,keynr)) < 0)









@@ -174,8 +173,6 @@ FT_DOCLIST * ft_init_search(void *info, uint keynr, byte *key,













  aio.keyinfo=aio.info->s->keyinfo+keynr;















  aio.key_root=aio.info->s->state.key_root[keynr];





























  saved_lastpos=aio.info->lastpos;





























  if (!(wtree=ft_parse(NULL,key,key_len))) return NULL;































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










@@ -204,7 +201,6 @@ FT_DOCLIST * ft_init_search(void *info, uint keynr, byte *key,













  }































err:













  aio.info->lastpos=saved_lastpos;















  delete_tree(&aio.dtree);















  delete_tree(wtree);















  my_free((char*) wtree,MYF(0));

































sql/ha_myisam.cc



+8
−22






























Original line number
Diff line number
Diff line








@@ -1079,20 +1079,6 @@ ha_rows ha_myisam::records_in_range(int inx,













				       end_search_flag);















}





























int ha_myisam::ft_init(uint inx, const byte *key, uint keylen, bool presort)













{













  if (ft_handler)













    return -1;



























  // Do the search!













  ft_handler=ft_init_search(file,inx,(byte*) key,keylen,presort);



























  if (!ft_handler)













    return (my_errno ? my_errno : -1);



























  return 0;













}





























int ha_myisam::ft_read(byte * buf)















{















  int error;

































sql/ha_myisam.h



+3
−2






























Original line number
Diff line number
Diff line








@@ -71,8 +71,9 @@ class ha_myisam: public handler













  int index_first(byte * buf);















  int index_last(byte * buf);















  int index_next_same(byte *buf, const byte *key, uint keylen);













  int ft_init(uint inx,const byte *key, uint keylen, bool presort=1);













  void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort=0)













  int ft_init()













         { if(!ft_handler) return 1; ft_reinit_search(ft_handler); return 0; }













  void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort)















               { return ft_init_search(file,inx,(byte*) key,keylen,presort); }















  int ft_read(byte *buf);















  int rnd_init(bool scan=1);

































sql/handler.h



+3
−3






























Original line number
Diff line number
Diff line








@@ -222,9 +222,9 @@ class handler :public Sql_alloc













  virtual int index_first(byte * buf)=0;















  virtual int index_last(byte * buf)=0;















  virtual int index_next_same(byte *buf, const byte *key, uint keylen);













  virtual int ft_init(uint inx,const byte *key, uint keylen, bool presort=1)













  virtual int ft_init()















                                 { return -1; }













  virtual void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort=0)













  virtual void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort)















                                 { return (void *)NULL; }















  virtual int ft_read(byte *buf) { return -1; }















  virtual int rnd_init(bool scan=1)=0;