(Backport of an identical change from 5.0)


support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
  and the one already installed on the system for the "max" build which is also labeled "experimental".
  (Backport of an identical change from 5.0)

scripts/make_binary_distribution.sh:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
isam/isamchk.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Merged from 4.0.

client/mysql.cc:
  Fixed option name.
client/mysqladmin.c:
  Fixed option name.
client/mysqlbinlog.cc:
  Fixed option name.
client/mysqlcheck.c:
  Fixed option name.
client/mysqldump.c:
  Fixed option name.
client/mysqlimport.c:
  Fixed option name.
client/mysqlshow.c:
  Fixed option name.
isam/isamchk.c:
  Fixed option name.
myisam/myisamchk.c:
  Fixed option name.
myisam/myisampack.c:
  Fixed option name.
sql/sql_parse.cc:
  Fix problem with kill connection on NetWare.

into moonbone.local:/work/15028-bug-4.1-mysql

ndb/src/kernel/blocks/backup/Backup.cpp:
  If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
  all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
  error in FSAPPENDCONF is hit.
  
  This would mean that no error code was set for the backup and that it would
  be incomplete as not all IO had been written to disk before the node crash.
  This would not be reported to the user.
  
  So the backup would appear to succeed but it really didn't.
  
  The window for this is rather small though.
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)

depending on table order

multi_update::send_data() was counting updates, not updated rows. Thus if one 
record have several updates it will be counted several times in 'rows matched'
but updated only once.

multi_update::send_data() now counts only unique rows.


sql/sql_update.cc:
  Fix bug#15028  Multitable update returns different numbers of matched rows
  depending on table order
  multi_update::send_data() now counts only unique rows.
mysql-test/t/update.test:
  Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
mysql-test/r/update.result:
  Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order

to be in the query cache. (BUG#14652)


mysql-test/r/query_cache.result:
  BUG#14652 test suite.
mysql-test/t/query_cache.test:
  BUG#14652 test suite.
sql/sql_cache.cc:
  We should skip beggining '(' characters when test query on possibility
  to be in the query cache.

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item.cc:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

into mysql.com:/home/gluh/MySQL/Merge/4.1

  added SSL_library_init()

into  mysql.com:/usr/home/bar/mysql-4.1.b10446


sql/item.cc:
  Auto merged

into  mysql.com:/usr/local/mysql/mysql-4.1

sql/log_event.cc:
  Add missing cast needed for Win32 compilation.
include/config-win.h:
  Win32 compile fix: quote multi-line macros with do { ... } while(0) to follow earlier changes in my_global.h.

into  mysql.com:/usr/home/bar/mysql-4.1.b14406

into  mysql.com:/usr/home/bar/mysql-4.1.b14406

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

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

CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.


mysql-test/r/ps.result:
  Test results has been fixed (Bug#14410)
mysql-test/t/ps.test:
  A test case for Bug#14410 "Crash in Enum or Set type in CREATE 
  TABLE and PS/SP"
sql/mysql_priv.h:
  typelib() function declaration has been changed.
sql/sql_table.cc:
  Supply the statement memory root to use in typelib() and
  safe_charset_converter() functions to ensure that objects 
  created during the first execution of CREATE TABLE statement
  are allocated in persistent memory of the statement.
sql/table.cc:
  Change typelib() function to require MEM_ROOT.

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

into moonbone.local:/work/14482-bug-4.1-mysql

crash

resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.

resolve_const_item() now substitutes constants for items with 
result_type == ROW_RESULT only for Item_rows.


sql/item.cc:
  Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
  crash
  
  resolve_const_item() now applies optimization for items with
  result_type == ROW_RESULT only to Item_rows.
mysql-test/t/select.test:
  Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
mysql-test/r/select.result:
  Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash

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


sql/ha_ndbcluster.cc:
  Auto merged

into mysql.com:/M41/mysql-4.1

Fix a possible problem on RPM un-install. bug#15145


support-files/mysql.spec.sh:
  Extend the file existence check for "init.d/mysql" on un-install
  to also guard the call to "insserv"/"chkconfig".
  bug#15145, br#5369 / 5586, csc#7129

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


sql/mysql_priv.h:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

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

item_strfunc.h, item_strfunc.cc, item.cc:
  Try to convert a const item into destination 
  character set. If conversion happens without
  data loss, then cache the converted value
  and return it during val_str().
  Otherwise, if conversion loses data, return
  Illeral mix of collations error, as it happened
  previously.
ctype_recoding.result, ctype_recoding.test:
  Fixing tests accordingly.


sql/item.cc:
  Bug#10446 Illegal mix of collations
  Try to convert a const item into destination 
  character set. If conversion happens without
  data loss, then cache the converted value
  and return it during val_str().
  Otherwise, if conversion loses data, return
  Illeral mix of collations error, as it happened
  previously.
sql/item_strfunc.cc:
  Return cached value when it's possible.
mysql-test/t/ctype_recoding.test:
  Fixing tests accordingly.
mysql-test/r/ctype_recoding.result:
  Fixing tests accordingly.

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged

 - Backport from 5.0


include/my_base.h:
  Rename HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE, ie. it's a bit in the table_options variable
mysql-test/r/ndb_basic.result:
  Add test result
mysql-test/t/ndb_basic.test:
  Add test case for bug14514
sql/ha_ndbcluster.cc:
  Use new bitmask for table_options to detect if create from engine
sql/handler.cc:
  Use new bit for create from engine

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