bk commit into 5.1 tree (patg:1.1961) BUG#14524

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1961 05/11/21 15:21:04 patg@stripped +4 -0
  BUG #14524
  
  Post-review fixes to original changeset http://lists.mysql.com/internals/32422

  sql/ha_partition.cc
    1.10 05/11/21 15:20:54 patg@stripped +1 -4
    BUG# 14524
    
    Post review modifications to code - removed if, just pass m_no_locks 

  mysql-test/t/partition.test
    1.7 05/11/21 15:20:54 patg@stripped +3 -3
    BUG #14524
    
    Post review mods to test

  mysql-test/r/partition.result
    1.7 05/11/21 15:20:54 patg@stripped +1 -3
    BUG #14524 
    
    Post review mods to test results

  BUILD/SETUP.sh
    1.49 05/11/21 15:20:54 patg@stripped +1 -1
    BUG #14524
    
    Added flags to no-ndb build script to include archive.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	patg
# Host:	krsna.patg.net
# Root:	/home/patg/mysql-build/mysql-5.1-new

--- 1.6/mysql-test/r/partition.result	2005-11-18 17:01:29 -08:00
+++ 1.7/mysql-test/r/partition.result	2005-11-21 15:20:54 -08:00
@@ -108,11 +108,9 @@
 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;

--- 1.6/mysql-test/t/partition.test	2005-11-18 17:01:29 -08:00
+++ 1.7/mysql-test/t/partition.test	2005-11-21 15:20:54 -08:00
@@ -165,10 +165,10 @@
 #
 # 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;
+

--- 1.9/sql/ha_partition.cc	2005-11-18 17:01:29 -08:00
+++ 1.10/sql/ha_partition.cc	2005-11-21 15:20:54 -08:00
@@ -1103,10 +1103,7 @@
 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);
 }
 
 

--- 1.48/BUILD/SETUP.sh	2005-11-04 15:32:50 -08:00
+++ 1.49/BUILD/SETUP.sh	2005-11-21 15:20:54 -08:00
@@ -57,7 +57,7 @@
 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"