into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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

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

One more free_charset call added


libmysql/libmysql.c:
  free_charset call added

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/sql_select.cc:
  Auto merged

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

ndb/src/ndbapi/TransporterFacade.cpp:
  dbug aid for api signal log

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

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

cmd-line-utils/readline/config_readline.h:
  Fixing code formatting

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Removed forgotten abort() call

into mysql.com:/home/psergey/mysql-4.1-bug9103

  Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
olap.result, olap.test:
  Added a test case for bug #9681.


mysql-test/t/olap.test:
  Added a test case for bug #9681.
mysql-test/r/olap.result:
  Added a test case for bug #9681.
sql/sql_select.cc:
  Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.

sql/share/Makefile.am:
  Auto merged

  while testing changes to the mysql-copyright scripts


libmysqld/examples/Makefile.am:
  - added a copyright header
sql/share/Makefile.am:
  - added a copyright header
tools/Makefile.am:
  - added a copyright header

Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.


mysql-test/r/type_timestamp.result:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  The test result.
mysql-test/t/type_timestamp.test:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  The test case.
sql/mysql_priv.h:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  Made check_insert_fields() static. It is used only in sql_insert.cc.
sql/sql_insert.cc:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  Modified the check of the insert fields so that an explicit
  assignment of the timestamp field does only disable the automatic
  for inserts and retains the automatic for updates.
  Added a check if the update fields contain the timestamp field.
  In this case, the automatic on update is disabled, but not the
  automatic on insert. This is called from mysql_prepare_insert().
sql/table.h:
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  Extended a comment to warn about usage of enum timestamp_auto_set_type.

- fixed copyright header and removed obsolete comments about how to
  build the manual using texinfo
- added an "install-data-hook" to install the mysql.info info page.
  This seems to be the only way to install info pages, if they are not
  built from texinfo sources directly.


Docs/Makefile.am:
  - fixed copyright header and removed obsolete comments about how to
    build the manual using texinfo
  - added an "install-data-hook" to install the mysql.info info page.
    This seems to be the only way to install info pages, if they are not
    built from texinfo sources directly.

 - Segfault because of passing a 64-bit pointer to 32 bit integer.
 - Add new include  config_readline.h which will calculate some new defines 
   based on what is found in config.h
 - This file was originally included in readline 4.3 as config.h.in, only the part that
    makes new defines have been moved to this file. 


cmd-line-utils/readline/bind.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/callback.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/complete.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/display.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/funmap.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histexpand.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histfile.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/history.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histsearch.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/input.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/isearch.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/keymaps.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/kill.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/macro.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/mbutil.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/misc.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/nls.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/parens.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/readline.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/rltty.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/search.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/shell.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/signals.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/terminal.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/text.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/tilde.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/undo.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/util.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/vi_mode.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/xmalloc.c:
  Include local config_readline.h instead of config.h

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

  Fix src distributions for benchmark prg

  (it's already in EXTRA_DIST of the toplevel Makefile.am)


Docs/Makefile.am:
  - removed COPYING from txt_files (it's already in EXTRA_DIST of the toplevel
    Makefile.am)

into mysql.com:/home/dlenev/src/mysql-4.1-bg8086

into mysql.com:/home/dlenev/src/mysql-4.1-bg8086

Backported from 5.0.3.


innobase/row/row0ins.c:
  If the SQL-query will update or replace duplicate records we take X-lock
  for duplicate records.
sql/ha_innodb.cc:
  INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should
  take X-lock in this case for duplicate records.

Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.


mysql-test/r/update.result:
  Testcase for BUG#9103
mysql-test/t/update.test:
  Testcase for BUG#9103
sql/opt_range.cc:
  cp_buffer_from_ref now has THD* parameter
sql/sql_select.h:
  cp_buffer_from_ref now has THD* parameter

into mysql.com:/home/psergey/mysql-4.1-bug9439

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


support-files/MacOSX/Makefile.am:
  Auto merged

  already (and that's the Makefile that acutally creates it)

into mysql.com:/home/psergey/mysql-4.1-look-range