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

sql/sql_union.cc:
  fixed layout

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


sql/sql_union.cc:
  Auto merged

It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.


mysql-test/r/date_formats.result:
  result update
mysql-test/t/date_formats.test:
  a test for BUG#1960 "date_format() returns spurious '-' for valid dates"
sql/field.cc:
  When preparing ltime from the 3-byte date, don't forget to set ltime->neg to 0
  (otherwise it remains unitialized).
  Dates are not allowed to be negative (only times can be, when they mean a time interval),
  so it's ok to always set neg to 0.

   (declarations should be on top of a block)


tests/client_test.c:
   - fixed compile error (declarations should be on top of a block)

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


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

WL#1284 (warnings about --skip-name-resolve)
Messages corrected


sql/share/czech/errmsg.txt:
  Message corrected
sql/share/danish/errmsg.txt:
  Message corrected
sql/share/dutch/errmsg.txt:
  Message corrected
sql/share/english/errmsg.txt:
  Message corrected
sql/share/estonian/errmsg.txt:
  Message corrected
sql/share/french/errmsg.txt:
  Message corrected
sql/share/german/errmsg.txt:
  Message corrected
sql/share/greek/errmsg.txt:
  Message corrected
sql/share/hungarian/errmsg.txt:
  Message corrected
sql/share/italian/errmsg.txt:
  Message corrected
sql/share/japanese/errmsg.txt:
  Message corrected
sql/share/korean/errmsg.txt:
  Message corrected
sql/share/norwegian-ny/errmsg.txt:
  Message corrected
sql/share/norwegian/errmsg.txt:
  Message corrected
sql/share/polish/errmsg.txt:
  Message corrected
sql/share/portuguese/errmsg.txt:
  Message corrected
sql/share/romanian/errmsg.txt:
  Message corrected
sql/share/russian/errmsg.txt:
  Message corrected
sql/share/serbian/errmsg.txt:
  Message corrected
sql/share/slovak/errmsg.txt:
  Message corrected
sql/share/spanish/errmsg.txt:
  Message corrected
sql/share/swedish/errmsg.txt:
  Message corrected
sql/share/ukrainian/errmsg.txt:
  Message corrected
sql/sql_acl.cc:
  Messages corrected

  Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).
my_sys.h:
  Removed FLUSH_REMOVE flag.


include/my_sys.h:
  Removed FLUSH_REMOVE flag.
myisam/mi_keycache.c:
  Removed FLUSH_REMOVE flag (replaced it by FLUSH_RELEASE).

  Fixed typo that caused blocking key cache usage after resize.
  Removed wrong re-initialization of resize queue in init_key_cache.


mysys/mf_keycache.c:
  Fixed typo that caused blocking key cache usage after resize.
  Removed wrong re-initialization of resize queue in init_key_cache.

  Fixed a bug: missing semicolon.


sql/sql_union.cc:
  Fixed a bug: missing semicolon.

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

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

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


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

temporary table BLOB now is longblob


mysql-test/r/create.result:
  blob size changed for safety
mysql-test/r/type_blob.result:
  blob size changed for safety
mysql-test/r/type_ranges.result:
  blob size changed for safety
mysql-test/r/union.result:
  blob size changed for safety
  new tests of UNION types merging
mysql-test/t/union.test:
  new tests of UNION types merging
sql/field.h:
  blob size changed for safety
sql/item.cc:
  processing of collation added
  added comment
sql/item.h:
  joining of UNION fields may failed now, because of incompatibility of collations
sql/sql_union.cc:
  joining of UNION fields may failed now, because of incompatibility of collations

  Added resize key cache test.


tests/fork_big2.pl:
  Added resize key cache test.

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

  ibbackup --apply-log must be able to rename a table based only on the space id


innobase/fil/fil0fil.c:
  ibbackup --apply-log must be able to rename a table based only on the space id
innobase/include/fil0fil.h:
  ibbackup --apply-log must be able to rename a table based only on the space id

into mysql.com:/home/kostja/mysql/mysql-4.1-root

Makefile.am:
  spurious space (from a bad merge) deleted
mysql-test/r/rpl_change_master.result:
  test results updated

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

  Fix for the resize key cache operation.


include/keycache.h:
  Fix for the resize key cache operation.
mysys/mf_keycache.c:
  Fix for the resize key cache operation.

  Changes needed for ibbackup directory scanning fault tolerance


innobase/os/os0file.c:
  Changes needed for ibbackup directory scanning fault tolerance
innobase/include/os0file.h:
  Changes needed for ibbackup directory scanning fault tolerance

Docs/Makefile.am:
  Auto merged

Docs/Makefile.am:
  Auto merged

Docs/Makefile.am:
   - Removed COPYING.LIB from txt_files target

Docs/Makefile.am:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/rpl_change_master.result:
  merged - ul

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

   after it was removed from manual.texi (where it was automatically
   generated from).


Docs/Makefile.am:
   - don't create COPYING.LIB anymore (was removed from manual.texi)
Makefile.am:
   - Removed COPYING.LIB from the source distribution
scripts/make_binary_distribution.sh:
   - Removed COPYING.LIB from the binary distribution
scripts/make_win_src_distribution.sh:
   - Removed COPYING.LIB from the windows source distribution
support-files/mysql.spec.sh:
   - Removed COPYING.LIB from the Server RPM

It can appear as a result of manual modifications with INSERT/UPDATE/DELETE

This script converts privilege table to the state that could be created
with GRANT commands only (with the exception of the short password)

This is necessary for 5.0

"You can always mysql_real_query a query with placeholders 
after mysql_prepare()"


sql/sql_class.cc:
  prepare_command removed
sql/sql_class.h:
  prepare_command removed
sql/sql_prepare.cc:
  prepare_command removed
sql/sql_yacc.yy:
  prepare_command removed
tests/client_test.c:
  added test for bug #1946: "You can always
  mysql_real_query a query with placeholders after mysql_prepare()"

libexec support in install_test_db
--start-from in mysql-test-run


mysql-test/install_test_db.sh:
  libexec support in install_test_db
mysql-test/mysql-test-run.sh:
  --start-from in mysql-test-run

  Marko's patch: check the position of some system table columns already at C compile time


innobase/dict/dict0boot.c:
  Marko's patch: check the position of some system table columns already at C compile time

   confuses RPM's Perl module dependency checking (it adds a bogus
   requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)


scripts/mysqlaccess.sh:
   - Rephrased option help text so it does not start with "use" as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
sql-bench/bench-init.pl.sh:
   - Rephrased option help text so it does not start with "use" as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)

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