mysql-test/r/information_schema.result:
  Remove extra spaces from result file.
mysql-test/r/mysqldump.result:
  Remove extra spaces from result file.
mysql-test/r/rpl_ddl.result:
  Remove extra spaces from result file.
mysql-test/r/trigger-compat.result:
  Remove extra spaces from result file.
mysql-test/r/trigger-grant.result:
  Remove extra spaces from result file.
mysql-test/r/trigger.result:
  Remove extra spaces from result file.
sql/sql_yacc.yy:
  Remove leading spaces.

into  mysql.com:/opt/local/work/mysql-5.0-root


sql/item_strfunc.cc:
  Auto merged
sql/password.c:
  Manual merge

rename sha1_* to mysql_sha1_*


include/sha1.h:
  rename sha1_* to mysql_sha1_*
mysys/sha1.c:
  rename sha1_* to mysql_sha1_*
sql/item_strfunc.cc:
  rename sha1_* to mysql_sha1_*
sql/password.c:
  rename sha1_* to mysql_sha1_*

into  mysql.com:/usr/local/mysql/tmpbuild

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

client/mysqltest.c:
  Add comments
  Group inits logically

Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.


client/mysqltest.c:
  Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
  Correct test result, "At line 1" should be printed

into  mysql.com:/usr/local/mysql/mysql-5.0

client/mysqltest.c:
  Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
  Remove test results for disabled test
mysql-test/t/mysqltest.test:
  Disable test for "let assigns each column of query to own var"

into  mysql.com:/home/alik/MySQL/devel/5.0-bug15110


sql/sql_parse.cc:
  Auto merged

There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.


BitKeeper/etc/ignore:
  added client/my_user.c libmysqld/my_user.c sql/my_user.c
client/Makefile.am:
  Use my_user.c in linking of mysqldump executable.
client/mysqldump.c:
  Fix for BUG#15110(mysqldump --triggers: does not include DEFINER clause)
include/Makefile.am:
  Add my_user.c
include/mysql_com.h:
  Introduce a constant for max user length.
libmysqld/Makefile.am:
  Add my_user.c
mysql-test/r/mysqldump.result:
  Update result file.
sql-common/Makefile.am:
  Add my_user.c
sql/Makefile.am:
  Add my_user.c
sql/sp.cc:
  Use constant for max user length.
sql/sp_head.cc:
  Use common function to parse user value.
sql/sql_acl.cc:
  Use constant for max user length.
sql/sql_parse.cc:
  Use constant for max user length.
sql/sql_show.cc:
  Use constant for max user length.
sql/sql_trigger.cc:
  Use constant for max user length.
include/my_user.h:
  A header file for parse_user().
sql-common/my_user.c:
  A new file for parse_user() implementation.

into  mysql.com:/nfstmp1/ingo/autopush-773/mysql-5.0

into  mysql.com:/home/mydev/mysql-5.0-bug5390

into  hasky.mysql.fi:/home/jani/mysql-5.0

mysql-test/t/disabled.def:
  Enabling type_time.test

sql/sql_class.cc:
  Improved documentation on add_to_status().
sql/sql_parse.cc:
  Changed refresh status to take thd as argument to avoid current_thd.
  Removed add_to_status away from loop, as it is not necessary for each
  variable, only required for each thread. In this case only the current
  thread.

into  mysql.com:/home/alexi/dev/mysql-5.0-15805


mysql-test/r/type_time.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged

 To be uncommented after fixing bug 15805.


mysql-test/r/type_time.result:
  Fixing testcases results.
mysql-test/t/type_time.test:
  Temporaly commented out testcases which cause type_time.test failure.
   To be uncommented after fixing bug 15805.

into  mysql.com:/home/mydev/mysql-5.0-bug5390

client/mysqltest.c:
  Allocate one extra byte for string terminator in varname

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0

There is a specific rpl_ignore_grant test case for GRANT.


mysql-test/r/rpl_ignore_revoke.result:
  New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''
mysql-test/t/rpl_ignore_revoke-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''
mysql-test/t/rpl_ignore_revoke.test:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/mysqltest.test:
  Changed to "test ! -e" instead of "test -s"

into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598

into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598


sql/sql_acl.cc:
  Auto merged

- Comparing host string against NULL caused crash. 
- If host.hostname is NULL treat it as ""


mysql-test/r/grant.result:
  Update test results
mysql-test/t/grant.test:
  Add test for user with host ""

into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem

into  devsrv-b.mysql.com:/space/magnus/my41-bug15598

into  mysql.com:/home/mydev/mysql-4.1-bug5390

into  mysql.com:/home/mydev/mysql-4.1-bug5390

into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598


mysql-test/t/grant.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/grant.result:
  SCCS merged

into  devsrv-b.mysql.com:/space/magnus/my41-bug15598


sql/sql_acl.cc:
  Auto merged

 - When acl_user->host.hostname is NULL compare it as ""


mysql-test/r/grant.result:
  Test user with host ''
mysql-test/t/grant.test:
  Test user with host ''
sql/sql_acl.cc:
  If acl_user->host.hostname is NULL compare it as ""

Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)


config/ac-macros/yassl.m4:
  Symlink extra/yassl/include/openssl dir to include/
include/Makefile.am:
  Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl
libmysql_r/Makefile.am:
  Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)