Commit 6f9fd8a5 authored by unknown's avatar unknown
Browse files

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 

into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
parents aeb527a7 ede21791

myisam/ft_boolean_search.c

+11 −11
Original line number Diff line number Diff line
@@ -164,9 +164,9 @@ static void _ftb_parse_query(FTB *ftb, byte **start, byte *end, 
        if (param.trunc)   ftbw->flags|=FTB_FLAG_TRUNC;

        ftbw->weight=weight;

        ftbw->up=up;

        ftbw->docid[0]=ftbw->docid[1]=HA_POS_ERROR;

        ftbw->docid[0]=ftbw->docid[1]=HA_OFFSET_ERROR;

        ftbw->ndepth= (param.yesno<0) + depth;

        ftbw->key_root=HA_POS_ERROR;

        ftbw->key_root=HA_OFFSET_ERROR;

        memcpy(ftbw->word+1, w.pos, w.len);

        ftbw->word[0]=w.len;

        if (param.yesno > 0) up->ythresh++;
@@ -181,7 +181,7 @@ static void _ftb_parse_query(FTB *ftb, byte **start, byte *end, 
        ftbe->weight=weight;

        ftbe->up=up;

        ftbe->ythresh=ftbe->yweaks=0;

        ftbe->docid[0]=ftbe->docid[1]=HA_POS_ERROR;

        ftbe->docid[0]=ftbe->docid[1]=HA_OFFSET_ERROR;

        if ((ftbe->quot=param.quot)) ftb->with_scan|=2;

        if (param.yesno > 0) up->ythresh++;

        _ftb_parse_query(ftb, start, end, ftbe, depth+1);
@@ -259,7 +259,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) 
  {

    if (!ftbw->off || !(ftbw->flags & FTB_FLAG_TRUNC))

    {

      ftbw->docid[0]=HA_POS_ERROR;

      ftbw->docid[0]=HA_OFFSET_ERROR;

      if ((ftbw->flags & FTB_FLAG_YES) && ftbw->up->up==0)

      {

        /*
@@ -346,7 +346,7 @@ static void _ftb_init_index_search(FT_INFO *ftb) 
             ftbe->up->ythresh - ftbe->up->yweaks >1)        /* 1 */

        {

          FTB_EXPR *top_ftbe=ftbe->up->up;

          ftbw->docid[0]=HA_POS_ERROR;

          ftbw->docid[0]=HA_OFFSET_ERROR;

          for (ftbe=ftbw->up; ftbe != top_ftbe; ftbe=ftbe->up)

            if (ftbe->flags & FTB_FLAG_YES)

              ftbe->yweaks++;
@@ -387,7 +387,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query, 
  ftb->charset= ((keynr==NO_SUCH_KEY) ?

           default_charset_info : info->s->keyinfo[keynr].seg->charset);

  ftb->with_scan=0;

  ftb->lastpos=HA_POS_ERROR;

  ftb->lastpos=HA_OFFSET_ERROR;

  bzero(& ftb->no_dupes, sizeof(TREE));



  init_alloc_root(&ftb->mem_root, 1024, 1024);
@@ -410,7 +410,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query, 
  ftbe->quot=0;

  ftbe->up=0;

  ftbe->ythresh=ftbe->yweaks=0;

  ftbe->docid[0]=ftbe->docid[1]=HA_POS_ERROR;

  ftbe->docid[0]=ftbe->docid[1]=HA_OFFSET_ERROR;

  ftb->root=ftbe;

  _ftb_parse_query(ftb, &query, query+query_len, ftbe, 0);

  ftb->list=(FTB_WORD **)alloc_root(&ftb->mem_root,
@@ -561,7 +561,7 @@ int ft_boolean_read_next(FT_INFO *ftb, char *record) 


  while (ftb->state == INDEX_SEARCH &&

         (curdoc=((FTB_WORD *)queue_top(& ftb->queue))->docid[0]) !=

         HA_POS_ERROR)

         HA_OFFSET_ERROR)

  {

    while (curdoc == (ftbw=(FTB_WORD *)queue_top(& ftb->queue))->docid[0])

    {
@@ -615,7 +615,7 @@ float ft_boolean_find_relevance(FT_INFO *ftb, byte *record, uint length) 
  const byte *end;

  my_off_t  docid=ftb->info->lastpos;



  if (docid == HA_POS_ERROR)

  if (docid == HA_OFFSET_ERROR)

    return -2.0;

  if (!ftb->queue.elements)

    return 0;
@@ -627,9 +627,9 @@ float ft_boolean_find_relevance(FT_INFO *ftb, byte *record, uint length) 


    for (i=0; i < ftb->queue.elements; i++)

    {

      ftb->list[i]->docid[1]=HA_POS_ERROR;

      ftb->list[i]->docid[1]=HA_OFFSET_ERROR;

      for (x=ftb->list[i]->up; x; x=x->up)

        x->docid[1]=HA_POS_ERROR;

        x->docid[1]=HA_OFFSET_ERROR;

    }

  }

mysql-test/r/ctype_ucs.result

+15 −0
Original line number Diff line number Diff line
@@ -487,3 +487,18 @@ prepare stmt1 from @str2; 
execute stmt1 using @ivar;

?

1234

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	79	User var	1	79	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	119	Query	1	119	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;

use test;

SET TIMESTAMP=10000;

insert into t2 values (@v);

drop table t2;

mysql-test/r/fulltext.result

+9 −0
Original line number Diff line number Diff line
@@ -382,3 +382,12 @@ s 
pra para para

para para para

DROP TABLE t1;

CREATE TABLE t1 (h text, FULLTEXT (h));

INSERT INTO t1 VALUES ('Jesses Hasse Ling and his syncopators of Swing');

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

select count(*) from t1;

count(*)

1

drop table t1;

mysql-test/r/user_var.result

+1 −12
Original line number Diff line number Diff line
@@ -169,18 +169,12 @@ SET @`a b`='hello'; 
INSERT INTO t1 VALUES(@`a b`);

set @var1= "';aaa";

insert into t1 values (@var1);

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

insert into t2 values (@v);

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.000001	79	User var	1	79	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci

master-bin.000001	120	Query	1	120	use `test`; INSERT INTO t1 VALUES(@`a b`)

master-bin.000001	184	User var	1	184	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci

master-bin.000001	226	Query	1	226	use `test`; insert into t1 values (@var1)

master-bin.000001	290	Query	1	290	use `test`; create table t2 (c char(30)) charset=ucs2

master-bin.000001	366	User var	1	366	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	406	Query	1	406	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

SET @`a b`:=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci;

use test;
@@ -189,12 +183,7 @@ INSERT INTO t1 VALUES(@`a b`); 
SET @`var1`:=_latin1 0x273B616161 COLLATE latin1_swedish_ci;

SET TIMESTAMP=10000;

insert into t1 values (@var1);

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;

SET TIMESTAMP=10000;

insert into t2 values (@v);

drop table t1, t2;

drop table t1;

set @var= NULL ;

select FIELD( @var,'1it','Hit') as my_column;

my_column

mysql-test/t/ctype_ucs.test

+16 −0
Original line number Diff line number Diff line
@@ -323,3 +323,19 @@ set @str1 = 'select ?'; 
set @str2 = convert(@str1 using ucs2);

prepare stmt1 from @str2;

execute stmt1 using @ivar;



#

# Check correct binlogging of UCS2 user variables (BUG#3875)

#

SET TIMESTAMP=10000;

create table t2 (c char(30)) charset=ucs2;

set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 79;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be

# escaped).

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 

drop table t2;