From: Ashish Agarwal
Date: November 23 2012 8:16am
Subject: bzr push into mysql-trunk branch (ashish.y.agarwal:5068 to 5069) Bug#14588148
List-Archive: http://lists.mysql.com/commits/145377
X-Bug: 14588148
Message-Id: <201211230816.qAN8GAWl020558@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5069 Ashish Agarwal	2012-11-23 [merge]
      BUG#14588148: Merge from mysql-5.6 to mysql-trunk

    modified:
      mysql-test/r/wl6443_deprecation.result
      mysql-test/t/wl6443_deprecation.test
 5068 magnus.blaudd@stripped	2012-11-22 [merge]
      Merge

    removed:
      mysql-test/suite/ndb/include/have_junit.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-slave.opt
    added:
      mysql-test/suite/ndb/r/ndb_bushy_joins.result
      mysql-test/suite/ndb/t/ndb_bushy_joins.cnf
      mysql-test/suite/ndb/t/ndb_bushy_joins.test
      mysql-test/suite/ndb_rpl/r/ndb_dist_priv_common.result
      mysql-test/suite/ndb_rpl/t/ndb_dist_priv_check.inc
      mysql-test/suite/ndb_rpl/t/ndb_dist_priv_common.inc
      mysql-test/suite/ndb_rpl/t/ndb_dist_priv_default-master.opt
      mysql-test/suite/ndb_rpl/t/ndb_dist_priv_default.test
      mysql-test/suite/ndb_rpl/t/ndb_dist_priv_ndb-master.opt
      mysql-test/suite/ndb_rpl/t/ndb_dist_priv_ndb.test
    modified:
      mysql-test/extra/rpl_tests/rpl_extra_col_master.test
      mysql-test/lib/My/Exec.pm
      mysql-test/suite/ndb/include/have_java.inc
      mysql-test/suite/ndb/include/run_java.inc
      mysql-test/suite/ndb/my.cnf
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_dist_priv.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result
      mysql-test/suite/ndb/r/ndb_join_pushdown_none.result
      mysql-test/suite/ndb/t/clusterj.test
      mysql-test/suite/ndb/t/clusterj_jpa.test
      mysql-test/suite/ndb/t/ndb_backup_rate.cnf
      mysql-test/suite/ndb/t/ndb_dist_priv.test
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      mysql-test/suite/ndb_binlog/t/ndb_binlog_format.test
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dist_priv.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_dist_priv.test
      mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
      mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result
      mysql-test/suite/rpl_ndb/t/disabled.def
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_glue.h
      sql/ha_ndbcluster_push.cc
      sql/ndb_dist_priv_util.h
      storage/ndb/CMakeLists.txt
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
      storage/ndb/cmake/os/Windows.cmake
      storage/ndb/compile-cluster
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/include/kernel/signaldata/LCP.hpp
      storage/ndb/include/mgmapi/mgmapi.h
      storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
      storage/ndb/memcache/include/int3korr.h
      storage/ndb/src/common/debugger/signaldata/LCP.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/vm/LockQueue.cpp
      storage/ndb/src/kernel/vm/LockQueue.hpp
      storage/ndb/src/mgmsrv/testConfig.cpp
      storage/ndb/src/ndbapi/DictCache.hpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
      storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/include/NDBT_Test.hpp
      storage/ndb/test/ndbapi/testInterpreter.cpp
      storage/ndb/test/ndbapi/testMgm.cpp
      storage/ndb/test/src/NDBT_Test.cpp
      storage/ndb/tools/ndb_dist_priv.sql
=== modified file 'mysql-test/r/wl6443_deprecation.result'
--- a/mysql-test/r/wl6443_deprecation.result	2012-09-27 10:48:50 +0000
+++ b/mysql-test/r/wl6443_deprecation.result	2012-11-23 08:14:26 +0000
@@ -1,3 +1,4 @@
+CALL mtr.add_suppression("Dictionary file not specified");
 #
 # Tests for deprecation warnings introduced by wl#6443
 #

=== modified file 'mysql-test/t/wl6443_deprecation.test'
--- a/mysql-test/t/wl6443_deprecation.test	2012-09-27 10:48:50 +0000
+++ b/mysql-test/t/wl6443_deprecation.test	2012-11-23 08:14:26 +0000
@@ -1,6 +1,9 @@
 --source include/not_embedded.inc
 --source include/have_validate_password_plugin.inc
 
+# Warning is generated when default file (NULL) is used
+CALL mtr.add_suppression("Dictionary file not specified");
+
 --echo #
 --echo # Tests for deprecation warnings introduced by wl#6443
 --echo #

No bundle (reason: useless for push emails).