unknown 8b1a32aead Merge mysql.com:/home/mysql_src/mysql-4.1 ...

into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset


BitKeeper/deleted/.del-compile-pentium64-valgrind-max:
  Delete: BUILD/compile-pentium64-valgrind-max
BitKeeper/etc/config:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.h:
  Auto merged
client/mysqltest.c:
  manual merge
mysql-test/r/subselect.result:
  manual merge
mysql-test/t/subselect.test:
  manual merge
sql/log_event.cc:
  manual merge
sql/log_event.h:
  manual merge
sql/slave.cc:
  manual merge
sql/sql_yacc.yy:
  manual merge

2005-10-12 21:58:02 +02:00

..

config

Merge mysql.com:/home/mysql_src/mysql-4.1

2005-10-12 21:58:02 +02:00

gone

Merge bk-internal.mysql.com:/data0/bk/mysql-4.1

2005-05-24 00:31:28 +02:00

logging_ok

merge

2005-06-14 00:05:27 +02:00

notify

notify BitKeeper file /home/bk/mysql/BitKeeper/etc/notify

2000-08-02 01:45:37 +02:00

RESYNC_TREE

Merge mysql.com:/home/alexi/dev/mysql-4.1-0

2005-09-06 23:49:54 +04:00

skipkeys

BK automatic LOD removal.

2002-11-07 11:20:17 +04:00