Commit 80006c68 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217 

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


client/mysql.cc:
  manual merge use local
mysql-test/r/mysqlbinlog.result:
  manual merge use local
mysql-test/t/mysqlbinlog.test:
  manual merge use local
sql/log_event.cc:
  manual merge use local
parents 8292e1e6 3cebcd15

There are no changes