into  mysql.com:/usr/home/pem/mysql-5.1-new


include/my_base.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
libmysqld/Makefile.am:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.

into  devsrv-b.mysql.com:/space/magnus/mysql-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/home/pem/bug14643/mysql-5.0

into  fedora.(none):/home/reggie/bk/mysql-5.1-new


sql/authors.h:
  SCCS merged

into mysql.com:/M51/mysql-5.1

    Fix a typo: "distibution" -> "distribution".


sql/mysqld.cc:
  Fix a typo: "distibution" -> "distribution".

  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.1-new


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  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

  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.

Changed to alphabetical order


mysql-test/r/show_check.result:
  Changed to alphabetical order

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  mysql.com:/tmp/x/mysql-5.1-new

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

mysql-test/r/show_check.result:
  fixed failing test for Holyfoot ;-)
sql/authors.h:
  added myself

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.

into mysql.com:/data0/mysqldev/my/mysql-5.1.3-pushmain

sql/authors.h:
  line about HF