diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-12-07 16:55:25 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-12-07 16:55:25 +0000 |
| commit | 16b2ca1f65ed8e3d73e43a3dedcc159f82af90ea (patch) | |
| tree | c847aecc4bf0c752aa3e818af14c46c93f1cf48a /mysql-test | |
| parent | 26ee8f532edc7497a78114e65a261c7fb82531de (diff) | |
| download | mariadb-git-16b2ca1f65ed8e3d73e43a3dedcc159f82af90ea.tar.gz | |
BUG#46166
Post merge fixes for mysql-5.5-bugteam.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_max_extension.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_max_extension.test | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_max_extension.result b/mysql-test/suite/binlog/r/binlog_max_extension.result index af341db4536..f69ffcce16a 100644 --- a/mysql-test/suite/binlog/r/binlog_max_extension.result +++ b/mysql-test/suite/binlog/r/binlog_max_extension.result @@ -3,6 +3,5 @@ call mtr.add_suppression("Log filename extension number exhausted:"); call mtr.add_suppression("Can't generate a unique log-filename"); RESET MASTER; FLUSH LOGS; -Warnings: -Warning 1098 Can't generate a unique log-filename master-bin.(1-999) +ERROR HY000: Can't generate a unique log-filename master-bin.(1-999) diff --git a/mysql-test/suite/binlog/t/binlog_max_extension.test b/mysql-test/suite/binlog/t/binlog_max_extension.test index 4525ce41aed..e5274d87b85 100644 --- a/mysql-test/suite/binlog/t/binlog_max_extension.test +++ b/mysql-test/suite/binlog/t/binlog_max_extension.test @@ -58,7 +58,8 @@ EOF # Assertion ########### -# assertion: should throw warning +# assertion: should raise error +-- error ER_NO_UNIQUE_LOGFILE FLUSH LOGS; ############## |