into neptunus.(none):/home/msvensson/mysql/bug6762

mysql-test/r/join_outer.result:
  Update results
mysql-test/t/join_outer.test:
  Merge

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

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


client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged

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

  Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables


sql/ha_innodb.cc:
  Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables

  Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string


sql/ha_innodb.cc:
  Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string

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

into neptunus.(none):/home/msvensson/mysql/bug6762


sql/ha_ndbcluster.cc:
  Auto merged

  fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.


strings/ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.
mysql-test/r/ctype_uca.result:
  fixing test results accordingly.

  - Better error message when table definition has changed


mysql-test/r/ndb_alter_table.result:
  New error message and code when table definition has changed.
mysql-test/r/ndb_multi.result:
  Safety, drop tables in second server as well
mysql-test/t/ndb_alter_table.test:
  New error message and code when table definition has changed.
mysql-test/t/ndb_multi.test:
  Safety, drop tables in second server as well
sql/ha_ndbcluster.cc:
  When error 284 is returned from NDB a check must be made to see what the error really means.
   - if table does not exists any more, return 709 -> No such table exists
   - if table still exists, table has most likely been altered and table id and version has 
     changed, print  hardcoded  errormessage indicating that transaction should retried
    (this error message should be translated to a langauge dependent error message in 5.0)
    
  Remove mapping from 284 to HA_ERR_NO_SUCH_TABLE

when using --new" into 4.1 tree.


mysql-test/r/type_timestamp.result:
  Manual merge.
mysql-test/t/type_timestamp.test:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/field.h:
  Manual merge.

into mysql.com:/home/dlenev/src/mysql-4.0-bg8894

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

mysql-test/r/drop.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)


mysql-test/r/drop.result:
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
mysql-test/t/drop.test:
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/share/english/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/share/russian/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/share/ukrainian/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/sql_table.cc:
  print an error with a function that respects width modifiers (%.64s)

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

embedded server when a size suffix (K, M, G) is added. (Bug #9472)


sql/mysqld.cc:
  Instead of (re)parsing max_allowed_packet and net_buffer_length
  for the embedded server, just set the global variables to what
  is set in global_system_variables within get_options().

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