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

+ some fixed string length cleanup
+ fixed a better error printout

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().

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.

  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

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.

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

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

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


sql/sql_class.h:
  Auto merged

crashes server." The fix makes Item_func_rand prepared-statements
aware plus it fixes the case when RAND is used in prepared
statements and replication is on (as well as several similar issues).
Until now we did not reset THD before every execution of a prepared
statement, so if some execution had set thd->time_zone_used
or thd->rand_used they would not be reset until next mysql_parse.
Some of post-review fixes done.


mysql-test/r/ps.result:
  A test case for Bug#5985: test results fixed.
mysql-test/t/ps.test:
  A test case for Bug#5985 "prepare stmt from "select rand(?)" crashes
  server."
sql/item_func.cc:
  Actual fix for Bug#5985: Item_func_rand rewritten to be 
  prepared statements aware.
sql/item_func.h:
  Actual fix for Bug#5985: Item_func_rand rewritten to be 
  prepared statements aware.
sql/mysql_priv.h:
  We need a separate call to reset THD state before every execute of
  a prepared statement. Otherwise things like THD->user_var_events
  are never cleaned up and bloat binary log (as the list of events
  grows from execution to execution).
sql/sql_class.cc:
  Statement::end_statement -> THD::end_statement()
  (a leftover from some design change which is not to pushed now, but the
  leftover is to be pushed).
sql/sql_class.h:
  Statement::end_statement -> THD::end_statement()
  (a leftover from some design change which is not to pushed now, but the
  leftover is to be pushed).
sql/sql_lex.cc:
  Move the part responsible for initializing LEX from mysql_init_query
  to lex_start.
sql/sql_lex.h:
  All lex-related initialization is now in lex_start.
  Move thd->select_number to lex->select_number to be able to use it
  easily in lex_start.
sql/sql_parse.cc:
  Split mysql_init_query into two functions: mysql_reset_thd_for_next_query,
  which is used in PS and conventional execution, and lex_start, used only
  when we want to parse something.
  Fix init_connect to use initialized THD.
sql/sql_prepare.cc:
  Deploy mysql_reset_thd_for_next_query to reset THD state before
  execution of a prepared statement.
  Normally this should have been added to just one place, but
  we have to reset thd before assigning placeholders from variables,
  thus we can't do that in execute_stmt (yuck).

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


sql/item_subselect.cc:
  Auto merged

  Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem


sql/ha_innodb.h:
  Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
sql/ha_innodb.cc:
  Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
innobase/include/srv0srv.h:
  Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
innobase/log/log0log.c:
  Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
innobase/srv/srv0srv.c:
  Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem

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

BUG#4335 - one name can be handler open'ed many times.
Fixed problems detected on Windows build by VC++.
Removed unused variables.
Applied a neccessary cast.

  Make checks (asserts) performed in client_test.c work in non-debug
  builds.


tests/client_test.c:
  Make checks (asserts) performed in client_test.c work in non-debug
  builds: all asserts/DBUG_ASSERTs replaced with if (!(expr)) abort();

innobase/trx/trx0purge.c:
  trx_purge(): avoid overflow in setting srv_dml_needed_delay

(bad merge from 4.0)


sql/sql_class.h:
  Move a comment to proper place (bad merge from 4.0)

  Added catch for (example) WL#1234 into bk commit subjects


BitKeeper/triggers/post-commit:
  Added catch for (example) WL#1234 into bk commit subjects