diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-15 14:26:53 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-15 14:26:53 +0300 |
| commit | 0a5b406fc54a16ac266cd6d38953b19af3feed30 (patch) | |
| tree | 50764a5d381794b53bd844836e2ae9c962816860 /mysql-test/suite/rpl_ndb/r | |
| parent | e6e3b4abc3cb1b0b92dc862810d5571b8b20397f (diff) | |
| parent | 0305aea88a220ff9080432a65d50cb30493f3109 (diff) | |
| download | mariadb-git-0a5b406fc54a16ac266cd6d38953b19af3feed30.tar.gz | |
Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_servers.cc
Text conflict in sql/sql_update.cc
Text conflict in support-files/mysql.spec.sh
Diffstat (limited to 'mysql-test/suite/rpl_ndb/r')
| -rw-r--r-- | mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result index ad72a3fb244..7e750f2ce2a 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +CALL mtr.add_suppression('Statement may not be safe to log in statement format.'); DROP FUNCTION IF EXISTS test.f1; DROP TABLE IF EXISTS test.t1; CREATE TABLE test.t1 (a INT NOT NULL AUTO_INCREMENT, c CHAR(16),PRIMARY KEY(a))ENGINE=NDB; |