mysql-test/r/type_float.result:
  merging

mysql-test/t/type_float.test:
  Auto merged
mysql-test/r/type_decimal.result:
  merging
mysql-test/r/type_float.result:
  merging
mysql-test/r/union.result:
  merging
mysql-test/t/type_decimal.test:
  merging
sql/item.cc:
  merging

into  mysql.com:/users/lthalmann/bkroot/mysql-5.0

into  mysql.com:/home/svoj/devel/mysql/engine/mysql-5.0

sql/table.cc:
  If extra block present always restore connect string.
sql/unireg.cc:
  Always save connect string.

sql/handler.cc:
  Use my_strnncoll instead of my_strcasecmp (it is possible to
  compare non-asciiz strings now).
sql/handler.h:
  extra block size added to HA_CREATE_INFO.

into  mysql.com:/users/lthalmann/bk/mysql-5.0

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


sql/item.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/mysql-5.0


myisam/mi_rkey.c:
  Auto merged
mysql-test/r/subselect2.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
configure.in:
  After merge fixes
myisam/mi_search.c:
  After merge fixes
mysql-test/r/select.result:
  After merge fixes
sql/item.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes

mysql-test/r/rpl_multi_update3.result:
  New test case
mysql-test/t/rpl_multi_update3.test:
  New test case
sql/sql_parse.cc:
  Removed fake locking
  Changed so that filtering is done later for multi-update
  Removed redundant code
sql/sql_update.cc:
  Moved call to sql_parse.cc

support-files/mysql.spec.sh:
  - typo fix: rott->root in the file attributes for mysql_client_test

  - Added error printout and nice exit for duplicate default sections

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


ndb/src/mgmsrv/Services.cpp:
  Auto merged

Fix a compile failure


BitKeeper/deleted/.del-protocol_cursor.cc~2a1ab8e023a166a4:
  Delete: sql/protocol_cursor.cc
VC++Files/libmysqld/libmysqld.dsp:
  Remove protocol_cursor.cpp (no longer used) from sources
VC++Files/sql/mysqld.dsp:
  Remove protocol_cursor.cpp (no longer used) from sources
sql/mysqld.cc:
  Fix a compile failure

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


server-tools/instance-manager/mysql_connection.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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

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


mysql-test/r/rpl_flush_tables.result:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

(and contain extern "C" when necessary)

don't allow STOP SLAVE if global read lock is in taken

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/mysql_connection.cc:
  fix pragma statement
server-tools/instance-manager/user_map.cc:
  fix pragma statement

into  mysql.com:/usr/home/ram/work/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged

Copy disabled.def
(Backport of Kent's change from the main tree to the 4.1.15 build clone.
Original changeset:  2005/10/07 13:08:07+02:00 kent@mysql.com )


scripts/make_binary_distribution.sh:
  Copy zlib.a and valgrind.supp if exists.
  Copy disabled.def
  (Backport of Kent's change from the main tree to the 4.1.15 build clone.)

  Copy zlib.a and valgrind.supp if exists
  Copy disabled.def


scripts/make_binary_distribution.sh:
  Copy zlib.a and valgrind.supp if exists

ndb/src/mgmsrv/Services.cpp:
  Auto merged

client/mysql.cc:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/r/rpl_openssl.result:
  manual merge

  allow select into outfile from I_S tables
  it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
  as we use 'any_db' for 'check_access' function in places where FILE_ACL is required


mysql-test/t/outfile.test:
  Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails
    test case

into mysql.com:/home/psergey/mysql-5.0-bug13484


sql/ha_innodb.cc:
  Auto merged
mysql-test/r/index_merge_innodb.result:
  Auto merged
mysql-test/r/rowid_order_innodb.result:
  Auto merged
mysql-test/t/index_merge_innodb.test:
  Auto merged

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

- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null


myisam/mi_rkey.c:
  Use %lx instead of %p as %p is not portable
myisam/mi_search.c:
  Use %lx instead of %p as %p is not portable
mysql-test/r/select.result:
  More test for ROW comparison
mysql-test/t/select.test:
  More test for ROW comparison
sql/item.cc:
  We can't replace a ROW item with Item_null because:
  - Arg_comparator is still using the orignal row items and it's not good to have args[0] different from what is actually compared
  - If we are using the <=> comparator, NULL can still be compared as true
  - We would break things if we would ever use resolve_const_item() for operators like >, < etc.

  Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)


ndb/src/mgmsrv/Services.cpp:
  Dont print null address (back port from 5.0)
scripts/make_binary_distribution.sh:
  Corrected platform name output

  Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable


scripts/make_binary_distribution.sh:
  Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable

into  mysql.com:/home/dellis/mysqlab/bk/mysql-5.0