mysql-test/t/lowercase_table_grant.test:
  Disable test with embedded server
mysql-test/t/skip_name_resolve.test:
  Disable test with embedded server
sql/sql_parse.cc:
  Reset server status after a single statement in a multistatement
  query is handled in embedded server so it is not logged twice to
  the slow query log.

mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merge changes
mysql-test/t/ps_1general.test:
  Merge changes

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

mysql-test/r/ps_grant.result:
  Update results
mysql-test/t/ps_grant.test:
  Fix cleanup of test

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

into mdk10.(none):/home/reggie/bk/mysql-4.1

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Manual merge, fix already applied to 4.1

 - Remove the local static var


sql/ha_berkeley.cc:
  Remove local static var, make it local in file instead.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

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

ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fixed so no merge conflict with

into mdk10.(none):/home/reggie/bk/mysql-4.1

mysqldump.c:
  Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned


client/mysqldump.c:
  Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned

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

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

wait_for_pid function is fixed to wait for pid removal in "stop".
recomitted with post-review fix  


support-files/mysql.server.sh:
  wait_for_pid function corrected to work properly with start/stop

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


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

into mysql.com:/space/pekka/ndb/version/my41

up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).


BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458:
  Delete: mysql-test/r/drop_temp_table.result.es
BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4:
  Delete: mysql-test/r/insert_select.result.es
BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4:
  Delete: mysql-test/r/myisam-blob.result.es
BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185:
  Delete: mysql-test/r/packet.result.es
BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab:
  Delete: mysql-test/r/query_cache.result.es
BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079:
  Delete: mysql-test/r/select.result.es
BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218:
  Delete: mysql-test/r/type_blob.result.es
BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04:
  Delete: mysql-test/r/type_float.result.es
BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978:
  Delete: mysql-test/r/type_ranges.result.es
mysql-test/mysql-test-run.sh:
  Remove support for special result extension -- bad idea!
mysql-test/t/ps_1general.test:
  Explain --replace_result
mysql-test/r/insert_select.result:
  Update results
mysql-test/r/select.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_float.result:
  Update results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/t/drop_temp_table.test:
  Skip this test with embedded server
mysql-test/t/insert_select.test:
  Move binlog test to new file
mysql-test/t/select.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_blob.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_float.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_ranges.test:
  Replace grants column from 'show full columns'
sql/sql_select.cc:
  Fix conditional around query_cache_abort() call.

platforms": yet another issue with floating pointer comparisons.
The fix uses the workaround with volatiles.


sql/item_cmpfunc.cc:
  A fix for the failing mysql_client_test on some Intel platforms
  when compiled with optimization.
  We don't use -ffloat-store compileation as it may slow all
  floating point operations.

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  ACC_LOCKREQ - element may have moved after lock request was made

into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-4.1

mysql-test/r/metadata.result:
  postmerge change
sql/item.cc:
  work around about varchar in 4.1

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

sql/sql_parse.cc:
  Auto merged

Fix 'Bootstrap' to bypass a problem with "bk changes" by changing the directory before calling the command.


Build-tools/Bootstrap:
  Bypass a BK problem with "bk changes": It stopped delivering changeset comments when
  1) it encountered a single, unbroken line with about 1k characters  AND
  2) it was applied not to the current directory but to a named BK root directory.
  
  As 1) cannot be changed post-factum (and might happen again),
  the "bk changes" command is now preceded by a "cd $REPO".
  
  Do some renaming of variables used around the "bk changes" call to improve documentation.

support-files/mysql.server.sh:
  Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop.
  Note that the "stop" method is still wrong, as it does not wait for file removal.

into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced

into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced


mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged

Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.  


mysql-test/r/group_by.result:
  Testcase for BUG#9213
mysql-test/t/group_by.test:
  Testcase for BUG#9213
sql/table.h:
  Added comments about TABLE::used_keys

 - Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.


mysql-test/include/ps_query.inc:
  Adde new test case
mysql-test/r/ps_2myisam.result:
  Update test result
mysql-test/r/ps_3innodb.result:
  Update test result
mysql-test/r/ps_4heap.result:
  Update test result
mysql-test/r/ps_5merge.result:
  Update test result
mysql-test/r/ps_6bdb.result:
  Update test result
mysql-test/r/ps_7ndb.result:
  Update test result
sql/item.cc:
  Add function Item_param::fix_fields, which will mark any subselects they are part of as not being a constant expression unless the param value is specified, ie. it will be not be constant during prepare phase.
sql/item.h:
  Adde Item_param::fix_fields
sql/item_subselect.h:
  Make Item_param::fix_field friend of Item_subselect

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

sql/sql_select.cc:
  A fix (bug #9401: type_timestamp segfaults mysqld).
  1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name'
  instead of 'bool modify_item' and 'Item *item'.
  2. For Item_sum_min/max we should never modify item, so NULL is 
  passed as item to the create_tmp_field_from_field().

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