into mysql.com:/home/jimw/my/mysql-5.0-build

libmysql/libmysql.c:
  Break up variable definitions to appease HP/UX compiler.

into mysql.com:/home/jimw/my/mysql-5.0-build

into mysql.com:/home/jimw/my/mysql-5.0-build

heap/hp_create.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_string.h:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/func_gconcat.result:
  Manual merge
mysql-test/r/func_str.result:
  Manual merge
mysql-test/t/func_gconcat.test:
  Manual merge
sql/ha_heap.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

sql/key.cc:
  Auto merged
mysql-test/r/update.result:
  SCCS merged
mysql-test/t/update.test:
  SCCS merged

sql/key.cc:
  A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
  For "partial" key parts (e.g. key(a(20), ...) we create different
  key_part->field, see sql/table.cc; so we have to use the eq() 
  function here to compare fields.

First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.

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


sql/item.h:
  Auto merged

reconnect setting in mysql client library. (Bug #8866)


client/mysqltest.c:
  Make sure reconnect is always set on connections, and
  note that there is a test that relies on this

  Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.


sql/sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
mysql-test/t/olap.test:
  Added a test for bug #8615.
mysql-test/r/olap.result:
  Added a test for bug #8615.

mysql-test/r/federated.result:
  merge
sql/ha_federated.cc:
  merge

Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP


mysql-test/include/varchar.inc:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/r/innodb.result:
  Added varchar tests
mysql-test/r/myisam.result:
  Update results
mysql-test/t/bdb.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/t/innodb.test:
  Enabled VARCHAR testing
mysql-test/t/myisam.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
sql/sql_parse.cc:
  Indentation fixes
sql/sql_table.cc:
  Fixed bug introduced when doing cleanup

into mysql.com:/home/my/mysql-5.0


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

BUG#9123 is solved earlier than this patch though.

into krsna.:/home/patg/test/mysql-5.0

WL#874 "Extended LOAD DATA" was pushed.


mysql-test/r/binlog.result:
  Addition of two new types of binary log events shifted binlog positions.
  Updated test's results and made it more robust for future similar
  changes.
mysql-test/t/binlog.test:
  Addition of two new types of binary log events shifted binlog positions.
  Updated test's results and made it more robust for future similar
  changes.

into krsna.:/home/patg/test/mysql-5.0

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3


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

  Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing


innobase/data/data0data.c:
  Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing

into krsna.:/home/patg/test/mysql-5.0

mysql-test/r/innodb.result:
  Added proper cleanup after test.
mysql-test/t/innodb.test:
  We don't expect error if we create varchar(16384) column in Innodb
  table anymore. (Heikki already removed error message from .result
  file.) Also we should do proper cleanup after the test.

the time spent in the various steps.


Build-tools/Do-compile:
  Add information to the log file that allows to calculate the time spent in the
  various steps:
  
  1) Introduce a global variable 'global_step'.
  2) Before each major step, set it to some descriptive value.
  3) Expand the 'log_timestamp()' function to take a parameter (typical: "START",
     "DONE", or "ABORT") and append that to the timestamp in the log file,
     followed by the contents of 'global_step'.
  4) Add the "START" string as parameter to the 'log_timestamp' calls preceding a step.
  5) Add 'log_timestamp("DONE");' calls after the relevant steps.
  6) Add 'log_timestamp("ABORT");' calls to the error exits.

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp

Removed some optional arguments
Fixed portability problem in federated tests


client/sql_string.cc:
  update from sql/sql_string.cc
client/sql_string.h:
  update from sql/sql_string.h
mysql-test/r/federated.result:
  Fixed error message
sql/field.cc:
  Cleanup during review
  Remove const in 'const unsigned int'
sql/field.h:
  Remove const in 'const unsigned int'
sql/ha_federated.cc:
  Better error string.  Add missing argument to error (before 'errno' was picked up from stack)
sql/handler.cc:
  Removed compiler warning
sql/item_func.cc:
  Cleanup during review
sql/item_sum.cc:
  Cleanup during review
sql/lock.cc:
  Remove optional arguments
sql/log_event.cc:
  Remove optional arguments
sql/mysql_priv.h:
  Remove optional arguments
  cahnge preapre_create_fields to use pointers instead of references
sql/opt_range.cc:
  Fix arguments so that return value is last
sql/sql_base.cc:
  Remove optional arguments
sql/sql_delete.cc:
  Remove optional arguments
sql/sql_error.cc:
  Remove optional arguments
sql/sql_help.cc:
  Remove optional arguments
sql/sql_parse.cc:
  Remove optional arguments
sql/sql_prepare.cc:
  Remove optional arguments
sql/sql_rename.cc:
  Remove optional arguments
sql/sql_select.cc:
  Remove optional arguments
sql/sql_show.cc:
  Cleanup during review
sql/sql_string.cc:
  Simple optimization
sql/sql_table.cc:
  Remove optional arguments
  Fixed indentation
sql/sql_update.cc:
  Remove optional arguments
sql/sql_yacc.yy:
  Change references to pointers

into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp

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

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