BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged

  GeometryCollectionFromText is now alias for GeomCollFromText


sql/lex.h:
  GeometryCollectionFromText is now alias for GeomCollFromText

Point, MultiLine, Poligom, etc, are now not aliases
for Geometry, but separate field types.

Changed another unecessary use of Item_string into LEX_STRING (in sp_pcontext).


Docs/sp-implemented.txt:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
mysql-test/r/sp-error.result:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
mysql-test/t/sp-error.test:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
sql/sp_pcontext.cc:
  Changed another unecessary use of Item_string into LEX_STRING.
sql/sp_pcontext.h:
  Changed another unecessary use of Item_string into LEX_STRING.
sql/sql_parse.cc:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
sql/sql_yacc.yy:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION

  Comments why "greek" is ISO greek


sql/share/charsets/greek.xml:
  Comments why "greek" is ISO greek

Some collation names have been renamed


BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
  Delete: strings/ctype-latin1_de.c
libmysql/Makefile.shared:
  German Phone book collation is always compiled
mysql-test/r/ctype_collate.result:
  Some collation names have been renamed
mysql-test/t/ctype_collate.test:
  Some collation names have been renamed
mysql-test/t/ctype_latin1_de-master.opt:
  Some collation names have been renamed
mysys/charset.c:
  get_charset_by_name() now will find its default collation if charset name is passed
sql/share/charsets/Index.xml:
  Some collation names have been renamed
sql/share/charsets/cp1251.xml:
  Some collation names have been renamed
sql/share/charsets/cp1257.xml:
  Some collation names have been renamed
sql/share/charsets/latin1.xml:
  Some collation names have been renamed
sql/share/charsets/latin2.xml:
  Some collation names have been renamed
sql/share/charsets/latin7.xml:
  Some collation names have been renamed
sql/share/charsets/macce.xml:
  Some collation names have been renamed
sql/share/charsets/macroman.xml:
  Some collation names have been renamed
sql/sql_show.cc:
  Nicer output from SHOW COLLATION
strings/Makefile.am:
  German Phone book collation is always compiled
strings/ctype-czech.c:
  Some collation names have been renamed
strings/ctype-extra.c:
  Don't compile dynamic charset. We should decide names convension before 
  making this available.
strings/ctype-latin1.c:
  German Phone book collation is always compiled

   (there is a Makefile in readline_topdir that already lists
   readline_dir in SUBDIRS)

into mysql.com:/suse80/my/mysql-4.1

sql/sql_error.cc:
   - fixed comment so mysql_copyright does not eat the whole file
sql/sql_prepare.cc:
   - fixed comment so mysql_copyright does not eat the whole file

Low case letters are used in charset names


BitKeeper/deleted/.del-MacRoman.xml~f890bce37d31d382:
  Delete: sql/share/charsets/MacRoman.xml
BitKeeper/deleted/.del-MacCE.xml~fca413f3126f6189:
  Delete: sql/share/charsets/MacCE.xml
mysys/charset.c:
  SHOW CHARACTER SET now can display comments
sql/share/charsets/Index.xml:
  SHOW CHARACTER SET now can display comments
sql/sql_show.cc:
  SHOW CHARACTER SET now can display comments
strings/ctype.c:
  SHOW CHARACTER SET now can display comments

into mysql.com:/suse80/my/mysql-4.1

  NATIONAL CHARACTER() has latin1 charset now.
  Reasons are (by Monty):
  I think we should keepy having latin1 (default configure option)
  as the national character set.  The reason for this is simple that:

- This is ok for a large part of the world.
- It's faster and takes less space than utf8.


sql/sql_string.cc:
  NATIONAL CHARACTER() has latin1 charset now.
  Reasons are (by Monty):
  I think we should keepy having latin1 (default configure option)
  as the national character set.  The reason for this is simple that:

  LIKE was used against wrong name


sql/sql_show.cc:
  LIKE was used against wrong name

into mysql.com:/suse80/my/mysql-4.1

into narttu.mysql.fi:/my/mysql-4.1

Fixed bug in allocation memory in key cache. (Memory was not properly aligned which cased core dumps on sparc CPU's)
Changed keycache variables to start with my_ instead of _my_


include/my_sys.h:
  Changed keycache variables to start with my_ instead of _my_
myisam/mi_test2.c:
  Changed keycache variables to start with my_ instead of _my_
  Removed compiler warnings
myisam/sp_test.c:
  Removed compiler warning
mysys/mf_keycache.c:
  Fixed bug in allocation memory (Memory was not properly aligned which cased core dumps on sparc CPU's)
  Changed keycache variables to start with my_ instead of _my_
  Fixed indentation and comment syntax.
  Removed end space.
sql/mysqld.cc:
  Changed keycache variables to start with my_ instead of _my_
sql/sql_test.cc:
  Changed keycache variables to start with my_ instead of _my_

into mysql.com:/suse80/my/mysql-4.1

  Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility


sql/item_strfunc.cc:
  Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility

  The result didn't return proper collation


sql/item_strfunc.cc:
  The result didn't return proper collation

  A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.


sql/item_strfunc.cc:
  A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.

into mysql.com:/suse80/my/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

into mysql.com:/home/mysql_src/mysql-4.1

into narttu.mysql.fi:/my/mysql-4.1


sql/mysqld.cc:
  Auto merged

innobase/ha/ha0ha.c:
  Removed compiler warnings
mysql-test/t/innodb.test:
  Another fix for cardinality
scripts/Makefile.am:
  Install fill_help_tables.sql in prefix/share/mysql
  Don't install make_binary_distribution
scripts/fill_help_tables.sh:
  use INSERT IGNORE to avoid errors
scripts/make_binary_distribution.sh:
  Install and use fill_help_tables.sql
scripts/mysql_install_db.sh:
  Search for and use fill_help_tables.sql
sql/mysqld.cc:
  Don't write shutdown message when called from mysql_install_db
support-files/Makefile.am:
  Don't install binary-configure
support-files/binary-configure.sh:
  Don't use config files

  IFNULL() now honors collations


sql/item_cmpfunc.cc:
  IFNULL() now honors collations

  Reduce/reduce conflict
  fix. 


sql/sql_yacc.yy:
  Reduce/reduce conflict
  fix.

Some speed improvements

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

into narttu.mysql.fi:/my/mysql-4.1

mysql-test/t/innodb.test:
  Another fix to take InnoDB cardinality changes into account

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

"a LIKE b COLLATE c"  worked as "(a LIKE b) COLLATE c" which is not right