Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge



mysql-test/r/select.result:
  Change column name in test to get GROUP BY to use the alias
mysql-test/r/type_blob.result:
  Test BLOB and VARCHAR sorting
mysql-test/t/select.test:
  Change column name in test to get GROUP BY to use the alias
  Drop used tables at start of test
  Don't use table names 'a', 'b' or 'c'
mysql-test/t/type_blob.test:
  Test BLOB and VARCHAR sorting
sql/field.cc:
  Store length last in VARBINARY() and BLOB() columns to get shorter strings sorted before longer onces
sql/field.h:
  Added method 'sort_length()' to allow one to have length bytes last for VARBINARY/BLOB to get these to sort properly
sql/filesort.cc:
  Use 'sort_length()' instead of 'pack_length()' to get length of field.
  Store suffix_length last for varbinary (blob) objects.
  The above ensures that BLOB/VARBINARY are correctly sorted (shorter strings before longer ones)
sql/sql_class.h:
  Added sort suffix length (to get varbinary/blob to sort correctly)
sql/sql_select.cc:
  Use sort_length() instead of pack_lengths()
strings/ctype-bin.c:
  Don't let strnxfrm_bin store length last
  Better to do it in MySQL field object to ensure it's done properly for all cases

into  mysql.com:/home/my/mysql-5.0


mysql-test/t/select.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
vio/vio.c:
  Auto merged
mysql-test/r/select.result:
  Merge and change table names a,b,c to t1,t2.t3

into  mysql.com:/home/my/mysql-5.0


sql/item.cc:
  Auto merged

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


mysql-test/t/cast.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

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

sql/handler.cc:
  Indentation fixes
sql/item.cc:
  Remove not needed test of *ref (If ref is set it always points to a valid address)
sql/table.cc:
  Indentation changes
  Moved buff_end directly after 'buff' assignment to make code more clear
sql/unireg.cc:
  Indentation changes

  after merge fix.
range.result:
  fixing result accordingly
  ,
cast.result:
  after merge fix
range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.


mysql-test/t/range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
mysql-test/r/cast.result:
  after merge fix
mysql-test/r/mysqldump-max.result:
  after merge fix.
mysql-test/r/range.result:
  fixing result accordingly
  ,
mysql-test/r/select.result:
  after merge fix.

sql/slave.cc:
  Moved mutex_unlock to handle 'err' case properly
vio/vio.c:
  Made code clearer (fcntl_mode is always 0 here)

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_pthread.h:
  Auto merged
myisam/mi_search.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
netware/pack_isam.def:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/xml.c:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
mysql-test/r/select.result:
  Merged from 4.1.
netware/BUILD/mwenv:
  Merged from 4.1.
scripts/make_binary_distribution.sh:
  Merged from 4.1.
sql/mysqld.cc:
  Merged from 4.1.
sql/sql_show.cc:
  Merged from 4.1.
strings/my_strtoll10.c:
  Merged from 4.1.

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

into  mysql.com:/home/my/mysql-4.0

- No need to check *ref when ref is checked (Simple optimization fix)


sql/item.cc:
  No need to check *ref

- ensure in ndb_mgmd that the stop command is not issued if a node is restarting
- added some new error messages
- in ndbcntr on master check so that node does not shutdown id shutdoen in progress

sql/sql_select.cc:
  Auto merged

mysql-test/r/select.result:
  test result fixed
mysql-test/t/select.test:
  test case added
sql/sql_select.cc:
  do the same for nullable

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp

netware/BUILD/mwenv:
  Removed -O3 for Metrowerks compiler.
netware/pack_isam.def:
  NetWare specific change, Added SCRENNAME for pack_isam.
scripts/make_binary_distribution.sh:
  Netware specific change for creating help tables.
strings/my_strtoll10.c:
  Fix for Metrowerks compiler.

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


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged

  new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.


sql/field.cc:
  Adding true BINARY/VARBINARY.
strings/ctype-big5.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
strings/ctype-cp932.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-czech.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-euc_kr.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-eucjpms.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-extra.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-gb2312.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-gbk.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-latin1.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-simple.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-sjis.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-tis620.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-uca.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-ucs2.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-ujis.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-utf8.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-win1250ch.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
include/m_ctype.h:
  Adding true BINARY/VARBINARY: new pad_char structure member.
mysql-test/t/alter_table.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/binary.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/cast.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/ctype_cp1251.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/ctype_many.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/federated.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/func_in.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/ndb_condition_pushdown.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/ndb_types.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/sp.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/type_blob.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/alter_table.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/binary.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/cast.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/ctype_cp1251.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/ctype_many.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/federated.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/func_in.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/ndb_condition_pushdown.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/ndb_types.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/sp.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/system_mysql_db.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/type_blob.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
scripts/mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
scripts/mysql_fix_privilege_tables.sql:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.

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


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged

into moonbone.local:/work/7672-bug-5.0-mysql

VC++Files/mysql.sln:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged

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

sql/sql_lex.h:
  Auto merged

into  mysql.com:/opt/local/work/mysql-5.0-12736

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


mysql-test/t/kill.test:
  Auto merged

mysql-test/t/cast.test:
  Auto merged
sql/item.h:
  Auto merged

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


sql/item_strfunc.cc:
  Auto merged

Updated more DDL statements to cause implicit commit.


mysql-test/r/rpl_ddl.result:
  updated results to test for implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER
mysql-test/t/rpl_ddl.test:
  updated results to test for implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER
sql/sql_parse.cc:
  added implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER

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

strings/ctype-tis620.c:
  memcpy_overlap() replaced with memmove() during the merge.

into  mysql.com:/opt/local/work/mysql-5.0-12736


sql/sql_select.cc:
  Auto merged

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

The bug was in JOIN::join_free which was wrongly determining that
all joins have been already executed and therefore all used tables
can be closed.


mysql-test/r/subselect_innodb.result:
  - test results fixed (Bug#12736 "Server crash during a select
mysql-test/t/subselect_innodb.test:
  - a test case for Bug#12736 "Server crash during a select": test
  that ha_index_or_rnd_end and mysql_unlock_tables are called
  for all used tables in proper order.
sql/item_subselect.cc:
  - implement subselect_union_engine::is_executed
sql/item_subselect.h:
  - implement Item_subselect::is_evaluated. This function is used
  to check whether we can clean up a non-correlated join of a subquery
  when cleaning up the join of the outer query
sql/sql_lex.h:
  - declare st_select_lex::cleanup_all_joins
sql/sql_select.cc:
  - remove an argument from JOIN::join_free, it's now not used
  - reimplement JOIN::join_free to not unlock tables if there
    is a subquery that has not yet been evaluated. Make sure that the
    new implementation calls ha_index_or_rnd_end for every table in
    the join and inner joins, because all table cursors must be closed
    before mysql_unlock_tables.
sql/sql_select.h:
  - JOIN::join_free signature changed
sql/sql_union.cc:
  - implement a helper method st_select_lex::cleanup_all_joins, which
    recursively walks over a tree of joins and calls cleanup() for
    each join.