into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

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

mysql-test/ndb/ndbcluster.sh:
  redirect to /dev/null to avoid grep -q

mysql-test/r/user_var.result:
  Update results
mysql-test/t/user_var.test:
  Remove unnecessary test

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

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

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


sql/item_func.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict

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


mysql-test/mysql-test-run.pl:
  Resolve conflict

sql/item.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

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


sql/set_var.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflict
mysql-test/t/variables.test:
  Resolve conflict

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

  
  This patch simply adds sql_big_selects to the list of variables
  output by SHOW VARIABLES.


mysql-test/r/variables.result:
  Update results
mysql-test/t/variables.test:
  Add new regression test (and make end-of-tests marker add output)
sql/set_var.cc:
  Add sql_big_selects to SHOW VARIABLES output

into  zim.(none):/home/brian/mysql/mysql-5.0

This patch restores sync_binlog.


sql/set_var.cc:
  restoring sync_binlog variable

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error

- added retry handling of temporary transaction errors

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1

into  mysql.com:/home/alexi/innodb/mysql-4.1-innodb

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

into  mysql.com:/home/alexi/innodb/mysql-4.1-innodb

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work

mysql-test/r/innodb_mysql.result:
  Fix result.

  clone-off for 5.0.21


configure.in:
  clone-off for 5.0.21

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work


mysql-test/t/innodb.test:
  Auto merged

 Use files innodb_mysql.[test|result] instead.


mysql-test/t/innodb.test:
  This file is to be used by Innobase only.
mysql-test/r/innodb_mysql.result:
  New BitKeeper file ``mysql-test/r/innodb_mysql.result''
   Use this file instead of innodb.result.
mysql-test/t/innodb_mysql.test:
  New BitKeeper file ``mysql-test/t/innodb_mysql.test''
   Use this file instead of innodb.test.

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged

 Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".


innobase/dict/dict0load.c:
  Applied innodb-5.0-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).