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

mysql-test/t/analyse.test:
  Added a note about the bug that this test case tests.
sql/sql_analyse.cc:
  Changed function description to standard format.

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

when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)


mysql-test/r/ctype_ucs.result:
  backticks added
mysql-test/r/user_var.result:
  backticks added
mysql-test/t/user_var.test:
  testing a variable with BINARY collation, which needs the backticks
sql/log_event.cc:
  when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)

into build.mysql.com:/users/tulin/mysql-4.1

into build.mysql.com:/users/tulin/mysql-4.1

into mysql.com:/home/kostja/work/mysql-4.1-root


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

case will be added to client_test in 4.1


sql/sql_parse.cc:
  A fix for bug #6761: "mysql_list_fields() does not work": init
  thd->query_length, which is used next line. Remove a stale comment.

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

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

  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 serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged

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

ndb/test/src/CpcClient.cpp:
  Fix 64-bit problem

  increased timeouts to see if more tests get started automatically


mysql-test/ndb/ndbcluster.sh:
  increased timeouts to see if more tests get started automatically

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

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

scripts/Makefile.am:
  Replace ZLIB_LIBS

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:/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:/home/jonas/src/mysql-4.1

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

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