Commit f57d5412 authored by unknown's avatar unknown
Browse files

merged 


BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/rpl000015.result:
  Auto merged
mysql-test/r/rpl_log_pos.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
parents 1dc1ad9c 158d655c

myisam/ft_boolean_search.c

+2 −2
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void _ftb_init_index_search(FT_INFO *ftb) 
          FTB_EXPR *top_ftbe=ftbe->up->up;

          ftbw->docid[0]=HA_OFFSET_ERROR;

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

            if (ftbe->flags & FTB_FLAG_YES)

            if (!(ftbe->flags & FTB_FLAG_NO))

              ftbe->yweaks++;

          ftbe=0;

          break;
@@ -356,7 +356,7 @@ static void _ftb_init_index_search(FT_INFO *ftb) 
      }

      if (!ftbe)

        continue;

      /* 3 */

      /* 4 */

      if (!is_tree_inited(& ftb->no_dupes))

        init_tree(& ftb->no_dupes,0,0,sizeof(my_off_t),

            _ftb_no_dupes_cmp,0,0,0);

mysql-test/r/fulltext.result

+8 −0
Original line number Diff line number Diff line
@@ -190,6 +190,14 @@ a 
select * from t1 where match a against ("+aaa10 +(bbb*)" in boolean mode);

a

aaa10 bbb20

select * from t1 where match a against ("+(+aaa* +bbb1*)" in boolean mode);

a

aaa20 bbb15

aaa30 bbb10

select * from t1 where match a against ("(+aaa* +bbb1*)" in boolean mode);

a

aaa20 bbb15

aaa30 bbb10

drop table t1;

CREATE TABLE t1 (

id int(11),

mysql-test/t/fulltext.test

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ select * from t1 where match a against ("+aaa* +bbb*" in boolean mode); 
select * from t1 where match a against ("+aaa* +bbb1*" in boolean mode);

select * from t1 where match a against ("+aaa* +ccc*" in boolean mode);

select * from t1 where match a against ("+aaa10 +(bbb*)" in boolean mode);

select * from t1 where match a against ("+(+aaa* +bbb1*)" in boolean mode);

select * from t1 where match a against ("(+aaa* +bbb1*)" in boolean mode);

drop table t1;



#

mysql-test/t/rpl000001.test

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ wait_for_slave_to_stop; 


# The following test can't be done because the result of Pos will differ

# on different computers

# --replace_result 9306 9999 3334 9999 3335 9999

# --replace_result $MASTER_MYPORT MASTER_PORT

# show slave status;



set global sql_slave_skip_counter=1;