mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
post-push fixes for BUG#39934: make mysqldump.test pass even
with binlog_format = MIXED or ROW. mysql-test/r/mysqldump.result: Remove warning from result file. mysql-test/t/mysqldump.test: The test gives a warning if binlog_format=STATEMENT due to BUG#45832. To make the result file not depend on binlog_format, we disable warnings.
This commit is contained in:
parent
8949aaee72
commit
6f8f024aaf
2 changed files with 5 additions and 2 deletions
|
@ -2239,8 +2239,6 @@ create view v1 as
|
|||
select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);
|
||||
create view v2 as
|
||||
select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
|
||||
Warnings:
|
||||
Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Statement: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
|
|
|
@ -875,8 +875,13 @@ select * from t1;
|
|||
create view v1 as
|
||||
select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);
|
||||
|
||||
# Disable warnings since LIMIT warning for unsafe statement if
|
||||
# binlog_format = STATEMENT. Note: after BUG#45832, the warning should
|
||||
# not be issued.
|
||||
--disable_warnings
|
||||
create view v2 as
|
||||
select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
|
||||
--enable_warnings
|
||||
|
||||
--exec $MYSQL_DUMP --skip-comments test
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue