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

Funny sometimes how things work when in reality you would think it would crash pretty hard :)


sql/examples/ha_archive.cc:
  Solves bug #8691. This was reported in an internal build. Renamed ptr to bptr.

mysql-test-run runs with --sleep=10; otherwise GET_LOCK() times out
before being killed so we get 0 instead of NULL. Verified that it
works on our powermacg5 where the test was failing.


mysql-test/t/kill.test:
  must always sleep 2 seconds, even if mysql-test-run runs with --sleep=10;
  otherwise GET_LOCK() times out before being killed so we get 0 instead of NULL.

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


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged

sql/mysql_priv.h:
  IF_INNOBASE_DB macro added

mysql-test/r/rpl_insert_id.result:
  Auto merged

  The warning sent is by itself ok, the problem was rather why it wasn't
  sent on some other platforms...
  The real problem was that a total_warn_count which was inconsistent with warn_list
  was sent back with send_eof() during SP execution, which in turn cause a protocol
  error in mysqltest.


mysql-test/r/sp.result:
  Updated results after fixing bug in how total_warn_count is handled.
sql/protocol.cc:
  Fixed bug that caused protocol errors with mysqltest. Don't send total_warn_count
  with send_eof() during SP execution, as it's usually wrong anyway. (warn_list is
  cleared)
sql/sql_parse.cc:
  Reset total_warn_count if the warn_list has been cleared. This gets rid of
  "empty" warnings after some CALLs.

  Corrected path to my_decimal.cpp


VC++Files/libmysqld/libmysqld.dsp:
  Corrected path to my_decimal.cpp

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/mysqld.cc:
  Auto merged

sql/mysqld.cc:
  Update of helptext for ndb-cache-check-time

sql/ha_ndbcluster.cc:
  Use the ndb-cache-check-time value as a millisecond counter

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

  Redundant "Item::" was removed.


sql/sql_select.cc:
  Redundant "Item::" was removed.

into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

  Add new manual.texi include files


Build-tools/Bootstrap:
  Add new manual.texi include files

mysys.dsp:
  Added my_mmap


VC++Files/mysys/mysys.dsp:
  Added my_mmap

sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define
my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
mi_packrec.c:
  removed cast to caddr_t


myisam/mi_packrec.c:
  removed cast to caddr_t
sql/my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
sql/sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define

mysql-test/r/rpl_insert_id.result:
  fixed error format after mats merge
mysql-test/r/sp.result:
  fixed typo

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0

into mysql.com:/home/bkroot/mysql-5.0

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_parse.cc:
  Auto merged

logging_ok:
  Logging to logging@openlogging.org accepted
mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
  Changed how no mmap message is printed for Windows
sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap


sql/sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
mysys/my_mmap.c:
  Changed how no mmap message is printed for Windows
myisam/mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
myisam/mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/log.cc:
  Merge from 4.1

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


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0


BitKeeper/etc/logging_ok:
  auto-union

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0


BitKeeper/etc/logging_ok:
  auto-union

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0

sql/log.cc:
  Setting error code to 0 on SQL statements that cannot fail.

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

mysql-test/r/binlog.result:
  binlog rotation after a big transation
mysql-test/r/rpl_rotate_logs.result:
  innodb-dependent test removed
mysql-test/t/binlog.test:
  binlog rotation after a big transation
mysql-test/t/rpl_rotate_logs.test:
  innodb-dependent test removed

into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

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


sql/log_event.cc:
  Auto merged

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

pushed some minutes ago)



mysql-test/r/ctype_ucs.result:
  result fix
mysql-test/r/mysqlbinlog.result:
  result fix
mysql-test/r/mysqlbinlog2.result:
  result fix
mysql-test/r/rpl_charset.result:
  result fix
mysql-test/r/user_var.result:
  result fix