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

BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
mysql-test/r/rpl_heap.result:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

  removing unneeded var left from 4.0


sql/sql_class.h:
  removing unneeded var left from 4.0

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

Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().


mysql-test/r/rpl_heap.result:
  result update
mysql-test/t/rpl_heap.test:
  changing test to test a bug (but anyway, mysql-test-run --manager looks like not working in 4.1 currently,
  so this test is never run).
sql/log.cc:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/mysql_priv.h:
  removing argument no_log from mysql_create_table(); no_log was not perfect as some
  binlogging could still be done by open_unireg_entry() for a HEAP table.
sql/sql_class.h:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/sql_parse.cc:
  removing no_log arg from mysql_create_table()
sql/sql_table.cc:
  removing no_log from mysql_create_table(); instead using new class Disable_binlog.
  Disabling binlogging in some cases, where the binlogging is done later by some other code
  (case of CREATE SELECT and ALTER).

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

  innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()


sql/ha_innodb.cc:
  innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()

Removed improper casts.
Thanks to Joerg Bruehe for the fix.


include/my_global.h:
  Build bug on 64-Bit platforms.
  Removed improper casts.
  Changed to uniform writing style.
  Appended 'L' to 32-Bit constants which doesn't hurt on 32-Bit,
  but can be important for some 64-Bit compilers.

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

include/mysql.h:
  Fixed symbol name change.
include/mysql_com.h:
  Reverted parts of previous changeset (name changes) to make it build.
libmysql/libmysql.c:
  Fixed symbol name change.
sql/sql_parse.cc:
  Fixed symbol name change.

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

  still better names for enum; removing unneeded symbol


include/mysql_com.h:
  still better names for enum; removing unneeded symbol
VC++Files/winmysqladmin/mysql_com.h:
  still better names for enum; removing unneeded symbol

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

  Better names for defines, as these are visible in API


include/mysql_com.h:
  Better names for defines, as these are visible in API
VC++Files/winmysqladmin/mysql_com.h:
  Better names for defines, as these are visible in API

Check HEAP+HASH, binary collation

Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD 
characteristic too.

  Typo fix


mysql-test/r/ctype_utf8.result:
  Typo fix
mysql-test/t/ctype_utf8.test:
  Typo fix

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

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


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged

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

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

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

into poseidon.(none):/home/tomas/mysql-4.1

ndb/include/kernel/Interpreter.hpp:
  R1 defined on some platforms
ndb/include/util/BaseString.hpp:
  fix for compiler bug

sql/sql_class.h:
  comment
sql/sql_table.cc:
  smarter use of the Disable_binlog object (using a block so that when leaving it either way, the object gets
  destroyed and so properties of the thread get reset).

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

  Serg's typo fix :)


sql/field.cc:
  Serg's typo fix :)