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

sql-bench/crash-me.sh:
  rectify mimer section
sql-bench/server-cfg.sh:
  - Add parameter time_format_inresult  
  - add parameters time_format_ISO, time_format_EUR, time_format_USA,          
   time_format_HHMMSS, time_format_HHHHMMSS
  - changed sub version() for mysql in the server-cfg, that version shows if 
   client connects with SSL
  - made --verbose by default
  - paramters func_extra_time_to_sec, ..sec_to_time, ..addtime, ..subtime, 
  ..timediff, ..maketime, ..time, func_odbc_hour, ..hour_time, ...minute, 
  ...second now uses time formats, that understandable for DBMS
sql-bench/test-insert.sh:
  some changes for mimer compability
sql-bench/test-select.sh:
  some changes for mimer compability

 - renamed MySQL.rpm to MySQL-server.rpm


scripts/make_binary_distribution.sh:
   - added mysql_waitpid to binary distribution (required for mysql-test-run)
support-files/mysql.spec.sh:
   - renamed package "MySQL" to "MySQL-server"
   - fixed Copyright tag
   - added mysql_waitpid to "client" subpackage (required for mysql-test-run)

mysql-test/r/query_cache.result:
  test of simple renaming & QC
mysql-test/t/query_cache.test:
  test of simple renaming & QC

BitKeeper/deleted/.del-ManualStyleGuidelines.wiki~4e97d272fd42b393:
  Delete: Docs/ManualStyleGuidelines.wiki

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

 - bumped up version number in configure.in to 4.0.10-gamma


configure.in:
   - bump up version number 4.0.9-gamma -> 4.0.10-gamma

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


scripts/mysqld_safe.sh:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

  Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table


sql/ha_innodb.cc:
  Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table

mysql-test/r/explain.result:
  test of bug with EXPLAIN on empty table
mysql-test/t/explain.test:
  test of bug with EXPLAIN on empty table

mysql-test/r/join.result:
  Test of LEFT JOIN bug
mysql-test/t/join.test:
  Test of LEFT JOIN bug

This fixes a problem with SHOW PROCESSLIST


sql/log_event.cc:
  Fixes cases where thd->query was not protected
sql/sql_acl.cc:
  Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_db.cc:
  Fixes cases where thd->query was not protected

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
innobase/btr/btr0sea.c:
  Merge with 3.23 (use local file)
sql/slave.cc:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23
sql/sql_parse.cc:
  Merge with 3.23

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

  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert


innobase/btr/btr0sea.c:
  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
innobase/include/btr0sea.h:
  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert

(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).

  Fix bug in PAGE_CUR_LE_OR_EXTENDS search


innobase/page/page0cur.c:
  Fix bug in PAGE_CUR_LE_OR_EXTENDS search

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

sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

BitKeeper/etc/ignore:
  added extra/mysql_waitpid

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

into hegel.local:/home/miguel/dev/mysql-4.0

  Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST


sql/ha_innodb.cc:
  Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST

innobase/btr/btr0btr.c:
  Auto merged
ltconfig:
  Auto merged
innobase/include/btr0btr.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
man/isamlog.1:
  Auto merged
man/mysql.1:
  Auto merged
man/mysql_zap.1:
  Auto merged
man/isamchk.1:
  Auto merged
man/mysqlaccess.1:
  Auto merged
man/mysqladmin.1:
  Auto merged
man/mysqld_multi.1:
  Auto merged
man/mysqld.1:
  Auto merged
man/mysqld_safe.1:
  Auto merged
man/mysqldump.1:
  Auto merged
man/mysqlshow.1:
  Auto merged
man/replace.1:
  Auto merged
myisam/mi_unique.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
man/perror.1:
  Auto merged
Makefile.am:
  merge with 3.23
client/mysqltest.c:
  merge with 3.23
innobase/btr/btr0pcur.c:
  merge with 3.23 (use local file)
innobase/row/row0purge.c:
  merge with 3.23 (use local file)
scripts/mysql_fix_privilege_tables.sh:
  Merge with 3.23 (Apply debian patches)
sql/ha_innodb.cc:
  merge with 3.23 (use local file)
sql/mysqld.cc:
  Merge with 3.23 (use local file)
sql/net_serv.cc:
  Merge with 3.23 (use local file)
sql/sql_db.cc:
  Merge with 3.23 (use local file)

mysql-test/r/merge.result:
  test added
mysql-test/t/merge.test:
  test added