into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new


BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
  Auto merged
mysql-test/r/user_var-binlog.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/rpl_stm_charset.result:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/rpl_timezone.result:
  manual merge use local. Result file has to be refined according to changes brought in
  to the test.