bzr commit into mysql-6.0-codebase branch (Serge.Kozlov:3859) Bug#48308

[Serge Kozlov]

#At file:///home/ksm/sun/repo/bug48308/commit-6.0-cbbf/ based on revid:horst.hunger@stripped

 3859 Serge Kozlov	2010-01-31
      Bug#48308.
      The reason of bug is file relay-log.info that points to another relay binlog file.
      For correct behavior of test either the file should not exist or contain proper data.
      Adding option --relay-log-file-info tells server do not use the file with default name.
      modified:
        mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt

=== modified file 'mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt'
--- a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt	2008-03-14 03:35:41 +0000
+++ b/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt	2010-01-31 17:58:54 +0000
@@ -1 +1 @@
---replicate-same-server-id --relay-log=slave-relay-bin --skip-slave-start
+--replicate-same-server-id --relay-log=slave-relay-bin --relay-log-info-file=slave-relay-log.info --skip-slave-start