into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0


sql/mysqld.cc:
  Auto merged

in SHOW CREATE TABLE if a temporary file cannot be created.
(Bug #13002)


sql/ha_innodb.cc:
  ha_innobase::get_foreign_key_create_info(): Display an error
  message to the user if a temporary file cannot be created.

into  mysql.com:/home/mydev/mysql-4.0-4000

   spec file (the $RBR variable did not get expanded, thus leaving old build
   roots behind)


support-files/mysql.spec.sh:
   - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
     $RBR variable did not get expanded, thus leaving old build roots behind)

Second platform fix for floating point rounding.

Reduced the precision of the test numbers.
Not all platforms could reproduce the exact numbers.


mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The new test result

The problem was an ab-use of last_rkey_length.
Formerly we saved the packed key length (of the search key)
in this element. But in certain cases it got replaced by 
the (packed) result key length.
Now we use a new element of MI_INFO to save the packed key 
length of the search key.


myisam/mi_dbug.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Fixed the recognition of NULL values in _mi_print_key().
myisam/mi_rkey.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Saved the packed key length in a new element of MI_INFO.
myisam/mi_search.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Added a comment and trace prints.
myisam/myisamdef.h:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Added a new element to store the packed key length
  for use by the MyISAMMRG engine.
myisammrg/myrg_rkey.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Changed to use the new element of MI_INFO to get at the
  packed key length.
mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The test result.
mysql-test/t/merge.test:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The test case.

  Delete: man/which.2


BitKeeper/deleted/.del-which.2~463417adb2e37122:
  Delete: man/which.2

Ignored some generated files


mysql-test/t/analyze.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ansi-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ansi.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/backup-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb-alter-table-2-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb-deadlock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/bdb_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/bool.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/cast.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/constraints.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/convert.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/create_select_tmp.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_cp1251-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_cp1251.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_latin1_de-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_latin1_de.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_tis620-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_tis620.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_ujis-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/ctype_ujis.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/drop_temp_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/flush_block_commit.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_concat.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_encrypt-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_if.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/func_isnull.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/gcc296.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/grant_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/init_file-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/init_file.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb-deadlock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb-lock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_cache-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/innodb_handler.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/isam.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/loaddata.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_multi.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_tables_lost_commit-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lock_tables_lost_commit.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table3-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/lowercase_table3.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mix_innodb_myisam_binlog-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/mix_innodb_myisam_binlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/multi_update-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/myisam-blob-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/myisam-blob.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqlbinlog-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqlbinlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/mysqldump.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/packet.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache_merge.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/query_cache_notembedded.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair_part2-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/repair_part2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl000016-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_EE_error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_alter.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_chain_temp_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_change_master.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_commit_after_flush.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_do_grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_drop.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_empty_master_crash.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_error_ignored_table-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_error_ignored_table.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_failsafe.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-master.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop-slave.sh:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_flush_log_loop.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_free_items-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_free_items.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_get_lock.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_heap.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_ignore_grant-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_ignore_grant.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_insert_id.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_m-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_m.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_s-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddata_rule_s.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_loaddatalocal.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_log-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_log-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_master_pos_wait.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_max_relay_size.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_delete2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_multi_update2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_optimize.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_relayspace-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_relayspace.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_reset_slave.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id1.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id2-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_server_id2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_set_charset.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_skip_error-slave.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_skip_error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_start_stop_slave.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_trunc_binlog.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_fix-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_fix.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/system_mysql_db_refs.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone3-master.opt:
  Turn off EOLN_NATIVE flag
mysql-test/t/timezone3.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/type_set.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/variables-master.opt:
  Turn off EOLN_NATIVE flag
BitKeeper/etc/ignore:
  added support-files/MacOSX/preflight

Enlarged the counter variables to ulonglong.

Solution for 4.0 and 4.1.
If the caller cannot re-open table(s), it gives a NULL
'refresh' argument to open_table(). We used to ignore
flushes then. Now we ignore drops too.

into  kite-hub.kitebird.com:/tmp/merge-4.0

  Update README (2nd try)


README:
  Update README (2nd try)

into mysql.com:/M40/mysql-4.0


configure.in:
  Auto merged

configure.in:
  Auto merged
include/my_global.h:
  Auto merged

  Flag -DHAVE_DARWIN_THREADS not needed for darwin9


configure.in:
  Flag -DHAVE_DARWIN_THREADS not needed for darwin9

into  mysql.com:/home/hartmut/projects/mysql/dev/4.0

to be built successfully.


libmysqld/lib_vio.c:
  Added a copy of vio_was_interrupted() from viosocket.c, for successful build
  of libmysqld that uses own set of vio*() functions.

into  selena.:H:/MYSQL/src/#05588-mysql-4.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.0

sql/mysql_priv.h:
  initialisation moved to mysqld.cc
sql/mysqld.cc:
  initialisation moved to mysqld.cc
sql/sql_cache.cc:
  support of concurent query cache resizing:
        - resizing made atomic
        - check stack size after each quard mutex lock
sql/sql_cache.h:
  initialisation moved to mysqld.cc
  removed uneed parameter (now it is always under guard mutex protection or called from destruction)

  Back port of QNX work around for rint()


include/my_global.h:
  Back port of QNX work around for rint()

  Back port of code to find the right 'ps' settings


configure.in:
  Back port of code to find the right 'ps' settings

scripts/Makefile.am:
  Add "MYSQL_BASE_VERSION" to the list of substituted variables,
  for later (possible) use in "mysql_install_db" and "mysqld_safe".

read timeout properly on win32.


include/my_global.h:
  Added win32 specific socket timeout error code.
include/violite.h:
  Added vio_was_interrupted function that returns true if operation was
  not completed due to timeout.
sql/mini_client.cc:
  added a check that replication read was not completed due to timeout.
sql/net_serv.cc:
  net->last_errno should be equal to ER_NET_READ_INTERRUPTED in case if read
  operation was not completed due to timeout.
vio/vio.c:
  added initialization code for vio_was_interrupted() function.
vio/viosocket.c:
  Added vio_was_interrupted function that returns true if operation was
  not completed due to timeout.

  Update test result.


mysql-test/r/fulltext_var.result:
  Update test result.

  Reorder out-of-order system variables.


sql/set_var.cc:
  Reorder out-of-order system variables.

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0

  Make ports configurable from environment for test


Makefile.am:
  Make ports configurable from environment for test

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0


sql/mysqld.cc:
  Auto merged

  Reorder out-of-order status variables.


sql/mysqld.cc:
  Reorder out-of-order status variables.

  Reorder out-of-order system variables.


sql/set_var.cc:
  Reorder out-of-order system variables.

client/client_priv.h:
  Added option auto close for Netware.
client/mysql.cc:
  Added option auto close for Netware.
client/mysqladmin.c:
  Added option auto close for Netware.
client/mysqlbinlog.cc:
  Added option auto close for Netware.
client/mysqlcheck.c:
  Added option auto close for Netware.
client/mysqldump.c:
  Added option auto close for Netware.
client/mysqlimport.c:
  Added option auto close for Netware.
client/mysqlshow.c:
  Added option auto close for Netware.
client/mysqltest.c:
  Fixed help messages for Netware.
extra/my_print_defaults.c:
  Fixed help messages for Netware.
extra/perror.c:
  Fixed help messages for Netware.
extra/resolve_stack_dump.c:
  Fixed help messages for Netware.
include/help_end.h:
  Fixed help messages for Netware.
include/help_start.h:
  Fixed help messages for Netware.
isam/isamchk.c:
  Added auto close of window for Netware
isam/pack_isam.c:
  Added auto close of window for Netware
myisam/myisamchk.c:
  Added auto close of window for Netware
myisam/myisamlog.c:
  Added help for Netware.
myisam/myisampack.c:
  Added auto close for Netware.
netware/myisamchk.def:
  Scrollable screen patch.
netware/mysql.def:
  Scrollable screen patch.
netware/mysql_test_run.c:
  Fixed strindex for Netware.
netware/mysqladmin.def:
  Scrollable screen patch.
netware/mysqlbinlog.def:
  Scrollable screen patch.
netware/mysqlcheck.def:
  Scrollable screen patch.
netware/mysqld_safe.c:
  Removed debug message for Netware.
netware/mysqldump.def:
  Scrollable screen patch.
netware/mysqlimport.def:
  Scrollable screen patch.
netware/mysqlshow.def:
  Scrollable screen patch.
sql/mysqld.cc:
  Abnormal end patch when shutting down and volume not ready.

  Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain


sql/ha_innodb.cc:
  Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain

against a later version of libc.


include/config-netware.h:
  Changes for Netware. Needed to build against newer libc.
netware/BUILD/nwbootstrap:
  Fix to build script.
sql/mysqld.cc:
  Added an include.

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