into  eel.(none):/home/jonas/src/mysql-4.1-push

into  eel.(none):/home/jonas/src/mysql-4.1-push

 fix typo


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo

  Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!


sql/ha_blackhole.cc:
  Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!

  Added missing DBUG enter, compiled and tested on production with debug-max
  build (my regular build missed the previous errors friday)

Changeset:
 Added missing DBUG_ENTER, compiled and tested on production with debug-max
 build!



sql/ha_blackhole.cc:
  Added missing DBUG enter, compiled and tested on production with debug-max build (my regular build missed the previous errors friday)
  C

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1

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

  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.


sql/item.cc:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
mysql-test/t/ctype_utf8.test:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
mysql-test/r/ctype_utf8.result:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.

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


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Make ports configurable from environment for test


Makefile.am:
  Make ports configurable from environment for test

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1


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

  Reorder out-of-order system variables.


sql/set_var.cc:
  Reorder out-of-order system variables.

  Reorder out-of-order status variables.


sql/mysqld.cc:
  Reorder out-of-order status variables.

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

sql/ha_blackhole.cc:
  Typo to DBUG_RETURN fixed

into  radha.local:/Users/patg/mysql-build/mysql-4.1

sql/ha_blackhole.cc:
  Blackhole Lock changes to blackhole per Brian, reapplied
sql/ha_blackhole.h:
  blackhold lock changes added per brian

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  eel.(none):/home/jonas/src/mysql-4.1-push

into  eel.(none):/home/jonas/src/mysql-4.1-push

  When detecting corrupt schema file.
  Make sure to close it (as it will be opened later when rewriting a clean copy)


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bug#12027 
    When detecting corrupt schema file.
    Make sure to close it (as it will be opened later when rewriting a clean copy)

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

  changed tomas default checkout


BitKeeper/etc/config:
  changed tomas default checkout

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysqlcheck.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
client/client_priv.h:
  Merged from 4.0.
client/mysql.cc:
  Merged from 4.0.
client/mysqladmin.cc:
  Merged from 4.0.
client/mysqlbinlog.cc:
  Merged from 4.0.
client/mysqldump.c:
  Merged from 4.0.
client/mysqlshow.c:
  Merged from 4.0.
myisam/myisamchk.c:
  Merged from 4.0.
myisam/myisampack.c:
  Merged from 4.0.
netware/mysql_test_run.c:
  Merged from 4.0.
netware/mysqld_safe.c:
  Merged from 4.0.
sql/mysqld.cc:
  Merged from 4.0.

(Faster test)


mysql-test/t/rpl_drop_db.test:
  Add back changes lost in merge

into  mishka.local:/home/my/mysql-4.1

client/client_priv.h:
  Added option auto close for Netware.
client/mysql.cc:
  Added option auto close for Netware.
client/mysqladmin.c:
  Added option auto close for Netware.
client/mysqlbinlog.cc:
  Added option auto close for Netware.
client/mysqlcheck.c:
  Added option auto close for Netware.
client/mysqldump.c:
  Added option auto close for Netware.
client/mysqlimport.c:
  Added option auto close for Netware.
client/mysqlshow.c:
  Added option auto close for Netware.
client/mysqltest.c:
  Fixed help messages for Netware.
extra/my_print_defaults.c:
  Fixed help messages for Netware.
extra/perror.c:
  Fixed help messages for Netware.
extra/resolve_stack_dump.c:
  Fixed help messages for Netware.
include/help_end.h:
  Fixed help messages for Netware.
include/help_start.h:
  Fixed help messages for Netware.
isam/isamchk.c:
  Added auto close of window for Netware
isam/pack_isam.c:
  Added auto close of window for Netware
myisam/myisamchk.c:
  Added auto close of window for Netware
myisam/myisamlog.c:
  Added help for Netware.
myisam/myisampack.c:
  Added auto close for Netware.
netware/myisamchk.def:
  Scrollable screen patch.
netware/mysql.def:
  Scrollable screen patch.
netware/mysql_test_run.c:
  Fixed strindex for Netware.
netware/mysqladmin.def:
  Scrollable screen patch.
netware/mysqlbinlog.def:
  Scrollable screen patch.
netware/mysqlcheck.def:
  Scrollable screen patch.
netware/mysqld_safe.c:
  Removed debug message for Netware.
netware/mysqldump.def:
  Scrollable screen patch.
netware/mysqlimport.def:
  Scrollable screen patch.
netware/mysqlshow.def:
  Scrollable screen patch.
sql/mysqld.cc:
  Abnormal end patch when shutting down and volume not ready.

into  mishka.local:/home/my/mysql-4.1

into  mishka.local:/home/my/mysql-4.1

mysql-test/r/ctype_cp932.result:
  Remove first event to make things portable
mysql-test/r/rpl_drop_db.result:
  Use 'mysqltest' as database instead of 'd1'
  Made test faster by using longer table names instead of lots of tables
mysql-test/t/ctype_cp932.test:
  Remove first event to make things portable
mysql-test/t/rpl_drop_db.test:
  Use 'mysqltest' as database instead of 'd1'
  Made test faster by using longer table names instead of lots of tables
sql/sql_db.cc:
  Indentation & style fixes
  Simple optimization (remove constant and boolean variable)

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

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

  Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different


mysql-test/r/subselect2.result:
  Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different

into mysql.com:/M41/mysql-4.1

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


sql/ha_innodb.cc:
  Auto merged