Commit 2eabe8f3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into mysql.com:/home/jimw/my/mysql-5.0-clean


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/log.cc:
  Auto merged
parents 6520c161 a20374e3

BitKeeper/triggers/post-commit

+13 −6
Original line number Diff line number Diff line
@@ -20,14 +20,20 @@ if [ "$BK_STATUS" = OK ] 
then 



CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/ BUG#\1/p'`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`



if [ "$BUG" = "" ]

then

  TO=dev-public@mysql.com

  BS=""

  BH=""

else

  TO=dev-bugs@mysql.com

  BS=" BUG#$BUG"

# need newline here

  BH="X-Bug: $BUG

"

fi

#++

# dev-public@ / dev-bugs@
@@ -38,8 +44,8 @@ fi 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $TO

Subject: bk commit - $VERSION tree ($CHANGESET)${BUG}${WL}



Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}

$BH

EOF

  bk changes -v -r+

  bk cset -r+ -d
@@ -54,14 +60,15 @@ EOF 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $INTERNALS

Subject: bk commit into $VERSION tree ($CHANGESET)

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

$BH



Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER does a push these changes will

be propagated to the main repository and, within 24 hours after the

push, to the public repository.

For information on how to access the public repository

see http://www.mysql.com/doc/I/n/Installing_source_tree.html

see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html



EOF

  bk changes -v -r+
@@ -81,7 +88,7 @@ EOF 
List-ID: <bk.mysql-$VERSION>

From: $FROM

To: $DOCS

Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)

Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS



EOF

  bk changes -v -r+

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;

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ bool MYSQL_LOG::write(Log_event* event_info) 
        binlog_[wild_]{do|ignore}_table?" (WL#1049)"

    */

    if ((thd && !(thd->options & OPTION_BIN_LOG)) ||

	(local_db && !db_ok(local_db, binlog_do_db, binlog_ignore_db)))

	(!db_ok(local_db, binlog_do_db, binlog_ignore_db)))

    {

      VOID(pthread_mutex_unlock(&LOCK_log));

      DBUG_PRINT("error",("!db_ok('%s')", local_db));