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

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


Build-tools/Do-compile:
  Auto merged

  the embedded server by default (if included). These additional steps can
  be skipped by providing "--skip-embedded-test" and "--skip-ps-test"


Build-tools/Do-compile:
  - enabled running the test suite with ps-protocol and against the embedded
    server by default (if included). These additional steps can be skipped
    by providing "--skip-embedded-test" and "--skip-ps-test"

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


sql/opt_range.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-look-valgrind

 {min,max}_functions_it as it is not allocated on the pool.

mysql-test/t/ctype_eucjp_ms.test:
  uncommnented the drop table statement

config/ac-macros/character_sets.m4:
  added cp932, eucjp_ms character set
include/m_ctype.h:
  added cp932, eucjp_ms character set
libmysql/Makefile.shared:
  added cp932, eucjp_ms character set
mysys/charset-def.c:
  added cp932, eucjp_ms character set
sql/share/charsets/Index.xml:
  added cp932, eucjp_ms character set
strings/Makefile.am:
  added cp932, eucjp_ms character set

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


sql/field.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

sql/ha_federated.cc:
  Change mode to -rw-rw-r--
myisam/mi_create.c:
  Ensure that all referenced memory is reset
mysql-test/r/type_timestamp.result:
  More tests
mysql-test/t/func_compress.test:
  Added comment
mysql-test/t/type_timestamp.test:
  More tests
sql/field.h:
  Count number of varchars in table
sql/item_cmpfunc.cc:
  Safety fix (to avoid warning from valgrind)
sql/opt_range.cc:
  Simple optimzation
sql/sql_acl.cc:
  Safety fix (to avoid warning from valgrind)
sql/sql_parse.cc:
  Safety fix for prepared statements
sql/sql_show.cc:
  Move variable declarations first in function
  Remove hidden variable (it)
  Remove accessing freed memory (table_list->table_name)
sql/sql_update.cc:
  Compare records with varchars correctly
sql/table.cc:
  Safety fix when running with purify/valgrind
  Fix wrong memory reference in case of errors
sql/table.h:
  Added counting of varchar fields
strings/ctype-mb.c:
  Fill max_str properly

  Clean-up for the previous change: VARCHAR and trailing spaces.


mysql-test/t/strict.test:
  Clean-up for the previous change: VARCHAR and trailing spaces.
mysql-test/r/strict.result:
  Clean-up for the previous change: VARCHAR and trailing spaces.

into deer.(none):/home/hf/work/mysql-5.0.clean

VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Libraries changed
mysys/default.c:
  get_defaults_files implementation added
sql/sql_base.cc:
  merging
sql/sql_show.cc:
  merging

sql/ha_ndbcluster.cc:
  removed compiler warnings

Don't use my_tolower: it works only for 8bit charsets.

into deer.(none):/home/hf/work/mysql-4.1.5920


client/mysql.cc:
  Auto merged

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

into mysql.com:/space/my/mysql-4.1-build

statements": no test case, the test case is there already, 
libmysqld/examples/client_test.c, we just need to run it on a daily basis.


libmysqld/lib_sql.cc:
  Convert statement id to least significant byte first format,
  uset for data transmission in MySQL protocol. It's assumed to be 
  in this format by mysql_stmt_execute.

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

  instead of renaming them in the packaging stage with Do-win-build later:
  mysqld-opt.exe -> mysqld.exe, mysqld.exe -> mysqld-debug.exe

  Windows builds


sql/sql_base.cc:
  - removed an unreferenced variable
sql/strfunc.cc:
  - removed an unreferenced variable

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

  same as prev fix, wrong read of 64 bit value


ndb/src/kernel/blocks/suma/Suma.cpp:
  same as prev fix, wrong read of 64 bit value

  bug#7660


ndb/src/kernel/blocks/backup/Backup.cpp:
  bug#7660

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.7330

into deer.(none):/home/hf/work/mysql-4.1.7330

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

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


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

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


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

a note, not a warning or error.

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

ndb/src/common/transporter/TransporterRegistry.cpp:
  make it compile with -ansi -pedantic
sql/sql_lex.cc:
  a fix for compile-time failure

mysql-test/r/ndb_index_ordered.result:
  Test scan with invalid table version
mysql-test/t/ndb_index_ordered.test:
  Test scan with invalid table version
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set apiConnectstate= CS_ABORTING when receving a scan req with invalid
    table version