Using local.


strings/ctype-extra.c:
  Using local.

into  mysql.com:/usr/home/bar/mysql-5.0


strings/conf_to_src.c:
  Auto merged

  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.


strings/ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
strings/conf_to_src.c:
  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.

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

  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.
ctype-extra.c:
  Additional charsets were generated.


strings/ctype-extra.c:
  Additional charsets were generated.
strings/conf_to_src.c:
  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.

into sunlight.local:/local_work/16281-bug-5.0-mysql


sql/field.h:
  Auto merged

Mutli-table uses temporary table to store new values for fields. With the
new values the rowid of the record to be updated is stored in a Field_string
field. Table to be updated is set as source table of the rowid field.
But when the temporary table creates the tmp field for the rowid field it
converts it to a varstring field because the table to be updated was created by
the v4.1. Due to this the stored rowids were broken and no records for 
update were found.

The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring. The Field_string::type() function 
now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.



sql/field.h:
  Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
  The flag can_alter_field_type is added to Field_string class. When it is set to
  0 the field won't be converted to varstring.
  The Field_string::type() function now always returns MYSQL_TYPE_STRING if 
  can_alter_field_type is set to 0.
sql/sql_update.cc:
  Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
  The multi_update::initialize_tables() function now sets can_alter_field_type
  flag to 0 for the rowid fields denying conversion of the field to a varstring
  field.

The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.


mysql-test/r/view.result:
  Added a test case for bug #18237.
mysql-test/t/view.test:
  Added a test case for bug #18237.

into  mysql.com:/usr/home/bar/mysql-5.0

mysql-test/r/information_schema.result:
  IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
  IS_COMPILED is not determenistic
strings/conf_to_src.c:
  Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
  Recreating sources according to 5.0 XML files using conf_to_src.

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

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

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

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


sql/item.cc:
  Auto merged

netware/BUILD/compile-linux-tools:
  .libs/sql is no longer used when compiling netware

into  mysql.com:/usr/home/bar/mysql-5.0


sql/share/charsets/Index.xml:
  Auto merged
strings/ctype-extra.c:
  SCCS merged

into  mysql.com:/usr/home/bar/mysql-4.1.12076

config/ac-macros/yassl.m4:
  typo
libmysql/Makefile.am:
  move common code to Makefile.shared
libmysql/Makefile.shared:
  move common code to Makefile.shared
libmysql_r/Makefile.am:
  move common code to Makefile.shared

scripts/mysql_install_db.sh:
  Auto merged

  Distribute mysql-test-run.pl


mysql-test/Makefile.am:
  Distribute mysql-test-run.pl

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


scripts/mysql_install_db.sh:
  Auto merged

  Changed web address order.mysql.com to shop.mysql.com


netware/mysql_install_db.c:
  Changed web address order.mysql.com to shop.mysql.com
Docs/MySQLEULA.txt:
  Changed web address order.mysql.com to shop.mysql.com
scripts/mysql_install_db.sh:
  Changed web address order.mysql.com to shop.mysql.com

  Install Perl mysql-test-run into test directory


mysql-test/Makefile.am:
  Install Perl mysql-test-run into test directory

Results changed after the bug fix.

Multiple equalities were not adjusted after reading constant tables.
It resulted in neglecting good index based methods that could be
used to access of other tables.


mysql-test/r/having.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/r/select.result:
  Added a test case for bug #16504.
mysql-test/r/subselect.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/r/varbinary.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/t/select.test:
  Added a test case for bug #16504.
sql/item.cc:
  Fixed bug #16504.
  An Item_equal object may contain only a constant member.
  It may happen after reading constant tables.
sql/item_cmpfunc.cc:
  Fixed bug #16504.
  Added method Item_equal::check_const that check appearance of new 
  constant items in a multiple equality.
sql/item_cmpfunc.h:
  Fixed bug #16504.
  Added method Item_equal::check_const that check appearance of new 
  constant items in a multiple equality.
sql/sql_select.cc:
  Fixed bug #16504.
  Adjusted multiple equalities after reading constant tables.
  Fixed a few typo in comments.

  Let "make install" install mysql-test-run.pl
mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)


support-files/mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
mysql-test/Makefile.am:
  Let "make install" install mysql-test-run.pl

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


README:
  Auto merged

  Typo (bug#17167)


README:
  Typo (bug#17167)

  Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)


config/ac-macros/zlib.m4:
  Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged

  Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)


acinclude.m4:
  Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

into  mysql.com:/home/alexi/innodb/mysql-5.0-merged

  Set MYSQL_SERVER_SUFFIX from build scripts, not hard
  code it into Visual Studio project files, bug#15974


VC++Files/bdb/bdb.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/innobase/innobase.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/libmysqld/libmysqld.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/mysqldemb/mysqldemb.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/mysys/mysys.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/sql/mysqld.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974

  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273


config/ac-macros/yassl.m4:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
libmysql/Makefile.am:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
libmysql_r/Makefile.am:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273

into  mysql.com:/home/alexi/innodb/mysql-5.0-merged