into mysql.com:/home/psergey/mysql-5.0-fix-vg1

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0

compile warning: changed eq_range -> eq_r

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-fix-vg1

into mysql.com:/home/mysql_src/mysql-5.0-clean

into mysql.com:/home/psergey/mysql-5.0-fix-vg1

  5.0 has a different way of knowing if master is < 3.23.57


sql/slave.cc:
  5.0 has a different way of knowing if master is < 3.23.57

into mysql.com:/home/kostja/work/mysql-5.0-root


configure.in:
  Auto merged

into mysql.com:/home/mysql_src/mysql-5.0-clean

into mysql.com:/home/mysql_src/mysql-4.1-clean

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


client/mysql.cc:
  Auto merged
myisam/mi_open.c:
  Auto merged

into mysql.com:/space/my/mysql-4.1

into mysql.com:/home/mysql_src/mysql-5.0-clean


sql/slave.cc:
  Auto merged

into mysql.com:/home/mysql_src/mysql-4.1-clean

into mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

We should not overwrite res if it is returned from a const item.

mysql-test/r/order_by.result:
  After merge fix
mysql-test/t/symlink.test:
  Comments

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/order_by.test:
  Merge
sql/sql_lex.cc:
  Merge
sql/sql_yacc.yy:
  Use local copy

sql/filesort.cc:
  Auto merged

mysys/my_symlink.c:
  More debugging

into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1

Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)


sql/slave.cc:
  Working around hang of master < 3.23.50 on SELECT @@unknown_var
  (to enable 3.23.49->4.1.10 replication)

into bob.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged

sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query


sql/sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query

into mysql.com:/space/my/mysql-4.1

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

into mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build


Build-tools/Do-pkg:
  Auto merged

sql/mysqld.cc:
  To allow builds without InnoDB ("classic"), the reference to 'innobase_use_checksums' must be guarded by an appropriate '#ifdef' (bug#7961).