twice, if --enabable-thread-safe-client is enabled, which broke RPM
   building)


Makefile.am:
   - reverted previous patch and removed libmysql_r from SUBDIRS again
     (it will automatically be added when --enable-thread-safe-client is
     used)

into sinisa.nasamreza.org:/mnt/work/mysql


sql/log.cc:
  Auto merged

  The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits


innobase/os/os0file.c:
  The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits

  Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table


sql/ha_innobase.cc:
  Backport from 4.0: convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table

  Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows


innobase/os/os0file.c:
  Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows

This fixes a possible core dump problem in SHOW PROCESSLIST


sql/slave.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
  Also first set query_length, then query
sql/sql_parse.cc:
  Indentation changes

into hundin.mysql.fi:/home/heikki/mysql

  Backport from 4.0: fix bug in adaptive hash index search


innobase/btr/btr0sea.c:
  Backport from 4.0: fix bug in adaptive hash index search

(like FLUSH TABLES).
(Code is already in 4.0)


sql/log.cc:
  Fixed bug with the --slow-log when logging an administrator command
  (like FLUSH TABLES).

into sinisa.nasamreza.org:/mnt/work/mysql

  Backport from 4.0: fix the BLOB hang if the index tree is of height 1


innobase/row/row0purge.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/btr/btr0btr.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/include/btr0btr.h:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1

  Backport from 4.0: fix possible adaprive hash index latch hang


sql/ha_innobase.cc:
  Backport from 4.0: fix possible adaprive hash index latch hang

sql/net_pkg.cc:
  Fixed wrong packed length for packet > 16M.
  (Not used in 3.23)

into sinisa.nasamreza.org:/mnt/work/mysql

  Backport bugfix from 4.0: combined log file size >= 2 GB could cause log to be written in wrong place
btr0pcur.c:
  Backport bugfix from 4.0: index cursor restoration could theoretically fail


innobase/btr/btr0pcur.c:
  Backport bugfix from 4.0: index cursor restoration could theoretically fail
innobase/log/log0log.c:
  Backport bugfix from 4.0: combined log file size >= 2 GB could cause log to be written in wrong place

packet is issued.



BitKeeper/deleted/.del-net.c~ef21d6402bb882f9:
  Delete: libmysql/net.c
sql/sql_select.cc:
  reversing a fix, but we shall yet see about this one ...

(To make the current tests results work on windows)

This fixed a bug in GROUP BY on a BLOB column with NULL values.


myisam/mi_create.c:
  Fixed max_key_length when using UNIQUE keys.
myisam/mi_unique.c:
  Simple optimization
  Make different CRC for keys with null and empty strings.
mysql-test/r/group_by.result:
  Updated results
mysql-test/t/group_by.test:
  Test of bug

   (There are probably some more to fix)


libmysql/Makefile.shared:
   - clean up the vio_* and ctype-* symlinks that are created by link_source
     (thanks to Christian Hammers from Debian for the patch)
strings/Makefile.am:
   - remove ctype_autonf.c on "make distclean" (it's generated by "configure")

into mysql.com:/space/my/mysql-3.23-build

Safety fix to not cause conflicts with extended packages in 4.0.


sql/mysqld.cc:
  Safety fix to not allow one to specify too big max_alloc_packet
sql/net_serv.cc:
  Safety fix to not cause conflicts with extended packages in 4.0.
  (Should not cause any notable changes for 3.23 servers)

   for the Debian project) to fix some architecture-specific problems
   and some bugs


Makefile.am:
   - put current directory (.) at front of SUBDIRS list, so that "distclean" 
     is done last. IF done first, "distclean" in include directory fails
     because config.h is missing, which is removed by distclean in current
     directory. (thanks to "jww" for the patch)
   - make "distclean" in libmysql_r, too (Thanks to Christian Hammers from the
     Debian project for the patch)
bdb/dist/aclocal/mutex.m4:
   - Sparc patch for mutexes/pthreads from Christopher C. Chimelis and
     Ben Collins from Debian (thanks to Christian Hammers from the Debian
     project for forwarding it)
bdb/include/mutex.h:
   - Patch for building on m68k architecture (originally provided
     by Michael Fedrowitz for Debian Linux, thanks to Christian Hammers from
     the Debian project for forwarding it)
ltconfig:
   - A hardcoded "rpath" is forbidden by the Debian policy (thanks to
     Christian Hammers from the Debian project for forwarding this patch)
man/isamchk.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/isamlog.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/mysql.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/mysql_zap.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/mysqlaccess.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/mysqladmin.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/mysqld.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/mysqld_multi.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/mysqldump.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
   - fixed nroff mistake
man/mysqlshow.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/perror.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/replace.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
man/safe_mysqld.1:
   - some syntactical correction in the headlines of the manpages for
     apropos(1) (Thanks to Christian Hammers from the Debian project for
     the patch)
scripts/mysql_fix_privilege_tables.sh:
   - fixed some typos
   - script cleanup
scripts/mysqlaccess.sh:
   - make $script_log path less dependent on the shell
scripts/safe_mysqld.sh:
   - applied patch provided by Debian to enhance security (This way all logs 
     and databases are created world-nothing).

sql/log.cc:
  Fix for a bug in query logging ...
sql/mysqld.cc:
  Fix for a bug with max_allowed_packt
sql/sql_select.cc:
  Fix for a bug which is caused when a single table is scanned by
  entire index and WHERE clause is so broad that JOIN type is JT_ALL.

  Remove an assertion which can fail in a race of 3 threads


innobase/btr/btr0sea.c:
  Remove an assertion which can fail in a race of 3 threads

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

  Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition


sql/ha_innobase.cc:
  Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition