into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt

into  olga.mysql.com:/home/igor/mysql-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B29157-5.1-opt

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl

Test that we can start a MySQL Server with a default multibyte charset with
NDB running. Test *really* basic functionality too.

Index: ndb-work/mysql-test/r/rpl_ndb_ctype_ucs2_def.result
===================================================================

NDB util thread calls mysql_parse internally with plain old c strings (7bit ascii) to create tables (e.g. mysql.ndb_schema). With mysqld default charset set to a multibyte one (e.g. ucs2) mysql_parse would try to interpret the 7bit string as UCS2 and promptly explode in a heap.

Solution is to set the util thread to be using utf8 charset.

Index: ndb-work/sql/ha_ndbcluster.cc
===================================================================

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_28991

When a UNION statement forced conversion of an UTF8
charset value to a binary charset value, the byte
length of the result values was truncated to the
CHAR_LENGTH of the original UTF8 value.

into  moonbone.local:/mnt/gentoo64/work/29261-bug-5.0-opt-mysql

spaces.

When the my_strnncollsp_simple function compares two strings and one is a prefix
of another then this function compares characters in the rest of longer key
with the space character to find whether the longer key is greater or less.
But the sort order of the collation isn't used in this comparison. This may
lead to a wrong comparison result, wrongly created index or wrong order of the
result set of a query with the ORDER BY clause.

Now the my_strnncollsp_simple function uses collation sort order to compare
the characters in the rest of longer key with the space character.

into  magare.gmz:/home/kgeorge/mysql/autopush/B27333-gcov-5.0-opt

query / no aggregate of subquery
 The optimizer counts the aggregate functions that 
 appear as top level expressions (in all_fields) in 
 the current subquery. Later it makes a list of these
 that it uses to actually execute the aggregates in
 end_send_group().
 That count is used in several places as a flag whether
 there are aggregates functions.
 While collecting the above info it must not consider
 aggregates that are not aggregated in the current 
 context. It must treat them as normal expressions 
 instead. Not doing that leads to incorrect data about
 the query, e.g. running a query that actually has no
 aggregate functions as if it has some (and hence is
 expected to return only one row).
 Fixed by ignoring the aggregates that are not aggregated
 in the current context. 
 One other smaller omission discovered and fixed in the 
 process : the place of aggregation was not calculated for
 user defined functions. Fixed by calling 
 Item_sum::init_sum_func_check() and 
 Item_sum::check_sum_func() as it's done for the rest of 
 the aggregate functions.

into  mysql.com:/home/hf/work/29247/my51-29247

into  mysql.com:/home/hf/work/29247/my50-29247

into  mysql.com:/home/hf/work/29247/my51-29247

into  mysql.com:/home/hf/work/29247/my51-29247

Sometimes the number of really updated rows (with changed
column values) cannot be determined at the server level
alone (e.g. if the storage engine does not return enough
column values to verify that). So the only dependable way
in such cases is to let the storage engine return that
information if possible.
Fixed the bug at server level by providing a way for the 
storage engine to return information about wether it 
actually updated the row or the old and the new column 
values are the same. It can do that by returning 
HA_ERR_RECORD_IS_THE_SAME in ha_update_row().
Note that each storage engine may choose not to try to
return this status code, so this behaviour remains 
storage engine specific.

into  magare.gmz:/home/kgeorge/mysql/autopush/B26564-5.1-opt

what caused some consequitive tests failures

into  magare.gmz:/home/kgeorge/mysql/autopush/B26642-5.0-opt

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-rpl

- wrong results checked in

- enabling test, duplicate bug, other bug fixed

- only log statements locally (changes will not be logged on other servers)

- binlog should always run if opt_bin_log is set

- correct includes

into  mysql.com:/home/hf/work/29156/my51-29156

into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug28677

  
  Thanks to Martin Friebe for finding and submitting a fix for this bug!
  
  A table with maximum number of key segments and maximum length key name
  would have a corrupted .frm file, due to an incorrect calculation of the
  complete key length.  Now the key length is computed correctly (I hope) :-)
  
  MyISAM would reject a table with the maximum number of keys and the maximum
  number of key segments in all keys.  It would allow one less than this total
  maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
  very minor issue.)