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

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


ndb/include/ndb_global.h.in:
  Auto merged
ndb/include/ndb_types.h:
  Auto merged

ndb/include/ndb_global.h.in:
  move types into ndb_global.h.in
  Check sizeof of Uint8, Uint32 & Uint64
ndb/include/ndb_types.h:
  move types into ndb_global.h.in

This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests


mysql-test/r/mysqldump.result:
  Safety fix if a previous test would fail
mysql-test/r/show_check.result:
  Safety fix if a previous test would fail
mysql-test/r/sp.result:
  Fix for --ps-protocol
mysql-test/r/synchronization.result:
  Safety fix if a previous test would fail
mysql-test/r/system_mysql_db.result:
  Safety fix if a previous test would fail
mysql-test/t/mysqldump.test:
  Safety fix if a previous test would fail
mysql-test/t/select.test:
  Safety fix if a previous test would fail
mysql-test/t/show_check.test:
  Safety fix if a previous test would fail
mysql-test/t/sp.test:
  fix for --ps-protocol
mysql-test/t/strict.test:
  Fix for --ps-protocol
mysql-test/t/synchronization.test:
  Safety fix if a previous test would fail
mysql-test/t/system_mysql_db.test:
  Safety fix if a previous test would fail
sql/item_sum.cc:
  Fix bug in SUM(DISTINCT...) when using with prepared statements
sql/item_sum.h:
  Fix bug in SUM(DISTINCT...) when using with prepared statements
sql/mysql_priv.h:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_base.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_insert.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_parse.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_prepare.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_select.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_union.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_update.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/table.h:
  Better handling of ensuring that setup_tables() are not called twice

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


ndb/include/ndb_types.h:
  Auto merged

ndb/include/ndb_types.h:
  redo UintPtr handling

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

ndb/include/ndb_types.h:
  redo UintPtr handling using SIZEOF_CHARP
ndb/test/tools/Makefile.am:
  remove unused defines

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

(Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
Instead, always reset table->insert_values on open.


mysql-test/t/trigger.test:
  Fix test for --ps-protocol
sql/sql_base.cc:
  Clear insert_values on open_table
sql/sql_insert.cc:
  Remove clear_insert_values()
sql/sql_parse.cc:
  Remove clear_insert_values()
sql/sql_prepare.cc:
  Remove clear_insert_values()
sql/table.cc:
  Remove clear_insert_values()
sql/table.h:
  Remove clear_insert_values()

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

  updated ndb version number


configure.in:
  updated ndb version number

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

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.h:
  Auto merged

Portability fixes


mysql-test/r/func_str.result:
  Added test for ltrim and rtrim with NULL
mysql-test/t/func_str.test:
  Added test for ltrim and rtrim with NULL
sql/item_strfunc.cc:
  Streamlined code for trim, ltrim and rtrim
tests/client_test.c:
  Fixed wrong usage of %lld (not portable)

(this depends on s[n]printf implementation and differs from system to system)


mysql-test/t/func_concat.test:
  Allow result of concat('a', -0.0) be both 'a0.0' and 'a-0.0'

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


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged

  Removed references to ISAM and MERGE


mysql-test/mysql-test-run.sh:
  Removed references to ISAM and MERGE
scripts/make_binary_distribution.sh:
  Removed references to ISAM and MERGE
scripts/make_win_src_distribution.sh:
  Removed references to ISAM and MERGE

  Removed references to ISAM and MERGE


netware/BUILD/compile-linux-tools:
  Removed references to ISAM and MERGE
netware/Makefile.am:
  Removed references to ISAM and MERGE
os2/ChangeLog.os2:
  Removed references to ISAM and MERGE
os2/MySQL-Source.icc:
  Removed references to ISAM and MERGE
os2/MySQL-Sql.icc:
  Removed references to ISAM and MERGE
os2/MySQL-Util.icc:
  Removed references to ISAM and MERGE
support-files/debian/gomi:
  Removed references to ISAM and MERGE

  Removed references to ISAM and MERGE


VC++Files/mysql.dsw:
  Removed referenses to ISAM and MERGE
VC++Files/sql/mysqld.dsp:
  Removed referenses to ISAM and MERGE
VC++Files/sql/mysqldmax.dsp:
  Removed referenses to ISAM and MERGE
VC++Files/winmysqladmin/winmysqladmin.cpp:
  Removed referenses to ISAM and MERGE
VC++Files/prepare:
  Removed referenses to ISAM and MERGE

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


mysql-test/r/user_limits.result:
  Auto merged
mysql-test/t/user_limits.test:
  Auto merged

configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/fil0fil.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged

  Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version


innobase/row/row0upd.c:
  Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version

into mysql.com:/home/psergey/mysql-5.0-debug-31dec

into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec

mysql-test/t/bdb.test:
  Fix test results to account for difference in results caused by different FP calculation results
  between release BDB and debug BDB

Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).

mysql-test/r/grant2.result:
  new test case
mysql-test/r/variables.result:
  don't fail w/o innodb
mysql-test/t/grant2.test:
  new test case
mysql-test/t/multi_update.test:
  don't fail w/o innodb
mysql-test/t/variables.test:
  don't fail w/o innodb
sql/sql_acl.cc:
  cleanup

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

into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec

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

This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables


mysql-test/include/varchar.inc:
  Fix test to be reproducable
  (Either key v or v_2 could be used here)
mysql-test/r/bdb.result:
  Fix test to be reproducable
  (Either key v or v_2 could be used here)
mysql-test/r/myisam.result:
  Fix test to be reproducable
  (Either key v or v_2 could be used here)
sql/table.cc:
  Fix max_key_length and max_unique_length to take into account varchar and null extra lengths
  This fixes a bug found by bdb.test

client/mysqltest.c:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.com:/Users/mikron/mysql-5.0


ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union