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

into banica.(none):/home/salle/bk/mysql-4.1

  Fix CREATE LIKE TABLE .. temporary case


sql/sql_table.cc:
  Fix CREATE LIKE TABLE .. temporary case

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


sql/sql_yacc.yy:
  Auto merged

Add optional second parameter to password() function. It can be used to force password()
to return fixed values. 


mysql-test/r/func_crypt.result:
  New test results
mysql-test/t/func_crypt.test:
  new tests
sql/item_strfunc.cc:
  Add optional second argument to password() function
sql/item_strfunc.h:
  New method
sql/sql_yacc.yy:
  Handling of password with 2 arguments

Reported by Georg Richter as it brokes his build with mipspro


client/mysqlimport.c:
  Removed ^M
client/mysqlshow.c:
  Removed ^M
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

new format SCRUM


include/mysqld_error.h:
  Add new error message
sql/share/czech/errmsg.txt:
  czech
sql/share/danish/errmsg.txt:
  danish
sql/share/dutch/errmsg.txt:
  dutch
sql/share/english/errmsg.txt:
  New Error message for in case old client connects new server and new auth is to be used
sql/share/estonian/errmsg.txt:
  estonian
sql/share/french/errmsg.txt:
  french
sql/share/german/errmsg.txt:
  german
sql/share/greek/errmsg.txt:
  greek
sql/share/hungarian/errmsg.txt:
  hungarian
sql/share/italian/errmsg.txt:
  italian
sql/share/japanese/errmsg.txt:
  japaneese
sql/share/korean/errmsg.txt:
  korean
sql/share/norwegian-ny/errmsg.txt:
  norwegian-ny
sql/share/norwegian/errmsg.txt:
  norwegian
sql/share/polish/errmsg.txt:
  polish
sql/share/portuguese/errmsg.txt:
  portuguese
sql/share/romanian/errmsg.txt:
  romanian
sql/share/russian/errmsg.txt:
  russian
sql/share/serbian/errmsg.txt:
  se
sql/share/slovak/errmsg.txt:
  slovak
sql/share/spanish/errmsg.txt:
  spanish
sql/share/swedish/errmsg.txt:
  swedish
sql/share/ukrainian/errmsg.txt:
  ukrainian
sql/sql_parse.cc:
  Add proper error message if old clients can't authenticate due to unsupported protocol
  SCRUM

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


sql/sql_select.cc:
  Auto merged

just one argument from command line.

Fixed a bug in interactive 'connect' command, which earlier
couldn't take quoted arguments.

How-to-repeat:

mysql> connect `stupid db` localhost

into dsl-kpogw4gb5.dial.inet.fi:/home/my/bk/mysql-4.1

to the start of mysql-test-run

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

sql/share/czech/errmsg.txt:
  Chezh
sql/share/danish/errmsg.txt:
  Danish
sql/share/dutch/errmsg.txt:
  Dutch
sql/share/estonian/errmsg.txt:
  Estonian
sql/share/french/errmsg.txt:
  French
sql/share/german/errmsg.txt:
  German
sql/share/greek/errmsg.txt:
  Greek
sql/share/hungarian/errmsg.txt:
  Hungarian
sql/share/italian/errmsg.txt:
  Italian
sql/share/japanese/errmsg.txt:
  Japanese
sql/share/korean/errmsg.txt:
  Korean
sql/share/norwegian-ny/errmsg.txt:
  Norwegian-ny
sql/share/norwegian/errmsg.txt:
  Norwegian
sql/share/polish/errmsg.txt:
  polish
sql/share/portuguese/errmsg.txt:
  Portuguese
sql/share/romanian/errmsg.txt:
  Romainian
sql/share/russian/errmsg.txt:
  Russian
sql/share/serbian/errmsg.txt:
  Serbian
sql/share/slovak/errmsg.txt:
  Slovak
sql/share/spanish/errmsg.txt:
  spanish
sql/share/swedish/errmsg.txt:
  Swedish
sql/share/ukrainian/errmsg.txt:
  Ukrainian

sql/share/english/errmsg.txt:
  Correct Error messages to match actual behavior

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

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


sql/item.cc:
  Auto merged

into dsl-kpogw4gb5.dial.inet.fi:/home/my/bk/mysql-4.1

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1

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

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

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

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

  ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!


include/mysql_com.h:
  ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!

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

  COUNT(DISTINCT expr) and charset related test


mysql-test/r/ctype_many.result:
  COUNT(DISTINCT expr) and charset related test

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

into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.spa


sql/item_strfunc.cc:
  Auto merged