mysql-test/r/information_schema.result:
  Update test result
mysql-test/r/query_cache.result:
  Reset query_cache_type for test
mysql-test/t/query_cache.test:
  Update test result
mysql-test/t/ndb_alter_table.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_autodiscover.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_autodiscover2.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_cache_multi.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_cache_multi2.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_multi.disabled:
  ***MISSING WEAVE***
mysql-test/t/ndb_restore.disabled:
  ***MISSING WEAVE***

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


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

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


sql/mysql_priv.h:
  Auto merged

Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Update results
mysql-test/t/query_cache.test:
  Merge test

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

sql/sql_table.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Update results
mysql-test/t/query_cache.test:
  Merge tests

  row_sel_store_mysql_rec(): Remove unused variable "index".


innobase/row/row0sel.c:
  row_sel_store_mysql_rec(): Remove unused variable "index".

into mysql.com:/M41/mysql-4.1

mysql-test/lib/mtr_report.pl:
  Keep the Perl version in sync with the shell script so that 'Do-compile' will call
  PS and ES tests even after some previous test failures.
  (See previous change to 'mysql-test-run.sh' and 'Do-compile'.)

into mysql.com:/usr/home/ram/work/5.0.b9029

into mysql.com:/usr/home/ram/work/5.0.b9029

into mysql.com:/usr/home/ram/work/5.0

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

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

  Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)


Build-tools/Do-solaris-pkg:
  Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)

into mysql.com:/home/psergey/mysql-5.0-bug8711


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  SCCS merged
mysql-test/t/join_outer.test:
  SCCS merged

Item_func_equal::not_null_tables() always return 0.


mysql-test/r/join_outer.result:
  Testcase for BUG#8711
mysql-test/t/join_outer.test:
  Testcase for BUG#8711
sql/item_cmpfunc.h:
  Fix for BUG#8711: "<=>" may have true value for NULL arguments, i.e. it can accept NULL-complemented 
  table rows. This differs from assumptions made in Item_func::not_null_tables(), so add 
  Item_func_equal::not_null_tables().
  Item_func_equal::not_null_tables_cache value doesn't make sense now, but we still let it be
  calculated (and ignore it)

adapt the Windows build files accordingly.


VC++Files/tests/mysql_client_test.dsp:
  As the directory structure on Windows now resembles that on Unix (no more
  "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
  of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
VC++Files/tests/mysql_client_test_ia64.dsp:
  As the directory structure on Windows now resembles that on Unix (no more
  "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
  of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
scripts/make_win_src_distribution.sh:
  1) The semantics of "cp -R src targ" depend on the (non)existence of "targ".
  By simply doing "$CP -R $i $BASE/$i", the directory hierarchy below $BASE differed
  from the source for each "$i" that already existed as a target directory.
  This is now prevented by checking the existence and adapting the command.
  
  2) Comment where "$BASE" (the target directory) comes into existence.
  
  3) Introduce an "abort" function as a start point for more sanity checks, use it.

Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

into hundin.mysql.fi:/home/marko/mysql-5.0

into mysql.com:/home/timka/mysql/src/5.0-dbg

instead of SYS_TABLES.MIX_LEN, because the latter was not
initialized to zero in old MySQL 3.23 releases. This will break
existing MySQL/InnoDB 5.0.3-bk databases for which
SHOW TABLE STATUS displays Row_format=Compact.


innobase/dict/dict0crea.c:
  Write the "compact format" flag to N_COLS instead of MIX_LEN.
  Remove corruption analysis for MIX_LEN, as it has been tracked down
  to MySQL 3.23.4x not initializing MIX_LEN.
innobase/dict/dict0load.c:
  Read the "compact format" flag from N_COLS instead of MIX_LEN.

into hundin.mysql.fi:/home/marko/mysql-5.0

  Restore sensible values to REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.


innobase/include/rem0rec.h:
  Restore sensible values to REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.

into mysql.com:/home/dlenev/src/mysql-5.0-sp

REC_OFFS_SMALL_SIZE for the initial allocation sizes of
arrays passed to rec_get_offsets().


innobase/btr/btr0btr.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/btr/btr0cur.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/btr/btr0sea.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/include/rem0rec.h:
  Define REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.
innobase/lock/lock0lock.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/page/page0cur.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/page/page0page.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/rem/rem0rec.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0ins.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0mysql.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0purge.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0row.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0sel.c:
  s/100/REC_OFFS_NORMAL_SIZE/
  s/10/REC_OFFS_SMALL_SIZE/
innobase/row/row0undo.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0upd.c:
  s/100/REC_OFFS_NORMAL_SIZE/
  s/10/REC_OFFS_SMALL_SIZE/
innobase/trx/trx0rec.c:
  s/100/REC_OFFS_NORMAL_SIZE/

sql/field.cc:
  a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation).
  Should issue ER_DATA_TOO_LONG in 'traditional' mode when data truncated.

Now we should call open_and_lock_tables() even if table list is empty -
to cache stored routines used by query and open and lock tables required
for their execution.


sql/sql_insert.cc:
  Now we should call open_and_lock_tables() even if table list is empty -
  to cache stored routines used by query and open and lock tables required
  for their execution.
sql/sql_prepare.cc:
  Now we should call open_and_lock_tables() even if table list is empty -
  to cache stored routines used by query and open and lock tables required
  for their execution. Thus we have to move most of functionality from 
  select_like_statement_test() to separate function to be able to reuse it
  for multi-update processing (for which tables are open and locked in 
  mysql_multi_update_prepare() call).

mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  SCCS merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into mysql.com:/home/timka/mysql/src/4.1-dbg

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into mysql.com:/usr/home/ram/work/5.0

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


innobase/log/log0recv.c:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

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

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


ndb/src/kernel/blocks/trix/Trix.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

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

ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/mgmsrv/ConfigInfo.cpp:
  Reenable MAX_OPEN_FILES to enable LCP in some situations