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

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

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.

  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

  Fixing Item_param::safe_charset_converter to do less "new"s.


sql/item.h:
  Fixing Item_param::safe_charset_converter to do less "new"s.
sql/item.cc:
  Fixing Item_param::safe_charset_converter to do less "new"s.

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

into  rurik.mysql.com:/home/igor/mysql-5.0

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

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

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

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


myisam/ft_parser.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged

earlier because of various features/checks missing (these features/checks
are now implemented).


mysql-test/r/sp.result:
  Enabled back bunch of tests which were previously disabled because of various
  features/checks missing (since these features/checks are now implemented).
mysql-test/t/sp.test:
  Enabled back bunch of tests which were previously disabled because of various
  features/checks missing (since these features/checks are now implemented).

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


include/my_base.h:
  Auto merged

A typo bug caused loss of a predicate of the form field=const in some cases.


mysql-test/r/select.result:
  Added a test case for bug #15106.
mysql-test/t/select.test:
  Added a test case for bug #15106.

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

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

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


sql/opt_range.cc:
  Auto merged

by starting with an empty index set and adding indexes to it until it
becomes covering. If the set becomes covering after adding the first index,
return NULL and don't try constructing ROR-intersection of one index (which
caused a crash)

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

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

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


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/table.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
include/my_base.h:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/select.result:
  Manual merge.
mysql-test/t/ndb_alter_table.test:
  Manual merge.
mysql-test/t/ndb_basic.test:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
sql-common/client.c:
  k	
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.

CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.


mysql-test/r/ps.result:
  Test results has been fixed (Bug#14410)
mysql-test/t/ps.test:
  A test case for Bug#14410 "Crash in Enum or Set type in CREATE 
  TABLE and PS/SP"
sql/mysql_priv.h:
  typelib() function declaration has been changed.
sql/sql_table.cc:
  Supply the statement memory root to use in typelib() and
  safe_charset_converter() functions to ensure that objects 
  created during the first execution of CREATE TABLE statement
  are allocated in persistent memory of the statement.
sql/table.cc:
  Change typelib() function to require MEM_ROOT.

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

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


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

into moonbone.local:/work/13293-bug-5.0-mysql

mysql-test/r/join_nested.result:
  Remove t3 too.
mysql-test/t/join_nested.test:
  Remove t3 too.

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