zlib library in order to enable support of files larger than 2Gb.
Providing an effective test is hardly possible, since the problem starts
only when archive table becomes larger than 2Gb.


zlib/gzio.c:
  Move include of zutil.h on top of gzio.c to include chain of
  zutil.h->zlib.h->zconf.h->config.h before including anything else.
zlib/zconf.h:
  Includes config.h in order to make _FILE_OFFSET_BITS definition available.

into  mysql.com:/usr/home/bar/mysql-5.0

  after-merge fix for
  bug#15581 COALESCE function truncates mutli-byte TINYTEXT values


sql/sql_show.cc:
  after-merge fix for bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
  ,

  After merge fix:
  fixing order of results.


mysql-test/r/ctype_utf8.result:
  After merge fix:
  fixing order of results.

into mysql.com:/home/psergey/mysql-5.0-bug16166-r2

account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)


mysql-test/r/index_merge.result:
  Testcase for BUG#16166
mysql-test/t/index_merge.test:
  Testcase for BUG#16166
sql/sql_select.cc:
  BUG#16166: "Can't use index_merge with FORCE INDEX": adjust the heuristics check:
  if (force-index-is-used && there-is-possible-ref-access && 
  +    THERE IS NO POSSIBLE RANGE/INDEX_MERGE ACCESS)
  {
    ...

into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After-merge fix.
sql/field.cc:
  After merge fix.

into  mysql.com:/usr/home/bar/mysql-4.1.b15581

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

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  linux.site:/home/reggie/work/mysql-5.0

include/config-win.h:
  use the ll and ull postfix codes for create longlong and ulonglong
  symbols.  This allows ULL(a) and LL(a) to be used in more complex
  macro definitions than the previous definitions.  This may work on
  other compilers but we just tested on Visual 7.1 and 8.0
  
  Also, define HAVE_STRNLEN for all windows platforms.  Our own strnlen
  offers no performance improvements over the CRT version.

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