BUG #14524

Post-review fixes to original changeset http://lists.mysql.com/internals/32422

BUILD/SETUP.sh

@@ -57,7 +57,7 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
 c_warnings="$global_warnings -Wunused"
 cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
 base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"
-base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY"
+base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"
 max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY"
 max_configs="$base_max_configs --with-embedded-server"
 max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"

mysql-test/r/partition.result

@@ -108,11 +108,9 @@ insert into t1 values (3);
 insert into t1 values (4);
 UNLOCK TABLES;
 drop table t1;
-DROP TABLE IF EXISTS `t1`;
-Warnings:
-Note	1051	Unknown table 't1'
 CREATE TABLE `t1` (
 `id` int(11) default NULL
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 PARTITION BY HASH (id) ;
 SELECT * FROM t1;
 id
+drop table t1;

mysql-test/t/partition.test

@@ -165,10 +165,10 @@ drop table t1;
 #
 # BUG 14524
 #
---disable-warnings
-DROP TABLE IF EXISTS `t1`;
---enable-warnings
 CREATE TABLE `t1` (
   `id` int(11) default NULL
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 PARTITION BY HASH (id) ;
 SELECT * FROM t1;
+
+drop table t1;
+

sql/ha_partition.cc

@@ -1103,10 +1103,7 @@ int ha_partition::start_stmt(THD *thd, thr_lock_type lock_type)
 uint ha_partition::lock_count() const
 {
   DBUG_ENTER("ha_partition::lock_count");
-  if (m_no_locks == 0)
-    DBUG_RETURN(0);
-
-  DBUG_RETURN(m_tot_parts);
+  DBUG_RETURN(m_no_locks);
 }