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

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

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

  InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested


innobase/os/os0file.c:
  InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested

into hundin.mysql.fi:/home/marko/j/mysql-4.1

  minor fixes


strings/CHARSET_INFO.txt:
  minor fixes

  Check DERIVATION_NONE only for UNIONS.


sql/sql_union.cc:
  Check DERIVATION_NONE only for UNIONS.

contributed by Takeshi. I also added HEX support for 
"extended-inserts".

  Replace a tolower() loop with innobase_casedn_str()


sql/ha_innodb.cc:
  Replace a tolower() loop with innobase_casedn_str()

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

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

innobase/dict/dict0dict.c:
  Use innobase_strcasecmp() and innobase_casedn_str()
  instead of ut_cmp_in_lower_case() and ut_cpy_in_lower_case()
innobase/include/ut0byte.h:
  Remove ut_cpy_in_lower_case() and ut_cmp_in_lower_case()
innobase/ut/ut0byte.c:
  Remove ut_cpy_in_lower_case() and ut_cmp_in_lower_case()
sql/ha_innodb.cc:
  Add innobase_strcasecmp() and innobase_casedn_str()
  Replace tolower() loop with innobase_casedn_str()
  Replace my_casedn_str() with innobase_casedn_str()
  Replace ut_cmp_in_lower_case() with innobase_strcasecmp()

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

  If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long


innobase/srv/srv0srv.c:
  If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long

  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 poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged

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/kernel/blocks/dbtux/Dbtux.hpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1533 tux optim: after wl-1942 can remove signal from many methods

ndb/src/ndbapi/ndberror.c:
  4006

ndb/include/kernel/ndb_limits.h:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/src/kernel/blocks/dbtux/Times.txt:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes
ndb/test/ndbapi/testOIBasic.cpp:
  tux optim 17 - rewrote treeAdd/treeRemove + allow slack in interior nodes

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