sql/table.cc:
  Use error message "Can't open file" if errno EMFILE is returned.

  store TABLES.TABLE_TYPE in case of error during table opening


mysql-test/r/information_schema.result:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case
mysql-test/t/information_schema.test:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case

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

mysql-test/r/union.result:
  Fix order of test results

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


vio/viosslfactories.c:
  Auto merged

into  mysql.com:/home/timka/mysql/src/5.0-virgin

into mysql.com:/home/gluh/MySQL/Merge/5.0


vio/viosslfactories.c:
  Auto merged

Commented out one failing query in the regression test (reported as a bug).


mysql-test/r/join.result:
  Commented out failing query.
mysql-test/t/join.test:
  Commented out failing query.

Implemented specialized regression test for the WL.


mysql-test/r/join.result:
  Test results for natural join tests.
mysql-test/t/join.test:
  Specialized test for natural join, and join ... on.

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


mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/t/union.test:
  Resolve conflict

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


sql/item.cc:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-5.0-build

into  mysql.com:/usr/local/mysql/mysql-5.0

mysql-test/r/type_ranges.result:
  result fixed

Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]


mysql-test/r/type_newdecimal.result:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
  [Backported from mysql-5.1-new]
mysql-test/t/type_newdecimal.test:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
  [Backported from mysql-5.1-new]

into mysql.com:/home/hf/work/mysql-5.0.14693


sql/sql_table.cc:
  Auto merged

into mysql.com:/home/gluh/MySQL/Merge/4.1

  added SSL_library_init()

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


mysql-test/r/ctype_recoding.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged

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


sql/item.cc:
  Auto merged

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

into  mysql.com:/usr/local/mysql/mysql-5.0

VC++Files/sql/mysqld.dsp:
  Corrected wrong path to ha_archive.cpp (causes compilation
   error in VC++)

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


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged

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


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

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


mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  Resolve conflict

into  devsrv-b.mysql.com:/space/magnus/mysql-5.0

into  mysql.com:/usr/local/mysql/mysql-4.1

into  mysql.com:/usr/local/mysql/mysql-5.0


include/config-win.h:
  Auto merged
sql/log_event.cc:
  Discard 4.1 win32 compile fix that was already in 5.0.

config/ac-macros/yassl.m4:
  Specify path to yassl libs
libmysql/Makefile.am:
  Add yassl .la libs to libmysqlclient.la

into  mysql.com:/usr/local/mysql/mysql-5.0

into  mysql.com:/usr/home/pem/bug14643/mysql-5.0

sql/log_event.cc:
  Add missing cast needed for Win32 compilation.
include/config-win.h:
  Win32 compile fix: quote multi-line macros with do { ... } while(0) to follow earlier changes in my_global.h.

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

  After merge fix.


mysql-test/r/grant.result:
  After merge fix.

into  mysql.com:/usr/home/pem/bug14643/mysql-5.0


sql/sp_head.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.

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


mysql-test/r/ps_grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged

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


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

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1