Commit 83a096ec authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/usr/home/ram/work/4.0


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents d4ac4cb1 bdecd73e

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ pgulutzan@linux.local 
ram@gw.mysql.r18.ru

ram@mysql.r18.ru

ram@ram.(none)

ramil@mysql.com

ranger@regul.home.lan

rburnett@build.mysql.com

root@x3.internalnet

extra/replace.c

+13 −13
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ static REP_SET *make_new_set(REP_SETS *sets); 
static void make_sets_invisible(REP_SETS *sets);

static void free_last_set(REP_SETS *sets);

static void free_sets(REP_SETS *sets);

static void set_bit(REP_SET *set, uint bit);

static void clear_bit(REP_SET *set, uint bit);

static void internal_set_bit(REP_SET *set, uint bit);

static void internal_clear_bit(REP_SET *set, uint bit);

static void or_bits(REP_SET *to,REP_SET *from);

static void copy_bits(REP_SET *to,REP_SET *from);

static int cmp_bits(REP_SET *set1,REP_SET *set2);
@@ -454,7 +454,7 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
  {

    if (from[i][0] == '\\' && from[i][1] == '^')

    {

      set_bit(start_states,states+1);

      internal_set_bit(start_states,states+1);

      if (!from[i][2])

      {

	start_states->table_offset=i;
@@ -463,8 +463,8 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
    }

    else if (from[i][0] == '\\' && from[i][1] == '$')

    {

      set_bit(start_states,states);

      set_bit(word_states,states);

      internal_set_bit(start_states,states);

      internal_set_bit(word_states,states);

      if (!from[i][2] && start_states->table_offset == (uint) ~0)

      {

	start_states->table_offset=i;
@@ -473,11 +473,11 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
    }

    else

    {

      set_bit(word_states,states);

      internal_set_bit(word_states,states);

      if (from[i][0] == '\\' && (from[i][1] == 'b' && from[i][2]))

	set_bit(start_states,states+1);

	internal_set_bit(start_states,states+1);

      else

	set_bit(start_states,states);

	internal_set_bit(start_states,states);

    }

    for (pos=from[i], len=0; *pos ; pos++)

    {
@@ -583,9 +583,9 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
		follow[i].len > found_end)

	      found_end=follow[i].len;

	    if (chr && follow[i].chr)

	      set_bit(new_set,i+1);		/* To next set */

	      internal_set_bit(new_set,i+1);		/* To next set */

	    else

	      set_bit(new_set,i);

	      internal_set_bit(new_set,i);

	  }

	}

	if (found_end)
@@ -602,7 +602,7 @@ REPLACE *init_replace(my_string *from, my_string *to,uint count, 
	    if (follow[bit_nr-1].len < found_end ||

		(new_set->found_len &&

		 (chr == 0 || !follow[bit_nr].chr)))

	      clear_bit(new_set,i);

	      internal_clear_bit(new_set,i);

	    else

	    {

	      if (chr == 0 || !follow[bit_nr].chr)
@@ -751,13 +751,13 @@ static void free_sets(REP_SETS *sets) 
  return;

}



static void set_bit(REP_SET *set, uint bit)

static void internal_set_bit(REP_SET *set, uint bit)

{

  set->bits[bit / WORD_BIT] |= 1 << (bit % WORD_BIT);

  return;

}



static void clear_bit(REP_SET *set, uint bit)

static void internal_clear_bit(REP_SET *set, uint bit)

{

  set->bits[bit / WORD_BIT] &= ~ (1 << (bit % WORD_BIT));

  return;