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

sql/sql_lex.cc:
  No need to change options here.

into mysql.com:/home/pem/work/mysql-5.0

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

into mysql.com:/data0/mysqldev/my/mysql-5.0-merge


BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Auto merged

committing this deletion of federated.disabled, which was already committed in another tree apparently; just to make bk happy.


BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Delete: mysql-test/t/federated.disabled

into mysql.com:/home/pem/work/mysql-5.0

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

BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Delete: mysql-test/t/federated.disabled

into mysql.com:/home/cps/mysql/devel/im-fix-review

server-tools/instance-manager/Makefile.am:
  "Makefile" target removed

into mysql.com:/home/pem/work/mysql-5.0

into krsna.patg.net:/home/patg/mysql-5.0

Last part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" + fixes after merge


mysql-test/r/drop_temp_table.result:
  result update
mysql-test/r/mix_innodb_myisam_binlog.result:
  result update
mysql-test/r/rpl000001.result:
  result update
mysql-test/r/rpl_change_master.result:
  result update
mysql-test/r/rpl_deadlock.result:
  result update (merge)
mysql-test/t/rpl000001.test:
  can't rely on GET_LOCK() to do slave synchro (use table lock instead)
mysql-test/t/rpl_change_master.test:
  changing the test as we can't use GET_LOCK() for slave synchro
mysql-test/t/rpl_deadlock.test:
  update (merge) binlog positions
mysql-test/t/rpl_get_lock.test:
  comment

                of DROP PROCEDURE IF EXISTS statement.


mysql-test/r/sp.result:
  New test case for BUG#8757
mysql-test/t/sp.test:
  New test case for BUG#8757
sql/sp.cc:
  Don't zap lex->found_semicolon. (For compound statements)

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

into krsna.patg.net:/home/patg/mysql-5.0


sql/handler.cc:
  Auto merged

sql/sql_union.cc:
  a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used)
  Don't touch options as itit's not needed.

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


sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged

First part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()"
(next part is updating test results)


sql/item_func.cc:
  no need for binlogging DO RELEASE_LOCK() anymore. Make GET_LOCK() do nothing in slave thread.
sql/log_event.cc:
  comment fixes
sql/mysqld.cc:
  warning removed
sql/slave.cc:
  fix after merge

into mysql.com:/M50/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged

mysys/my_mmap.c:
  cleanup
sql/ha_innodb.cc:
  don's start a transaction in prepare().
  restore disabled code for ibbackup

sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  SCCS merged
sql/slave.h:
  SCCS merged

innobase/row/row0sel.c:
  Manual merge (Bug #8771)

After merge fix.
The bugfix results in a different error message in this situation.

use function-wide declaration also for loop body.


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Get rid of a duplicate declaration ('Uint32 k;' at function start) that caused 
  compiler failures on 'octane2' (both 32 and 64 bit) and a compiler crash on 'ds20'.
  It would be better not to use those variable declarations with a loop scope,
  they have caused compile problems again and again.

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


sql/mysqld.cc:
  Auto merged

in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).


sql/mysql_priv.h:
  new var slave_transaction_retries
sql/mysqld.cc:
  new variable slave_transaction_retries. Plus fixing a typo.
sql/set_var.cc:
  new global variable slave_transaction_retries (will be one per subslave, when we have multimaster).
sql/slave.cc:
  Slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
  optionally retry the transaction a certain number of times (--slave_transaction_retries).
sql/slave.h:
  new RELAY_LOG_INFO::trans_retries.

innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
sql/ha_innodb.h:
  SCCS merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

deadlock in MYSQL_LOG::new_file()
style fixes


mysql-test/r/innodb.result:
  one more test for truncate
mysql-test/t/innodb.test:
  one more test for truncate
sql/ha_innodb.cc:
  bug#8151 - truncate leaves a transaction open
sql/handler.cc:
  bug#8151 - truncate leaves a transaction open
sql/item.h:
  style fix
sql/item_cmpfunc.cc:
  style fix
sql/item_cmpfunc.h:
  style fix
sql/item_func.cc:
  style fix
sql/item_func.h:
  style fix
sql/log.cc:
  let new_file() to lock LOCK_index,
  don't check for prepared_xids in rotate_and_purge()
  increase thread_safe_increment when LOCK_log is taken
sql/log_event.cc:
  mysqlbinlog now prints a warning if binlog was not closed properly
sql/sql_class.h:
  comments
sql/sql_repl.cc:
  DBUG_ENTER tag corrected

Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.


myisam/mi_open.c:
  Bug#8306 - TRUNCATE leads to index corruption
  Made test_if_reopen() globally available.
myisam/myisamdef.h:
  Bug#8306 - TRUNCATE leads to index corruption
  Declared test_if_reopen() as globally available.
mysql-test/r/myisam.result:
  Bug#8306 - TRUNCATE leads to index corruption
  The test result.
mysql-test/t/myisam.test:
  Bug#8306 - TRUNCATE leads to index corruption
  The test case.

into krsna.patg.net:/home/patg/mysql-5.0


sql/handler.cc:
  Auto merged

into hundin.mysql.fi:/home/jan/mysql-5.0


sql/ha_innodb.cc:
  Auto merged

  Correct indentation + some small style corrections


sql/ha_innodb.cc:
  Correct indentation + some small style corrections

  updated ndb test makefile to make src dist complete


ndb/test/ndbapi/Makefile.am:
  updated ndb test makefile to make src dist complete

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

mysql-test/r/func_group.result:
  Added some tests and fix for Bug#5615.
mysql-test/r/show_check.result:
  Fix for Bug#5615.
mysql-test/t/func_group.test:
  Added some tests.
sql/item_sum.cc:
  Fix for Bug#5615.
sql/item_sum.h:
  Fix for Bug#5615.
sql/sql_select.cc:
  Fix for Bug#5615.
sql/sql_select.h:
  Fix for Bug#5615.