symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)


BitKeeper/deleted/.del-password.c~c036d4f8b3280843:
  Delete: client/password.c
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
  Delete: libmysql/password.c
include/mysql_com.h:
   - replaced "rnd" with "my_rnd"
libmysql/Makefile.am:
   - removed dead piece of code ($qs was not defined)
   - symlink password.c from the sql directory
libmysqld/Makefile.am:
   - use password.c from the sql directory instead
sql/item_func.cc:
   - replaced "rnd" with "my_rnd"
sql/mysqld.cc:
   - replaced "rnd" with "my_rnd"
sql/password.c:
   - replaced "rnd" with "my_rnd"
sql/sql_class.cc:
   - replaced "rnd" with "my_rnd"
sql/sql_crypt.cc:
   - replaced "rnd" with "my_rnd"

 - tagged ChangeSet 1.1671 as mysql-4.0.12


configure.in:
   - updated version number (4.0.12 -> 4.0.13)

a deadlock between I/O and SQL threads in replication
when relay_log_space is too small. This fixes bug #79.


sql/log.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/slave.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/slave.h:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/sql_repl.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.

into narttu.mysql.fi:/my/mysql-4.0

Ensure that \ is not allowed in filenames, even on Unix


include/my_dbug.h:
  Rename: include/dbug.h -> include/my_dbug.h
include/Makefile.am:
  Change dbug.h -> my_dbug.h
include/my_global.h:
  Change dbug.h -> my_dbug.h
libmysql/get_password.c:
  Change dbug.h -> my_dbug.h
libmysqld/lib_vio.c:
  Change dbug.h -> my_dbug.h
sql/table.cc:
  Ensure that \ is not allowed in filenames, even on Unix

into mashka.mysql.fi:/home/my/mysql-4.0

mysql-test/r/create.result:
  After merge fix
sql/sql_insert.cc:
  Write binlog before commit
sql/sql_update.cc:
  Added comment

  Fix compiler warning in Windows about ib_longlong to ulint conversion


innobase/trx/trx0roll.c:
  Fix compiler warning in Windows about ib_longlong to ulint conversion

  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal


innobase/row/row0sel.c:
  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal

client/mysqlshow.c:
   - fixed C++-style comment to make IBM C compiler happy

- Fix for empty table/column names


mysql-test/t/create.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/filesort.cc:
  merge with 3.23
sql/sql_table.cc:
  merge with 3.23
tests/grant.res:
  merge with 3.23

sql/sql_parse.cc:
  Removed not needed test

into mysql.com:/Users/mysqldev/my/mysql-4.0

into mashka.mysql.fi:/home/my/mysql-3.23

mysql-test/t/create.test:
  Test for empty table/column name
tests/grant.pl:
  More tests
tests/grant.res:
  More tests

the output of the script.


scripts/mysql_tableinfo.sh:
  Small fixes in this program which I contributed some time ago. These fixes
  are waiting in Monty's mailbox since August, and there are tiny :
  * use array{'x'} instead of array{x}
  * use fetchrow_arrayref instead of fetchrow_array
  * try to hide the command-line options from 'ps' like mysqlhotcopy does
  * use 'map' instead of homegrown function
  * use $_ instead of $i when possible

  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range


sql/ha_innobase.cc:
  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range


sql/ha_innodb.cc:
  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

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

sql/filesort.cc:
  SCCS merged

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

   already existing "--skip-dmg" (per Monty request)
 - Fixed handling of license files

sql/sql_base.cc:
  Auto merged
tests/grant.res:
  Auto merged

tests/grant.pl:
  More options for test
tests/grant.res:
  new test results

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

   "DBUG_RETURN undeclared" on Mac OS X)

man/perror.1:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/analyse.result:
  ul
mysql-test/r/group_by.result:
  ul
mysql-test/r/select.result:
  ul

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


sql/mysqld.cc:
  Auto merged

into serg.mysql.com:/usr/home/serg/Abk/mysql

Docs/internals.texi:
  Added PeterG's new internals documentation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted