Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message


innobase/fil/fil0fil.c:
  Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message

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

into mysql.com:/usr/home/bar/mysql-4.1-again

  Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client


client/mysqldump.c:
  Bug#7997 Add implicit --skip-set-charset when mysqldump from 4.0 server w/ 4.1 client

into mysql.com:/usr/home/ram/work/4.1.b4802


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged

BitKeeper/etc/ignore:
  added ndb/src/common/debugger/signaldata/libsignaldataprint.dsp ndb/src/common/debugger/libtrace.dsp ndb/src/common/logger/liblogger.dsp ndb/src/common/mgmcommon/libmgmsrvcommon.dsp ndb/src/common/portlib/libportlib.dsp ndb/src/common/transporter/libtransporter.dsp ndb/src/common/util/libgeneral.dsp ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp ndb/src/kernel/blocks/dbacc/libdbacc.dsp ndb/src/kernel/blocks/dbdict/libdbdict.dsp ndb/src/kernel/blocks/dbdih/libdbdih.dsp ndb/src/kernel/blocks/dblqh/libdblqh.dsp ndb/src/kernel/blocks/dbtc/libdbtc.dsp ndb/src/kernel/blocks/dbtup/libdbtup.dsp ndb/src/kernel/blocks/dbtux/libdbtux.dsp ndb/src/kernel/blocks/dbutil/libdbutil.dsp ndb/src/kernel/blocks/grep/libgrep.dsp ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp ndb/src/kernel/blocks/ndbfs/libndbfs.dsp ndb/src/kernel/blocks/qmgr/libqmgr.dsp ndb/src/kernel/blocks/suma/libsuma.dsp ndb/src/kernel/blocks/trix/libtrix.dsp ndb/src/kernel/error/liberror.dsp ndb/src/kernel/vm/libkernel.d
  sp ndb/src/kernel/ndbd.dsp ndb/src/mgmapi/libmgmapi.dsp ndb/src/mgmclient/ndb_mgm.dsp ndb/src/mgmclient/libndbmgmclient.dsp ndb/src/mgmsrv/ndb_mgmd.dsp ndb/src/ndbapi/libndbapi.dsp ndb/src/libndbclient.dsp ndb/test/ndbapi/flexBench.dsp ndb/test/ndbapi/testBasic.dsp ndb/test/ndbapi/testBlobs.dsp ndb/test/ndbapi/testScan.dsp ndb/test/src/libNDBT.dsp ndb/tools/ndb_waiter.dsp ndb/tools/ndb_drop_table.dsp ndb/tools/ndb_delete_all.dsp ndb/tools/ndb_desc.dsp ndb/tools/ndb_drop_index.dsp ndb/tools/ndb_show_tables.dsp ndb/tools/ndb_select_all.dsp ndb/tools/ndb_select_count.dsp

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

  More explicit naming of variables


ndb/include/kernel/signaldata/AlterIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/BuildIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateTrig.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/DropIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Set error/master node also on BuildIndxRef
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Use masterNodeId instead of errornode

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

  remove dict forwarding
  add api retries on NotMaster
  


ndb/include/kernel/signaldata/AlterIndx.hpp:
  Add NotMaster error code
ndb/include/kernel/signaldata/BuildIndx.hpp:
  Add NotMaster error code
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Add NotMaster error code
ndb/include/kernel/signaldata/CreateTrig.hpp:
  Add NotMaster error code
ndb/include/kernel/signaldata/DropIndx.hpp:
  Add NotMaster error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Never forward requests,
    instead REF to API who will retry towards correct node
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  1) Set error code for timeout
  2) Handle NotMaster with retry in all DICT requests
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Fix so that input values is in seconds and not 100ms's
sql/ha_ndbcluster.cc:
  Wait 3 sec for all nodes to connect...

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

  Add new manual.texi include files


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

into mysql.com:/home/jonas/src/mysql-4.1

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

mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
sql/log.cc:
  Merge from 4.0

into mysql.com:/home/bk/b8412-mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.1-clean

start_waiting_global_read_lock() should wake up all those who are waiting
for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
AND those registered in global_read_lock_blocks_commit.


sql/lock.cc:
  start_waiting_global_read_lock() should wake up all those who are waiting
  for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
  AND those registered in global_read_lock_blocks_commit.

into mysql.com:/usr/home/bar/mysql-4.1

  Activate Unicode collations in Windows version.


include/config-win.h:
  Activate Unicode collations in Windows version.

   make sure transporter connections are close early in shutdown


ndb/src/common/logger/LogHandler.cpp:
  removed printout "- Repeated 1 times"
ndb/src/kernel/main.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.hpp:
  make sure transporter connections are close early in shutdown

into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_acl.cc:
  Auto merged

into mysql.com:/home/jimw/my/mysql-4.1-clean


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

  Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.


innobase/row/row0sel.c:
  Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.

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

sql/log_event.cc:
  Auto merged

into mysql.com:/home/my/mysql-4.1

What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message. 


include/mysys_err.h:
  New mysys error message "unknown collation".
mysys/charset.c:
  Display more proper error when a collation is not found.
mysys/errors.c:
  New "unknown collation" error.

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