diff options
author | Luis Soares <luis.soares@oracle.com> | 2010-12-17 01:29:53 +0000 |
---|---|---|
committer | Luis Soares <luis.soares@oracle.com> | 2010-12-17 01:29:53 +0000 |
commit | 246b4be056d9e276f9bc5198da64aba2f0d323b8 (patch) | |
tree | 05f39946e5563553c44625023f6e9823cd79b244 /mysql-test/suite/binlog | |
parent | b4fe0e0cb3cd9bb1c67c3cde90c11cd455e914eb (diff) | |
parent | 4c0c5525825714ccd91c3c07e303c068bcc12ce5 (diff) | |
download | mariadb-git-246b4be056d9e276f9bc5198da64aba2f0d323b8.tar.gz |
BUG#46166
Automerge from mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test/suite/binlog')
-rw-r--r-- | mysql-test/suite/binlog/r/binlog_index.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/binlog/t/binlog_index.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result index 6b422b82191..11cf43b8a5e 100644 --- a/mysql-test/suite/binlog/r/binlog_index.result +++ b/mysql-test/suite/binlog/r/binlog_index.result @@ -132,7 +132,7 @@ master-bin.000011 # fault_injection_registering_index SET SESSION debug="+d,fault_injection_registering_index"; flush logs; -ERROR HY000: Can't open file: './master-bin.000012' (errno: 1) +ERROR HY000: Can't open file: 'master-bin.000012' (errno: 1) SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index @@ -157,7 +157,7 @@ master-bin.000012 # fault_injection_updating_index SET SESSION debug="+d,fault_injection_updating_index"; flush logs; -ERROR HY000: Can't open file: './master-bin.000013' (errno: 1) +ERROR HY000: Can't open file: 'master-bin.000013' (errno: 1) SET @index=LOAD_FILE('MYSQLTEST_VARDIR/mysqld.1/data//master-bin.index'); SELECT @index; @index diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test index d2b34083182..b735574fdb9 100644 --- a/mysql-test/suite/binlog/t/binlog_index.test +++ b/mysql-test/suite/binlog/t/binlog_index.test @@ -218,6 +218,7 @@ SELECT @index; --echo # fault_injection_registering_index SET SESSION debug="+d,fault_injection_registering_index"; +-- replace_regex /\.[\\\/]master/master/ -- error ER_CANT_OPEN_FILE flush logs; @@ -237,6 +238,7 @@ SELECT @index; --echo # fault_injection_updating_index SET SESSION debug="+d,fault_injection_updating_index"; +-- replace_regex /\.[\\\/]master/master/ -- error ER_CANT_OPEN_FILE flush logs; |