client/get_password.c:
  Removed dbug.h inclussion (windows build fix)

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


mysql-test/r/subselect.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into mashka.mysql.fi:/home/my/mysql-4.1


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

mysql-test/r/func_gconcat.result:
  Fixed test case after merge
mysql-test/r/grant_cache.result:
  Updated test case (Wrong push by some developer)
mysys/mf_loadpath.c:
  Fix for my_load_path() and ./directory handling from last changeset

acinclude.m4:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

mysql-test/r/merge.result:
  Test of MERGE table patch
mysql-test/t/merge.test:
  Test of MERGE table patch

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

into myvenu.com:/home/venu/work/sql/dev-4.1

  Minor fixups for SQLSTATE values to be compatible with ODBC spec


include/sql_state.h:
  Minor fixups for SQLSTATE values to be compatible with ODBC spec

sql/item_subselect.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

Earlier it could have failed in some special cases.

mysql-test/r/auto_increment.result:
  Update after auto_increment fix
mysql-test/t/auto_increment.test:
  Another fix for LAST_INSERT_ID()
sql/handler.cc:
  Another fix for LAST_INSERT_ID()
sql/sql_class.h:
  Another fix for LAST_INSERT_ID()

Fixed bug in ALTER TABLE ... MODIFY integer-column
Added ref_or_null optimization (needed for subqueries)


BUILD/compile-pentium-valgrind-max:
  Remove FORCE_INIT_OF_VARS to spot wrong LINT_INIT() options
mysql-test/r/distinct.result:
  Update of test results (new optimizer)
mysql-test/r/null_key.result:
  Update after ref_or_null optimization
mysql-test/r/subselect.result:
  Update after ref_or_null optimization
mysql-test/t/null_key.test:
  New tests for ref_or_null optimization
sql/sql_select.cc:
  Added ref_or_null optimization
  Optimized find_best_combinations() and read-functions
sql/sql_select.h:
  Added ref_or_null optimization
sql/sql_yacc.yy:
  Fixed bug in ALTER TABLE ... MODIFY integer-column
sql/table.cc:
  Safety fix for ALTER TABLE .. MODIFY
sql/unireg.cc:
  Safety fix for ALTER TABLE .. MODIFY

sql/item_cmpfunc.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

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

(resolving fields of reduced subselect)


mysql-test/r/subselect.result:
  test of bug #745
mysql-test/t/subselect.test:
  test of bug #745
sql/sql_union.cc:
  to get chance of outer resolved_fields resolve fields of result table as usual fileds

sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

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


sql/sql_select.cc:
  Auto merged

test moved to other bug 

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

sql/item.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged

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


sql/sql_select.cc:
  Auto merged

into teton.kitebird.com:/home/paul/mysql-4.1

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1

Added command 'replace_column' to mysqltest


client/mysqltest.c:
  Added user command replace_column
mysql-test/r/merge.result:
  Update of tests
mysql-test/t/innodb.test:
  User replace_column to make tests repeatable
mysql-test/t/merge.test:
  New tests for testing MERGE tables with multiple databases
scripts/mysql_create_system_tables.sh:
  Fixed syntax error
sql/ha_myisammrg.cc:
  Allow one to use MERGE tables with tables from different databases
sql/mysql_priv.h:
  Added function
sql/sql_parse.cc:
  Allow one to use MERGE tables with tables from different databases
sql/sql_show.cc:
  Extended append_identifier()

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

  A better comment


sql/item.cc:
  A better comment

and comparison was done binary. Now, a binary string wins a character sting 
taking in account their derivation. That means a character field wins a
binary literal and comparison is done according to the character field
collation, not binary.