BitKeeper/etc/ignore:
  Added myisam/ftbench/data myisam/ftbench/t to the ignore list

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

NCHAR(n) and NATIONAL CHARACTER(n)
is now synonim for
CHARACTER(n) CHARACTER SET utf8

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

into mysql.com:/home/pem/work/mysql-4.1

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


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Docs/internals.texi:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_vio.c:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
strings/strto.c:
  Auto merged

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

Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists


Docs/internals.texi:
  Updated description for how DATE, TIME and TIMESTAMP are stored
mysql-test/r/create.result:
  New tests
mysql-test/t/create.test:
  New tests
sql/handler.cc:
  Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists.
sql/sql_parse.cc:
  Fix that we return hostname instead of IP in SHOW PROCESSLIST
sql/sql_show.cc:
  Print right hostname or IP in SHOW PROCESSLIST

Fixed non fatal memory leak in slave code.


mysql-test/r/func_test.result:
  Added test for DIV
mysql-test/t/func_test.test:
  Added test for DIV
mysys/my_alloc.c:
  More DBUG statements
sql/item_func.cc:
  Added support for ULONG division with DIV
sql/log_event.cc:
  Fixed memory leak (Wrong call to init_sql_alloc)
sql/slave.cc:
  Fixed memory leak (Wrong call to init_sql_alloc)
sql/sql_base.cc:
  More DBUG statements
sql/sql_class.cc:
  Added init_for_queries() to fix memory leak in slave code
sql/sql_class.h:
  Added init_for_queries() to fix memory leak in slave code
sql/sql_error.cc:
  More DBUG statements
sql/sql_parse.cc:
  Added init_for_queries() to fix memory leak in slave code
sql/unireg.h:
  Moved memory defaults to include file

  Always compile utf8


configure.in:
  Always compile utf8

comparison" table, "SQL Complete, Really", page 162

into mysql.com:/space/my/mysql-4.0-build