Commit 36dd2cf6 authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new


sql/lock.cc:
  Auto merged
parents 64a81f01 53319497

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

+6 −0
Original line number Diff line number Diff line
@@ -108,3 +108,9 @@ insert into t1 values (3); 
insert into t1 values (4);

UNLOCK TABLES;

drop 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

+10 −0
Original line number Diff line number Diff line
@@ -162,3 +162,13 @@ UNLOCK TABLES; 


drop table t1;



#

# BUG 14524

#

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

+8 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



/*

  This handler was developed by Mikael Ronström for version 5.1 of MySQL.

  This handler was developed by Mikael Ronstrom for version 5.1 of MySQL.

  It is an abstraction layer on top of other handlers such as MyISAM,

  InnoDB, Federated, Berkeley DB and so forth. Partitioned tables can also

  be handled by a storage engine. The current example of this is NDB
@@ -167,6 +167,10 @@ void ha_partition::init_handler_variables() 
  m_last_part= 0;

  m_rec0= 0;

  m_curr_key_info= 0;

  /*

    this allows blackhole to work properly

  */

  m_no_locks= 0;



#ifdef DONT_HAVE_TO_BE_INITALIZED

  m_start_key.flag= 0;
@@ -912,6 +916,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked) 
    if ((error= (*file)->ha_open((const char*) name_buff, mode,

                                 test_if_locked)))

      goto err_handler;

    m_no_locks+= (*file)->lock_count();

    name_buffer_ptr+= strlen(name_buffer_ptr) + 1;

    set_if_bigger(ref_length, ((*file)->ref_length));

  } while (*(++file));
@@ -1098,7 +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");

  DBUG_RETURN(m_tot_parts);

  DBUG_RETURN(m_no_locks);

}
@@ -1143,7 +1148,7 @@ void ha_partition::unlock_row() 
  ADDITIONAL INFO:



  Most handlers set timestamp when calling write row if any such fields

  exists. Since we are calling an underlying handler we assume the´

  exists. Since we are calling an underlying handler we assume the

  underlying handler will assume this responsibility.



  Underlying handlers will also call update_auto_increment to calculate

sql/ha_partition.h

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ class ha_partition :public handler 
  u_long m_low_byte_first;



  uint m_tot_parts;                      // Total number of partitions;

  uint m_no_locks;                        // For engines like ha_blackhole, which needs no locks

  uint m_last_part;                      // Last file that we update,write

  int m_lock_type;                       // Remembers type of last

                                         // external_lock