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

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

  new file

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

  Remove unnesessary code: use_mb is always TRUE for the multibyte charsets.


strings/ctype-mb.c:
  Remove unnesessary code: use_mb is always TRUE for the multibyte charsets.

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

libmysql/manager.c:
  Code clean-up: as my_net_read() returns ulong value we should use ulong here.

Now we use TABLE::timestamp_field_type instead of
TABLE::timestamp_default_now/on_update_now for determining
if we should auto-set value of TIMESTAMP field during this operation.
We are also use Field_timestamp::set_time() instead of
handler::update_timestamp().


sql/examples/ha_example.cc:
  Now we use TABLE::timestamp_field_type instead of
  TABLE::timestamp_default_now/on_update_now for determining
  if we should auto-set value of TIMESTAMP field during this operation.
  We are also use Field_timestamp::set_time() instead of
  handler::update_timestamp().
sql/examples/ha_tina.cc:
  Now we use TABLE::timestamp_field_type instead of
  TABLE::timestamp_default_now/on_update_now for determining
  if we should auto-set value of TIMESTAMP field during this operation.
  We are also use Field_timestamp::set_time() instead of
  handler::update_timestamp().

ndb/src/ndbapi/ndberror.c:
  4006

into hundin.mysql.fi:/home/jan/talle/mysql-4.1

include/sql_common.h:
  Remove stale declaration.

  Change @image argument parsing.


Docs/Support/texi2html:
  Change @image argument parsing.

test for bug#1180 changed to table naming scheme 't#'.


mysql-test/r/ps_11bugs.result:
  Expected results of new tests for bug#1644 and bug#1676,
  test for bug#1180 changed to table naming scheme 't#'.
mysql-test/t/ps_11bugs.test:
  New tests to check bug#1644 and bug#1676,
  test for bug#1180 changed to table naming scheme 't#'.

was the query REPLACE or LOAD DATA INFILE REPLACE.


innobase/row/row0ins.c:
  Find SQL-query directly from current thread and see if the
  query was REPLACE or LOAD DATA INFILE REPLACE.
sql/ha_innodb.cc:
  Find current thread and return true if SQL-query in the current
  thread was either REPLACE or LOAD DATA INFILE REPLACE.

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

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

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

ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Fix scan out of keyinfo buffers
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix scan out of keyinfo buffers
ndb/src/ndbapi/NdbOperationExec.cpp:
  Handle TCKEYREF connect wrt dirty/simple read
ndb/src/ndbapi/NdbScanOperation.cpp:
  Set error code
ndb/test/src/UtilTransactions.cpp:
  Handle temporary errors

  Tagged ChangeSet 1.2091 as mysql-4.1.6
configure.in:
  Updated version string to 4.1.7


configure.in:
  Updated version string to 4.1.7

into hundin.mysql.fi:/home/jan/talle/mysql-4.1


mysql-test/t/ctype_utf8.test:
  Auto merged

let's not assume that char is signed (its signedness is not defined).
The server was also affected by the wrong typedef.


include/my_global.h:
  Fix for Bug#6024 "Test "client_test" fails in 4.1.6-gamma build (1)":
  let's not assume that char is signed (its signedness is not defined).
libmysql/libmysql.c:
  Fix for Bug#6024 "Test "client_test" fails in 4.1.6-gamma build (1)":
  let's not assume that char is signed (its signedness is not defined).

 Fix for Bug#6025 "Test "client_test" fails in 4.1.6-gamma build (2)".
 No need for a test case, the bug is covered already.


libmysql/libmysql.c:
  Fix for Bug#6025 "Test "client_test" fails in 4.1.6-gamma build (2)":
  the bug was in assignments like:
    *row+= read_binary_time(tm, row);
  which makes two assingments without a sequence point (read_binary_*
  changes *row too) => undefined behaviour.
  The fix changes read_binary_{time,date,datetime} signature to get
  rid of any probability to fall into the same trouble in future.

  Fix a typo. Cleanup.


BUILD/compile-hpux11-parisc2-aCC:
  Fix a typo. Cleanup.

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

into mysql.com:/space/my/mysql-4.1-build

client/mysqlimport.c:
   - Cleanup: removed unreferenced local variable "local_file"

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

ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  remove obsolete node-access-size stuff
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  remove obsolete node-access-size stuff
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  remove obsolete node-access-size stuff
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  remove obsolete node-access-size stuff
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  remove obsolete node-access-size stuff
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  remove obsolete node-access-size stuff

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

   mysqlclient.dsp project files


VC++Files/client/mysqlclient.dsp:
   - added missing file strings/my_strtoll10.c to the mysqlclient.dsp project
     file
VC++Files/libmysql/libmysql.dsp:
   - added missing file strings/my_strtoll10.c to the libmysql.dsp project
     file

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

X-locks on duplicates also on LOAD DATA...REPLACE clause and
fixes a bug #6086 adding --disable_warnings and --enable_warnings around
the create table clauses in ctype_utf8 tests for InnoDB.


innobase/dict/dict0dict.c:
  Remove static.
innobase/include/dict0dict.h:
  Add prototype for a function dict_scan_to
innobase/row/row0ins.c:
  Add support for a LOAD DATA INFILE 'xxx' REPLACE INTO TABLE x. We should
  take X-locks on both REPLACE and LOAD DATA...REPLACE queries to duplicate
  records.
innobase/row/row0sel.c:
  If innodb_locks_unsafe_for_binlog options is used we do not lock
  gaps. Supremum record is really a dummy record i.e. gap, therefore 
  we do set locks there.
mysql-test/t/ctype_utf8.test:
  Fix bug #6086: Add --disable_warnings and --enable_warnings around the 
  create table where engine=innodb.

  Wrong handler.


mysql-test/r/ctype_utf8.result:
  Wrong handler.
mysql-test/t/ctype_utf8.test:
  Wrong handler.

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

ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  remove TreePos::m_ent
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  remove TreePos::m_ent
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  remove TreePos::m_ent
mysql-test/ndb/ndb_range_bounds.pl:
  more options

mysql-test/r/ps_11bugs.result:
  Expected results of the added tests for bug#1644 and bug#1676.
mysql-test/t/ps_11bugs.test:
  Added tests for bug#1644 and bug#1676,
  also minor comments.

  Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support


mysql-test/t/ctype_utf8.test:
  Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support