mysql-test/include/ps_modify.inc:
  replace ... select now works.
mysql-test/r/ps_2myisam.result:
  replace ... select now works.
mysql-test/r/ps_3innodb.result:
  replace ... select now works.
mysql-test/r/ps_4heap.result:
  replace ... select now works.
mysql-test/r/ps_5merge.result:
  replace ... select now works.
mysql-test/r/ps_6bdb.result:
  replace ... select now works.
mysql-test/r/ps_7ndb.result:
  replace ... select now works.
mysql-test/t/ps_7ndb.test:
  replace ... select now works.
sql/sql_prepare.cc:
  Enable SQLCOM_REPLACE_SELECT: no need for any code changes but
  enable this SQLCOM in the switch.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

    added define flag SNPRINTF_RETURN_ZERO to indicate that snprintf returns zero if buffer too small
    use flag SNPRINTF_RETURN_ZERO
    emulate snprintf behavior by writing to _big_ buffer if set
    use my_vsnprintf if HAVE_SNPRINTF is not set and set SNPRINTF_RETURN_ZERO in that case


configure.in:
  added define flag to indicate that snprintf returns zero if buffer too small
ndb/src/common/util/basestring_vsnprintf.c:
  use flag SNPRINTF_RETURN_ZERO
  emulate snprintf behavior by writing to _big_ buffer if set
  use my_vsnprintf if HAVE_SNPRINTF is not set and set SNPRINTF_RETURN_ZERO in that case

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


mysql-test/r/fulltext.result:
  Auto merged

mysql-test/t/ctype_utf8.test:
  bad merge fixed

"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert().

   protocal change in create table, now allows for more than 91 attributes
   upgrade compatability with 3.5.3


configure.in:
  bumped up version for ndb
  protocal change in create table, now allows for more than 91 attributes
ndb/src/common/util/version.c:
  upgrade compatability with 3.5.3

  Unnecessary code was removed.


sql/item_strfunc.cc:
  Unnecessary code was removed.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged

   -I/usr/include needed for cxx on Tru64


configure.in:
   -I/usr/include needed for cxx on Tru64

constant with a column. The string is converted into the column
character set. It conversion doesn't lose data, then operation
is possible. Otherwise, give an error, as it was earlier.


sql/item.h:
  Change bool argument to uint flags:
  we have now two different flags.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged

    cxx does not include -I/ust/include.dtk as it should
    removed dependency on ndb_types


configure.in:
  Tru64 cxx compiler fix
  cxx does not include -I/ust/include.dtk as it should
ndb/include/ndbapi/ndbapi_limits.h:
  removed dependency on ndb_types
sql/ha_ndbcluster.h:
  removed dependency on ndb_types

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

into deer.(none):/home/hf/work/mysql-4.1.6117

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

  forgot to commit new result


mysql-test/r/ndb_basic.result:
  forgot to commit new result

    exposed the attribute name size limit for handler
   added field name truncation to ndb handler


mysql-test/t/ndb_basic.test:
  test that attribute name truncation works
ndb/include/ndbapi/ndbapi_limits.h:
  exposed the attribute name size limit for handler
sql/ha_ndbcluster.cc:
  added field name truncation to ndb handler

    use new sendSignal method instead
    new send signal method which sends segments
    remove unused method sendFragmentedSignalUnCond


ndb/src/ndbapi/NdbScanOperation.cpp:
  scan should not send fragmented signal
  use new sendSignal method instead
ndb/src/ndbapi/TransporterFacade.cpp:
  new send signal method which sends segments
ndb/src/ndbapi/TransporterFacade.hpp:
  new send signal method which sends segments
  remove unused method sendFragmentedSignalUnCond

added API_TRACE code
removed old implementation of fragmented signal

  changed to using fragmented signals for CREATE_TABLE_REQ


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  changed to using fragmented signals for CREATE_TABLE_REQ

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-local

  corrected define for NDB_MAX_TUPLE_SIZE_IN_WORDS


ndb/include/ndbapi/ndbapi_limits.h:
  corrected define for NDB_MAX_TUPLE_SIZE_IN_WORDS

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

    new define for long signal section size
   bumbed up limit for attributes to 128
    use new define in SectionSegment
    some bug fixing of send fragmented signal +
    make chunk size a multiple the dew define for SectionSegment size


mysql-test/r/ndb_basic.result:
  added test for max limit of 128 attributes in table
mysql-test/t/ndb_basic.test:
  added test for max limit of 128 attributes in table
ndb/include/kernel/ndb_limits.h:
  new define for long signal section size
ndb/include/ndbapi/ndbapi_limits.h:
  bumbed up limit for attributes to 128
ndb/src/kernel/vm/LongSignal.hpp:
  use new define in SectionSegment
ndb/src/ndbapi/TransporterFacade.cpp:
  some bug fixing of send fragmented signal +
  make chunk size a multiple the dew define for SectionSegment size

into the column character set on INSERT/UPDATE.


sql/sql_string.cc:
  New argument to report an error.
sql/sql_string.h:
  New argument to report an error.

into mysql.com:/M41/mysql-4.1

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

ENOSYS

args[0] is now used instead.

into deer.(none):/home/hf/work/mysql-4.1.6117

sql/sql_prepare.cc:
  Catch another class of errors possible during yyparse:
  if thd->net.report_error is set, we need to send the message and 
  abort.

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

Windows style line end \r\n on README, license, and similar essential plaintext files.


scripts/make_win_src_distribution.sh:
  Some plain text files (which a Windows user might view in any editor) should have 
  Windows style line end \r\n (bug#5385). The tool is changed to do a systematic pass 
  over all files, find all relevant ones (especially "README*", "ChangeLog", "INSTALL*", 
  license text), and adapt them.
  Included are two minor cleanups ("useless use of cat" avoided, variable setting 
  moved to more sensible place).

numeric columns (stmt_resultset_metadata)"


libmysql/libmysql.c:
  A fix for Bug#6096 "field.max_length is always zero for numeric columns
   (stmt_resultset_metadata)": set field->max_lenght for numeric
  columns when we set up skip_result functions. A minor drawback for this 
  approach is that field->max_length  can be not zero even if 
  STMT_ATTR_UPDATE_MAX_LENGTH is not set.
sql-common/my_time.c:
  Fix valgrind warning.
tests/client_test.c:
  A test case for Bug#6096 "field.max_length is always zero for numeric 
  columns (stmt_resultset_metadata)

innobase/srv/srv0srv.c:
  after merge fix
sql/set_var.cc:
  after merge fix
sql/sql_cache.cc:
  after merge fix

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