innobase/row/row0mysql.c:
  Revert accidental modification to row_lock_table_autoinc_for_mysql()
  made in ChangeSet@1.1794.1.1
mysql-test/r/innodb.result:
  Revert ChangeSet@1.1794.1.1

into a80-186-24-72.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

to use long query strings with it.
Bug#3633


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/mysql_src/mysql-4.0

myisam/mi_dynrec.c:
  need DBUG_RETURN as we DBUG_ENTER

sql/sql_acl.cc:
  Auto merged

into mysql.com:/home/mysql_src/mysql-4.0

very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
and a comment update


mysql-test/r/rpl_server_id2.result:
  result update
mysql-test/t/rpl_server_id2.test:
  We stop the slave before cleaning up otherwise we'll get
  'drop table t1' executed twice, so an error in the slave.err
  (not critical).
sql/slave.cc:
  update comment about 4.1 now that 4.1 is fixed (in a few minutes, exactly)

innobase/include/os0file.h:
  Add os_file_set_eof()
innobase/os/os0file.c:
  Add os_file_set_eof()
innobase/srv/srv0srv.c:
  Replace chsize() or ftruncate() with os_file_set_eof()
sql/ha_innodb.cc:
  Replace my_chsize() with os_file_set_eof()

(Bug #3596)


innobase/srv/srv0srv.c:
  Truncate "<datadir>/innodb.status.<pid>" to its actual size (Bug #3596)
sql/ha_innodb.cc:
  Truncate "<datadir>/innodb.status.<pid>" to its actual size (Bug #3596)

innobase/os/os0file.c:
  Lock files unless #defined __WIN__ or UNIV_HOTBACKUP (Bug #3608)

into hundin.mysql.fi:/home/marko/l/mysql-4.0

VC++Files/client/mysqlclient.dsp:
  Add strxnmov to project files
VC++Files/mysql.dsw:
  Add dependency to prevent compile error

just for beauty of truth.


sql/mysqld.cc:
  correcting sentence (even if option is not really usable,
  as it depends on report-user and report-password which are undocumented
  (and will stay like this)).
sql/slave.cc:
  report password when you must report password.

into mysql.com:/home/mysql_src/mysql-4.0

in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
so that it is not cut by truncation if the query is very long (which happens if the query goes first).


sql/log_event.cc:
  in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
  so that it is not cut by truncation if the query is very long (which happens if the query goes first).

into hundin.mysql.fi:/home/marko/l/mysql-4.0

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

into mysql.com:/home/my/mysql-4.0

mysql-test/mysql-test-run.sh:
  Avoid 'too many arguments' error
mysql-test/t/system_mysql_db_fix-master.opt:
  Add missing newline
scripts/mysql_fix_privilege_tables.sh:
  Portability fix

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

innobase/include/lock0lock.h:
  Add lock_table_unlock() and lock_release_tables_off_kernel()
  Add LOCK_TABLE_EXP
innobase/include/row0mysql.h:
  Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/include/trx0trx.h:
  Add n_tables_locked
innobase/lock/lock0lock.c:
  Add LOCK_TABLE_EXP for explicit LOCK TABLE commands
  Add lock_table_unlock()
  Add lock_release_tables_off_kernel()
innobase/row/row0mysql.c:
  Add row_unlock_table_for_mysql() and row_lock_table_for_mysql()
innobase/trx/trx0trx.c:
  Add n_tables_locked
mysql-test/r/innodb.result:
  Updated handling of auto_inc columns
sql/ha_innodb.cc:
  Call row_lock_table_for_mysql() and row_unlock_table_for_mysql()

   MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)

innobase/pars/lexyy.c:
  Add missing include file (Needed for AIX)

into mysql.com:/home/mysql_src/mysql-4.0

Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file).


mysql-test/r/rpl_server_id1.result:
  be port-independent
mysql-test/r/rpl_server_id2.result:
  be port-independent
mysql-test/t/rpl_error_ignored_table.test:
  we want to sleep 2 secs, not more; if we allow ourselves to sleep >=10 seconds, then
  the get_lock() will be aborted and we will arrive to late for the KILL to have
  the desired effect of generating an error code in the binlog.
mysql-test/t/rpl_server_id1.test:
  be port-independent
mysql-test/t/rpl_server_id2.test:
  be port-independent

  Correct typo, and fix up rest of sentence as well.


support-files/my-medium.cnf.sh:
  Correct typo, and fix up rest of sentence as well.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/mysql_src/mysql-4.0

(WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have
two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is
(some sort of trigger).
Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"


sql/mysqld.cc:
  new option --replicate-same-server-id
sql/slave.cc:
  new option replicate_same_server_id, to force a slave to execute its own queries.
  Small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"
sql/slave.h:
  new option --replicate-same-server-id

into mysql.com:/home/my/mysql-4.0

into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged

  CREATE statement allowed extra unnecessary commas


mysql-test/r/alias.result:
  Extra comma removed in CREATE statement
mysql-test/r/create.result:
  New test for Bug 3481
mysql-test/r/func_str.result:
  Extra comma removed in CREATE statement
mysql-test/r/rpl_multi_update.result:
  Extra comma removed in CREATE statement
mysql-test/t/alias.test:
  Extra comma removed in CREATE statement
mysql-test/t/create.test:
  New test for bug 3481
mysql-test/t/func_str.test:
  Extra comma removed in CREATE statement
mysql-test/t/rpl_multi_update.test:
  Extra comma removed in CREATE statement
sql/sql_yacc.yy:
  Fix for bug 3481
    No path through the grammar which has no clauses
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted