unknown 89257c9171 Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge ...

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new


mysql-test/r/binlog_stm_drop_tmp_tbl.result:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_stm_until.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/rpl_stm_until.result:
  Manual merge
mysql-test/t/rpl_temporary.test:
  Manual merge
sql/sql_base.cc:
  Manual merge

2006-05-18 18:38:50 +02:00

2.7 KiB

Raw Blame History

View Raw