done for merge with newer version of code.


client/mysqladmin.c:
  Support for new password format
include/mysql.h:
  Increase buffer as new scramble is larger
include/mysql_com.h:
  Add new prototypes for new auth handling
libmysql/libmysql.c:
  New handshake handling code
mysql-test/install_test_db.sh:
  Extend password length to handle new passwords
mysql-test/t/rpl000017-slave.sh:
  Adjust test to work with longer password
scripts/mysql_fix_privilege_tables.sh:
  Increase password length at priv table convertion
scripts/mysql_install_db.sh:
  Longer passwords
sql/item_strfunc.cc:
  New password generation function needs seed for password generation
sql/mini_client.cc:
  Change MiniClient to handle new auth in replication
sql/mysqld.cc:
  Remove unneeded flag (was added earlier for same change)
sql/password.c:
  A lot of changes to handle new authentication and doccumentation
sql/sql_acl.cc:
  Password handling function adjustment
sql/sql_acl.h:
  Change prototype
sql/sql_class.h:
  Extend scramble length
sql/sql_parse.cc:
  Handling server side of new authentication
sql/sql_yacc.yy:
  Adjustment for new prototypes

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

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


sql/item_strfunc.cc:
  Auto merged

  old macro name is deprecated (according to the libtool 1.4.2 docs).


configure.in:
  - replaced AM_PROG_LIBTOOL with AC_PROG_LIBTOOL, since the old macro name
    is deprecated (according to the libtool 1.4.2 docs).

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

to compose strings appeared without charset context, for example,
in convertion from numer into string type.

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


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into genie.(none):/home/vva/work/lex_hash/4.1

into genie.(none):/home/vva/work/lex_hash/4.1

sql/gen_lex_hash.cc:
  new version

SHOW CREATE DATABASE [IF NOT EXISTS] dbname

Version dependant parts are displayed in appropriative comments:
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ucs` /*!40100 DEFAULT CHARACTER SET ucs2*/


client/mysqldump.c:
  SHOW CREATE DATABASE IF NOT EXISTS
sql/mysql_priv.h:
  SHOW CREATE DATABASE IF NOT EXISTS
sql/sql_db.cc:
  SHOW CREATE DATABASE IF NOT EXISTS
sql/sql_parse.cc:
  SHOW CREATE DATABASE IF NOT EXISTS
sql/sql_yacc.yy:
  SHOW CREATE DATABASE IF NOT EXISTS

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


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

include/mysql_com.h:
  Update prototype
sql/password.c:
  More handling of new passwords
sql/sql_acl.cc:
  Discovery of authentication type to go
sql/sql_parse.cc:
  Add new flags in handshake

deleted unnecessary files from bdb/


BitKeeper/deleted/.del-crypto_ext.h~3cb68f2aa5f8cd83:
  Delete: bdb/dbinc_auto/crypto_ext.h
BitKeeper/deleted/.del-int_def.in~2fb1cf84ef399553:
  Delete: bdb/dbinc_auto/int_def.in
BitKeeper/deleted/.del-TESTS~71f3060229e13171:
  Delete: bdb/test/TESTS
bdb/dist/s_tags:
  fix for BDB 4.1.24

into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1

onversion with check


sql/item.cc:
  removed similar code
sql/item_sum.cc:
  conversion with check
sql/sql_delete.cc:
  conversion with check
sql/sql_derived.cc:
  style fix
sql/sql_lex.cc:
  conversion with check
  moved similar code to function
sql/sql_lex.h:
  conversion with check
  moved similar code to function
sql/sql_parse.cc:
  conversion with check
sql/sql_update.cc:
  conversion with check
sql/sql_yacc.yy:
  conversion with check

into mysql.com:/home/walrus/bk/41

sql-bench/crash-me.sh:
  add safe ariphmetic test

into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/sql_class.h:
  new function for clean out error message

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

into ram.(none):/home/ram/work/mysql-4.1

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


sql/sql_yacc.yy:
  Auto merged

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


BitKeeper/etc/ignore:
  auto-union
sql/sql_yacc.yy:
  Auto merged

sql/sql_test.cc:
  small bug fix

BitKeeper/etc/ignore:
  Added libmysqld/sql_help.cc scripts/fill_func_tables scripts/fill_func_tables.sql to the ignore list