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

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

new tests to ensure that prepared statement *really* work
(and that MySQL not picks up some number from arbitrary location
that happens to match the parameter's value)


mysql-test/include/ps_query.inc:
  new tests to ensure that prepared statement *really* work
  (and that MySQL not picks up some number from arbitrary location
  that happens to match the parameter's value)
mysql-test/r/ps_2myisam.result:
  results updated
mysql-test/r/ps_3innodb.result:
  results updated
mysql-test/r/ps_4heap.result:
  results updated
mysql-test/r/ps_5merge.result:
  results updated
mysql-test/r/ps_6bdb.result:
  results updated
sql/sql_select.cc:
  don't shortcut - it backfires!
  (in particular - when itemptr is Item_param :)

mysql-test/r/func_str.result:
  test fixed
mysql-test/r/packet.result:
  test fixed
sql/item_geofunc.cc:
  error message fixed
sql/item_strfunc.cc:
  error message fixed
sql/share/czech/errmsg.txt:
  error message fixed
sql/share/danish/errmsg.txt:
  error message fixed
sql/share/dutch/errmsg.txt:
  error message fixed
sql/share/english/errmsg.txt:
  error message fixed
sql/share/estonian/errmsg.txt:
  error message fixed
sql/share/french/errmsg.txt:
  error message fixed
sql/share/german/errmsg.txt:
  error message fixed
sql/share/greek/errmsg.txt:
  error message fixed
sql/share/hungarian/errmsg.txt:
  error message fixed
sql/share/italian/errmsg.txt:
  error message fixed
sql/share/japanese/errmsg.txt:
  error message fixed
sql/share/korean/errmsg.txt:
  error message fixed
sql/share/norwegian-ny/errmsg.txt:
  error message fixed
sql/share/norwegian/errmsg.txt:
  error message fixed
sql/share/polish/errmsg.txt:
  error message fixed
sql/share/portuguese/errmsg.txt:
  error message fixed
sql/share/romanian/errmsg.txt:
  error message fixed
sql/share/russian/errmsg.txt:
  error message fixed
sql/share/serbian/errmsg.txt:
  error message fixed
sql/share/slovak/errmsg.txt:
  error message fixed
sql/share/spanish/errmsg.txt:
  error message fixed
sql/share/swedish/errmsg.txt:
  error message fixed
sql/share/ukrainian/errmsg.txt:
  error message fixed

mysql-test/r/func_str.result:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into mysql.com:/home/mysql_src/mysql-4.1-874

client code and replication slave code, as far as LOAD DATA INFILE and
other queries' execution is concerned. Duplication of code leads to
replication bugs, because the replication duplicate lags much behind.
Fix for 2 Valgrind errors on slave replicating LOAD DATA INFILE
  - one serious (causing a random test failure in rpl_loaddata in 5.0)
  - one not serious (theoretically a bug but not dangerous): uninited thd->row_count


sql/log_event.cc:
  Fix for 2 Valgrind errors:
  - one serious (causing a random test failure in rpl_loaddata in 5.0): uninited lex in replic of LOAD DATA INFILE on slave
  - one not serious (theoretically a bug but not dangerous): uninited thd->row_count in replication of LOAD DATA INFILE on slave.
  Sanja is likely to rework the fix to the 1st problem tomorrow.

sql/examples/ha_archive.cc:
  Corrections from Bar's comments. Mainly small code changes/style changes.

into sand.box:/home/tim/m/41/bk


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

was changed in the SHOW STORAGE ENGINES results)


mysql-test/r/ps_1general.result:
  SHOW STORAGE ENGINES now has different text ("type" -> "engine", etc.)

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

mysql-test/t/create_select_tmp.test:
  --disable_warnings
mysql-test/t/rpl_drop.test:
  --disable_warnings

Build-tools/Do-compile:
  Auto merged
Docs/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0arr.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/r/innodb.result:
  to be fixed after the merge

  Revise output of SHOW ENGINES.


sql/handler.cc:
  Revise output of SHOW ENGINES.

  don't be confused if  new privilege - ENUM ('N','Y') - columns are added (mostly because of downgrade)
  don't expect NOT NULL fields to never contain a NULL :) - somebody may've changed table definition, or we may be reading the wrong column

   exception (it only applies to 4.0 and above)

The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).


sql/sql_insert.cc:
  Fix for BUG#4551 "Temporary InnoDB tables not replicated properly with CREATE TABLE .. SELECT"
  The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
  of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).
  And it led to the above bug, because the binlogging of CREATE SELECT is done by select_insert::send_eof() (same function
  as INSERT SELECT) and so, if the table is transactional and there is a failure, the statement is considered as rolled
  back and so nothing is written in the binlog. So temp table MUST be deleted.

into mysql.com:/home/mysql_src/mysql-4.0

BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines",
BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table" with a test file.
It was not possible to add a test for BUG#4506 as in the test suite we must use --short-form
which does not display the "# at" lines.


client/mysqlbinlog.cc:
  Fix for BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines"
  when reading a remote binlog, the start position is not always BIN_LOG_HEADER_SIZE (4).
sql/sql_table.cc:
  Fix for BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table"
  we must my_error() _before_ we write to the binlog, so that a meaningful error code is available
  in thd->net.last_errno for storage of the DROP TABLE statement into the binlog.

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


sql/item_subselect.cc:
  Auto merged

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

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

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

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

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

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

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

   when copying a small index file because the value returned
   for $length is < 1024. This can happen if the filehandle
   was open()ed as an UTF-8 encoded file with Unicode characters
   (In this case read() returns characters not bytes)
   (Thanks to Mike Bethune) for this hint)

(Bug #4446)


innobase/row/row0ins.c:
  row_ins_foreign_check_on_constraint(): limit recursion for UPDATE too
mysql-test/r/innodb.result:
  Add test for recursion depth limit
mysql-test/t/innodb.test:
  Add test for recursion depth limit

  Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1


innobase/btr/btr0cur.c:
  Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1

sql/item_subselect.cc:
  stack overflow check added for subqueries processing

  Language fixups.


scripts/mysql_fix_privilege_tables.sh:
  Language fixups.