into mysql.com:/home/jonas/src/mysql-4.1

  Minor edits to help command messages.


client/mysql.cc:
  Minor edits to help command messages.

into mysql.com:/home/jonas/src/mysql-4.1

  Forgot to push in the previous changeset


mysql-test/r/grant.result:
  Forgot to push in the previous changeset

into mysql.com:/space/pekka/ndb/version/my41

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1

 with old libedit and readline

1. discarded reading and writting of hist_cookie as the begin of the file
2. skip strvis for string before saving



cmd-line-utils/libedit/history.c:
  fixed format of history for compatibility with old libedit and readline
  
  1. discarded reading and writting of hist_cookie as the begin of file
  2. skip strvis for string before saving

ndb/src/ndbapi/NdbBlob.cpp:
  theBlobTable is NULL for tinyblob

into mysql.com:/home/jonas/src/mysql-4.1

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

  Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.


mysql-test/r/grant.result:
  Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

  Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.


Build-tools/Do-compile:
  Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.

into mysql.com:/media/sda1/mysql/mysql-4.1-5126

"Mediumint and PS problem": just treat mediumint as long.


libmysql/libmysql.c:
  A short fix for bug #5126 "Mediumint and PS problem": just
  treat mediumint as long, as it's sent just like long.
tests/client_test.c:
  A test case for bug#5126

into mysql.com:/M41/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

   distribution...

sql/item_row.cc:
  ds20 compat fix

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

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


client/mysql.cc:
  Auto merged

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

functionality. The existing code takes advantage of this when
"typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
If the compiler then has prototypes for C99 functions 'strtoll()' and
'strtoull()' but no implementation, the existing code in 'strtoull.c'
collides with that prototype. These collisions are avoided now.


include/m_string.h:
  Extend the "fake" approach from 'strtoull()' onto 'strtoll()'.
strings/strto.c:
  Ensure that calling file has included necessary headers,
  as these are needed at the upper level already.
strings/strtol.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoll.c:
  When "long" is 64 bit already, system function 'strtol()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough.
strings/strtoul.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoull.c:
  When "long" is 64 bit already, system function 'strtoul()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


libmysql/libmysql.c:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged

Fixed bug in end space handle for WHERE text_column="constant"


heap/hp_hash.c:
  Optimzations (no change of logic)
libmysql/libmysql.c:
  Added missing casts (portability fix)
myisam/mi_key.c:
  Changed macro to take arguments and not depend on local variables
  Simple indentation fixes ?
mysql-test/r/connect.result:
  Added test for setting empty password
mysql-test/r/create_select_tmp.result:
  TYPE -> ENGINE
mysql-test/r/ctype_utf8.result:
  Combine drop's
mysql-test/r/endspace.result:
  Added more tests to test end space behaviour
mysql-test/r/having.result:
  Added missing DROP TABLE
mysql-test/r/type_blob.result:
  Added more tests to ensure that fix for BLOB usage is correct
mysql-test/r/type_timestamp.result:
  Add test from 4.0
mysql-test/t/connect.test:
  Added test for setting empty password
mysql-test/t/create_select_tmp.test:
  TYPE -> ENGINE
mysql-test/t/ctype_utf8.test:
  Combine drop's
mysql-test/t/endspace.test:
  Added more tests to test end space behaviour
mysql-test/t/having.test:
  Added missing DROP TABLE
mysql-test/t/type_blob.test:
  Added more tests to ensure that fix for BLOB usage is correct
mysql-test/t/type_timestamp.test:
  Add test from 4.0
sql/field.cc:
  Removed not used variable
  Portability fix (cast)
  Simplified Field_str::double()
  Simple indentation cleanups
sql/field.h:
  Removed not needed class variable
sql/item_cmpfunc.cc:
  Indentation fix
sql/item_strfunc.cc:
  Use on stack variable for Item_str_func::val() instead of str_value.
  This makes it safe to use str_value inside the Item's val function.
  Cleaned up LEFT() usage, thanks to the above change
sql/item_sum.cc:
  Indentation cleanups
sql/protocol.cc:
  Added missing cast
sql/sql_acl.cc:
  Indentatin cleanups.
  Added missing cast
  Simple optimization of get_sort()
sql/sql_select.cc:
  Don't use 'ref' to search on text field that is not of type BINARY (use 'range' instead).
  The reson is that for 'ref' we use 'index_next_same' to read the next possible row. 
  For text fields, rows in a ref may not come in order, like for 'x', 'x\t' 'x ' (stored in this order) which causes a search for 'column='x ' to fail
sql/tztime.cc:
  Simple cleanup
strings/ctype-bin.c:
  Comment fixes
strings/ctype-mb.c:
  Changed variable names for arguments

into hegel.txg.br:/home/miguel/bk/mysql-4.0

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

BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlmanager-pwgen.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_getopt.h:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

by giving password as an argument later did not work.

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219

into mysql.com:/space/pekka/ndb/version/my41

  sco and others: use PATH_MAX always


ndb/include/ndb_global.h:
  sco and others: use PATH_MAX always
ndb/src/common/logger/FileLogHandler.cpp:
  sco and others: use PATH_MAX always