into  oleksandr-byelkins-powerbook-g4-15.local:/Users/bell/mysql/bk/work-maria-wrn


storage/maria/ma_blockrec.c:
  Auto merged
storage/maria/ma_check.c:
  Auto merged
storage/maria/ma_control_file.c:
  Auto merged
storage/maria/ma_key_recover.c:
  Auto merged
storage/maria/ma_page.c:
  Auto merged
storage/maria/ma_pagecache.c:
  Auto merged
storage/maria/ma_recovery.c:
  Auto merged

include/maria.h:
  mac compiler warnings fixed.
storage/maria/ma_bitmap.c:
  mac compiler warnings fixed.
storage/maria/ma_blockrec.c:
  mac compiler warnings fixed.
storage/maria/ma_check.c:
  mac compiler warnings fixed.
storage/maria/ma_control_file.c:
  mac compiler warnings fixed.
storage/maria/ma_create.c:
  mac compiler warnings fixed.
storage/maria/ma_delete.c:
  mac compiler warnings fixed.
storage/maria/ma_ft_boolean_search.c:
  mac compiler warnings fixed.
storage/maria/ma_page.c:
  mac compiler warnings fixed.
storage/maria/ma_pagecache.c:
  mac compiler warnings fixed.
storage/maria/ma_recovery.c:
  mac compiler warning fixed.
storage/maria/ma_rt_test.c:
  mac compiler warnings fixed.
storage/maria/ma_search.c:
  mac compiler warning fixed.
storage/maria/ma_write.c:
  mac compiler warnings fixed.
storage/maria/unittest/ma_control_file-t.c:
  mac compiler warnings fixed.
storage/maria/unittest/ma_pagecache_consist.c:
  mac compiler warnings fixed.
storage/maria/unittest/ma_pagecache_single.c:
  mac compiler warnings fixed.
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
  mac compiler warning fixed.
storage/maria/unittest/test_file.c:
  mac compiler warning fixed.

BUILD/SETUP.sh:
  no need to force stack direction anymore

into  mysqlwin32.:C:/mysql-maria

BitKeeper/deleted/.del-.tree-is-private:
  Delete: .tree-is-private
include/my_dbug.h:
  To disable the popup of abort() we use _CrtReportMode/File()
  (thanks Wlad)
mysys/my_thr_init.c:
  Visual Studio 2005 does not allow overloading library functions.

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

    1. older automakes didn't have builddir, don't use it.
    2. destination can be read-only (think bk -r get)


dbug/Makefile.am:
  1. older automakes didn't have builddir, don't use it.
  2. destination can be read-only (think bk -r get)

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

    dbug naming conventions
dbug/user.r
    unification, documenting DBUG_ABORT()
include/my_dbug.h
    DBUG_ABORT()
sql/mysqld.cc
    remove redundant option (--enable-debug and --disable-debug should be
    used instead)


dbug/dbug.c:
  dbug naming conventions
dbug/user.r:
  unification, documenting DBUG_ABORT()
include/my_dbug.h:
  DBUG_ABORT()
sql/mysqld.cc:
  remove redundant option (--enable-debug and --disable-debug should be
  used instead)

into  janus.mylan:/usr/home/serg/Abk/mysql-maria


sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
include/my_dbug.h:
  merged

  SCCS merged


storage/maria/ma_control_file.c:
  SCCS merged

into  mysqlwin32.:C:/mysql-maria


mysql-test/include/wait_until_connected_again.inc:
  Auto merged
storage/maria/ha_maria.cc:
  Auto merged
storage/maria/ma_blockrec.c:
  Auto merged
storage/maria/ma_check.c:
  Auto merged
storage/maria/ma_loghandler.c:
  Auto merged

Windows.


include/my_dbug.h:
  a DBUG expression to force a flush of the trace file then an abort of the process
mysql-test/include/wait_until_connected_again.inc:
  mysqladmin waits for pid file to be gone only under Unix; so
  maria_empty_logs.inc cannot wait for mysqld to be gone, so
  wait_until_connected_again.inc may send its "show status" to a 
  not-yet-dead server hence the 1053 error ("server shutdown in progress")
mysys/my_thr_init.c:
  overload abort() under Windows, to not have an annoying CRT popup
  ("ignore/abort/retry" buttons) each time a test intentionally
  crashes mysqld
sql/handler.cc:
  use new expression
sql/log.cc:
  use new expression
sql/mysql_priv.h:
  use new expression
storage/maria/ha_maria.cc:
  use new expression
storage/maria/ma_blockrec.c:
  use new expression
storage/maria/ma_check.c:
  use new expression
storage/maria/ma_checkpoint.c:
  use new expression
storage/maria/ma_control_file.c:
  Can't yet lock control file under Windows (test suite problems,
  plus concerns about stray lock preventing a fast restart after crash).
storage/maria/ma_loghandler.c:
  A file which should be closed, otherwise translog_purge() (the caller)
  cannot delete logs.

*correct* disabling of dbug in mysql-test-run


include/atomic/gcc_builtins.h:
  after-merge
mysql-test/lib/mtr_report.pl:
  after-merge
mysql-test/mysql-test-run.pl:
  *correct* disabling of dbug in mysql-test-run
mysql-test/r/ps_maria.result:
  after-merge
mysql-test/t/crash_commit_before-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-big-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-bitmap-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-master.opt:
  *correct* disabling of dbug in mysql-test-run
sql/mysqld.cc:
  --disable-debug

storage/maria/ma_control_file.c:
  Even if the file is just created we have to lock it, otherwise some
  other Maria instance may write to it.
storage/maria/ma_pagecache.c:
  catch too big page numbers when they enter the pagecache; this helps
  debugging BUG#34250.

into  janus.mylan:/usr/home/serg/Abk/mysql-maria


include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_insert.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
sql/log_event_old.h:
  SCCS merged
BitKeeper/triggers/post-commit:
  merged
client/mysqldump.c:
  merged
configure.in:
  merged
client/mysqltest.c:
  merged
include/Makefile.am:
  merged
include/atomic/nolock.h:
  merged
mysql-test/lib/mtr_report.pl:
  merged
sql/handler.h:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged

dbug/dbug.c:
  dbug naming conventions
include/my_dbug.h:
  unused function

cause sporadic, but benign, errors.


mysql-test/lib/mtr_report.pl:
  Filtering out sporadic but benign error in rpl_err_ignoredtable.

into  janus.mylan:/usr/home/serg/Abk/mysql-maria

mysql-test/lib/mtr_report.pl:
  Ignoring benign error message (killing query causes unpredictable
  error messages).
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Disabling test case for embedded server.
sql/rpl_rli.cc:
  Inititializing uninitialized variable causing valgrind warning.

into  mysqlwin32.:C:/mysql-maria


storage/maria/unittest/ma_test_recovery.pl:
  Auto merged

mysql-test/include/wait_until_connected_again.inc:
  On Windows, mysqladmin does not wait on pid file when it has shut down
  mysqld. Thus, in maria_empty_logs.inc, wait_until_connected_again.inc
  can run while mysqld is shutting down (has not finished) and so
  get "shutdown in progress" instead of "can't connect".
mysql-test/t/maria-recovery-big.test:
  it is a big test
storage/maria/unittest/ma_test_recovery.pl:
  We want to see the result of 'cmp', like in the shell version

mysql-test/suite/rpl/r/rpl_user.result:
  Result change.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/r/rpl_user.result:
  Manual merge.

mysql-test/r/rpl_user.result:
  Result change.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/t/rpl_user.test:
  Manual merging.

mysql-test/t/rpl_user.test:
  Removing redundant reset master and deleting users from master
  and slave without using binary log.

mysql-test/suite/rpl/r/rpl_row_trig001.result:
  Result change.
mysql-test/suite/rpl/t/rpl_row_trig001.test:
  Correcting a typo and trying to avoid a race condition when
  dumping the contents of the master and slave for comparison.

mysql-test/suite/rpl/t/rpl_idempotency.test:
  Adding "have_innodb.inc" since the test reqires InnoDB.

mysql-test/include/delete_anonymous_users.inc:
  Disabling warnings.
mysql-test/lib/mtr_report.pl:
  Masking out benign errors and warnings from var/log/warnings file.

mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt:
  Correcting read_buffer_size to be a multiple of 4KiB since a
  warning is generated otherwise.

  added dbug/tests


BitKeeper/etc/ignore:
  added dbug/tests

dbug/dbug.c:
  function/ (a.k.a. SUBDIR) syntax
dbug/tests-t.pl:
  1. add support for test comments
  2. add test comments
  3. move tests around
  4. add SUBDIR tests
dbug/tests.c:
  support code for SUBDIR testing
include/my_dbug.h:
  comments. change in _db_set_ prototype
dbug/user.r:
  negative lists and function/ syntax.

mysql-test/lib/mtr_report.pl:
  Removing some expected warnings and errors from the slave for
  tests rpl_idempotency and rpl_skip_error.

           exists t1,t2,t3'
Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
           'mysql/ndb_apply_status'

Tests cases didn't wait for cluster to come up due to a typo
in have_multi_ndb.inc.


mysql-test/include/have_multi_ndb.inc:
  SHOW TABLES is case-sensitive in the pattern to LIKE.
mysql-test/suite/ndb/t/disabled.def:
  Enabling tests.
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Adding include of have_debug since test requires that.
sql/sql_repl.cc:
  Replacing 'return' with 'DBUG_RETURN' in debug-traced function.

mysql-test/suite/ndb/t/disabled.def:
  Disabling tests ndb_binlog_lob_bin, ndb_binlog_multi,
  and rpl_ndb_transaction.
mysql-test/suite/parts/t/disabled.def:
  Disabling various partition tests.