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

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

into genie.(none):/home/hf/work/mysql-4.1.lck

Fixes according coercibility tables, p162, SQL Complete


include/my_sys.h:
  Declaration has been moved to /sql directory
sql/item.cc:
  Fixes acording SQL complete, page 162
sql/item_cmpfunc.cc:
  Fixes acording SQL complete, page 162
sql/mysql_priv.h:
  Declaration has been moved here from /include
sql/sql_string.cc:
  A separate variable national_charset_info
sql/sql_yacc.yy:
  A separate variable national_charset_info

into genie.(none):/home/hf/work/mysql-4.1.lck


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged

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


sql/password.c:
  Auto merged
sql/sql_update.cc:
  Auto merged

Fixed bug in Item::set_name()
Fix for memory leak with geometry type


mysql-test/r/create.result:
  Fixed results after merge
mysql-test/r/innodb.result:
  Hack to make test repeatable
  (InnoDB's cardinality numbers varies a bit between tests)
mysql-test/r/rpl_relayspace.result:
  After merge fix
mysql-test/t/innodb.test:
  Hack to make test repeatable
  (InnoDB's cardinality numbers varies a bit between tests)
sql/ha_myisam.cc:
  Indentation cleanup
sql/item.cc:
  Fixed bug in Item::set_name()
sql/password.c:
  After merge fix
sql/sql_update.cc:
  After merge fix
sql/table.cc:
  Fix for memory leak with geometry type

  cmp_charset was not initialized
  valgrind fix
  LIKE now works according to coercibility rules


sql/item_cmpfunc.cc:
  cmp_charset was not initialized
  valgrind fix
  LIKE now works according to coercibility rules

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp


sql/field.cc:
  Auto merged

myisam/rt_index.c:
  Should call find_first() instead of find_next() after key deletion.
  Fixed type cast.
myisam/sp_key.c:
  Fixed spatial key creation.
sql/field.cc:
  To get rid of warning.

NATIONAL CHAR VARYING(n)
NCHAR VARYING(n)

are now aliases for

VARCHAR(n) CHARACTER SET utf8

is now synonim for
CHARACTER(n) CHARACTER SET utf8

SELECT _latin1 0x345678;
SELECT _latin x'345678';