Commit ea04d331 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents 2f7a8c0f 7d109953

myisam/ft_boolean_search.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query, 
  _ftb_parse_query(ftb, &query, query+query_len, ftbe, 0);

  ftb->list=(FTB_WORD **)alloc_root(&ftb->mem_root,

                                     sizeof(FTB_WORD *)*ftb->queue.elements);

  memcpy(ftb->list, ftb->queue.root, sizeof(FTB_WORD *)*ftb->queue.elements);

  memcpy(ftb->list, ftb->queue.root+1, sizeof(FTB_WORD *)*ftb->queue.elements);

  qsort2(ftb->list, ftb->queue.elements, sizeof(FTB_WORD *),

                                           (qsort2_cmp)FTB_WORD_cmp_list, 0);

  if (ftb->queue.elements<2) ftb->with_scan=0;

sql/sql_select.cc

+2 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,8 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds, 
	  } while (keyuse->table == table && keyuse->key == key);



	  if (eq_part == PREV_BITS(uint,table->key_info[key].key_parts) &&

	      (table->key_info[key].flags & HA_NOSAME))

	      (table->key_info[key].flags & HA_NOSAME) &&

              !table->fulltext_searched)

	  {

	    if (const_ref == eq_part)

	    {					// Found everything for ref.