- removed some unreferenced variables
 - fixed the libmysql project file by removing a duplicate file reference (merge error)


sql/item_func.cc:
  - removed unused variable "Field" from Item_func_sp::sp_result_field
sql/sql_select.cc:
  - removed unreferenced variable "filename" from create_tmp_table
sql/unireg.cc:
  - removed unused variable "firstpos" from make_empty_rec
VC++Files/libmysql/libmysql.dsp:
  - after-merge fix: removed duplicate file ctype-cp932.c

extra/yassl/taocrypt/src/misc.cpp:
  Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX):
  we can remove these 2 ifdefed statements, as new handlers are not used
  anymore (yaSSL new doesn't throw exceptions and does not
  calls/resets new handlers as prescribed in the standard), but let's
  leave it to Todd, now just #ifdef the problematic code.

into mysql.com:/usr/home/ram/work/5.0.b10539

into mysql.com:/space/my/mysql-5.0

into mysql.com:/usr/home/ram/work/5.0.b10539


sql/field.cc:
  Auto merged

sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  SCCS merged
mysql-test/t/func_time.test:
  SCCS merged

  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION


sql/ha_federated.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_cache.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_head.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_pcontext.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
sql/sp_rcontext.cc:
  Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION

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

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

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


sql/item_timefunc.cc:
  Auto merged

    make print_field_types() somewhat more useful


client/mysql.cc:
  make print_field_types() somewhat more useful

into mysql.com:/home/hartmut/projects/mysql/dev/5.0

into mysql.com:/home/hartmut/projects/mysql/dev/5.0

- mysql-test/Makefile.am: added a pattern match for t/*.sql 
  (t/mysql_delimiter.sql was missing from the source distribution)


include/config-win.h:
  - removed double HAVE_CHARSET_cp932 #define
mysql-test/Makefile.am:
  - added a pattern match for t/*.sql (t/mysql_delimiter.sql was missing from the
    source distribution)

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

mysys/my_access.c: remove incorrect fix
comments


extra/yassl/taocrypt/src/integer.cpp:
  yassl template instantiation - don't do too much
extra/yassl/taocrypt/src/template_instnt.cpp:
  yassl template instantiation - don't do too much
mysys/my_access.c:
  remove incorrect fix
sql/item_func.cc:
  a couple of comment. assert added.

into mysql.com:/home/pem/work/mysql-5.0

sql/item.h:
  Return name as LEX_STRING instead of its components.
sql/sql_yacc.yy:
  Name returned as LEX_STRING instead of its components.

    
    - support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds

into mysql.com:/home/hartmut/projects/mysql/dev/5.0


BUILD/Makefile.am:
  Auto merged

BUG#10696

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

mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  merging from 4.1

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

  adding test
field.cc:
  bug#10714 Inserting double value into utf8 column crashes server:
  sprintf was executed with too big length, which caused
  crash on some Windows platforms.


sql/field.cc:
  bug#10714 Inserting double value into utf8 column crashes server
  sprintf was executed with too long length, which cau
  crashe on Windows.
mysql-test/t/ctype_utf8.test:
  adding test
mysql-test/r/ctype_utf8.result:
  adding test

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

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

into mysql.com:/opt/local/work/mysql-5.0-root

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

into mysql.com:/opt/local/work/mysql-5.0-root

the code that is active for SP as well in 5.0)


sql/item.cc:
  Rename of an Item_arena method.
sql/item_subselect.cc:
  Rename of an Item_arena method.
sql/sql_class.h:
  Rename of an Item_arena method.
sql/sql_parse.cc:
  Rename of an Item_arena method.
sql/sql_union.cc:
  Rename of an Item_arena method.

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

Compilation errors fixes.


config/ac-macros/yassl.m4:
  Switch to -l/-L instead of passing file name directly. (more portable for ".a" archives)
extra/yassl/taocrypt/src/integer.cpp:
  Instantiate more templates (needed by some 64bit boxes).
extra/yassl/taocrypt/src/template_instnt.cpp:
  Instantiate more templates (needed by some 64bit boxes).
  Move tcArrayDelete to TaoCrypt namespace (more portable).

into dl145b.mysql.com:/home/ndbdev/tomas/tmp

  Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails


ndb/src/mgmclient/CommandInterpreter.cpp:
  Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails

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


sql/sql_select.cc:
  Auto merged