Commit d73b5b68 authored by unknown's avatar unknown
Browse files

Merge dator5.(none):/home/pappa/clean-mysql-5.1 

into  dator5.(none):/home/pappa/bug19281
parents 89fc7fdb a365c9b1

mysql-test/r/partition_list.result

+10 −0
Original line number Diff line number Diff line
@@ -191,3 +191,13 @@ SELECT COUNT(*) FROM t1 WHERE s1 < 3; 
COUNT(*)

2

DROP TABLE t1;

create table t1 (a int auto_increment primary key)

auto_increment=100

partition by list (a)

(partition p0 values in (1, 100));

create index inx on t1 (a);

insert into t1 values (null);

select * from t1;

a

100

drop table t1;

mysql-test/t/partition_innodb.test

+1 −1
Original line number Diff line number Diff line 
-- source include/have_innodb.inc



-- source include/have_partition.inc

SET @max_row = 20;

let $engine= 'InnoDB';

let $MAX_VALUE= (2147483646);

mysql-test/t/partition_list.test

+12 −0
Original line number Diff line number Diff line
@@ -124,3 +124,15 @@ INSERT INTO t1 VALUES (1), (2), (3), (4), (5); 
SELECT COUNT(*) FROM t1 WHERE s1 < 3;

DROP TABLE t1;



#

# Bug 19281 Partitions: Auto-increment value lost

#

create table t1 (a int auto_increment primary key)

auto_increment=100

partition by list (a)

(partition p0 values in (1, 100));

create index inx on t1 (a);

insert into t1 values (null);

select * from t1;

drop table t1;

mysql-test/t/partition_mgm.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_partition.inc

--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings

sql/ha_partition.cc

+1 −0
Original line number Diff line number Diff line
@@ -1565,6 +1565,7 @@ int ha_partition::copy_partitions(ulonglong *copied, ulonglong *deleted) 


void ha_partition::update_create_info(HA_CREATE_INFO *create_info)

{

  m_file[0]->update_create_info(create_info);

  return;

}