Commit 0129f32b authored by unknown's avatar unknown
Browse files

Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves 

differently when converting column to auto_increment in 4.1" with
current tree.


mysql-test/t/type_timestamp.test:
  Auto merged
mysql-test/r/type_timestamp.result:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
parents 5b3444d2 34789efd

mysql-test/r/auto_increment.result

+52 −0
Original line number Diff line number Diff line
@@ -289,3 +289,55 @@ a b 
0	13

500	14

drop table t1;

create table t1 (a bigint);

insert into t1 values (1), (2), (3), (NULL), (NULL);

alter table t1 modify a bigint not null auto_increment primary key;

select * from t1;

a

1

2

3

4

5

drop table t1;

create table t1 (a bigint);

insert into t1 values (1), (2), (3), (0), (0);

alter table t1 modify a bigint not null auto_increment primary key;

select * from t1;

a

1

2

3

4

5

drop table t1;

create table t1 (a bigint);

insert into t1 values (0), (1), (2), (3);

set sql_mode=NO_AUTO_VALUE_ON_ZERO;

alter table t1 modify a bigint not null auto_increment primary key;

set sql_mode= '';

select * from t1;

a

0

1

2

3

drop table t1;

create table t1 (a int auto_increment primary key , b int null);

set sql_mode=NO_AUTO_VALUE_ON_ZERO;

insert into t1 values (0,1),(1,2),(2,3);

select * from t1;

a	b

0	1

1	2

2	3

set sql_mode= '';

alter table t1 modify b varchar(255);

insert into t1 values (0,4);

select * from t1;

a	b

0	1

1	2

2	3

3	4

drop table t1;

mysql-test/r/type_timestamp.result

+7 −10
Original line number Diff line number Diff line
@@ -405,17 +405,14 @@ a b 
NULL	NULL

NULL	2003-01-01 00:00:00

drop table t1;

create table t1 (ts timestamp(19));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `ts` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP

) ENGINE=MyISAM DEFAULT CHARSET=latin1

set TIMESTAMP=1000000000;

insert into t1 values ();

create table t1 (a bigint, b bigint);

insert into t1 values (NULL, NULL), (20030101000000, 20030102000000);

set timestamp=1000000019;

alter table t1 modify a timestamp, modify b timestamp;

select * from t1;

ts

2001-09-09 04:46:40

a	b

2001-09-09 04:46:59	2001-09-09 04:46:59

2003-01-01 00:00:00	2003-01-02 00:00:00

drop table t1;

create table t1 (a char(2), t timestamp);

insert into t1 values ('a', '2004-01-01 00:00:00'), ('a', '2004-01-01 01:00:00'),

mysql-test/t/auto_increment.test

+38 −0
Original line number Diff line number Diff line
@@ -168,3 +168,41 @@ update t1 set a=NULL where b=13; 
update t1 set a=500 where b=14;

select * from t1 order by b;

drop table t1;



#

# Test of behavior of ALTER TABLE when coulmn containing NULL or zeroes is

# converted to AUTO_INCREMENT column

#

create table t1 (a bigint);

insert into t1 values (1), (2), (3), (NULL), (NULL);

alter table t1 modify a bigint not null auto_increment primary key; 

select * from t1;

drop table t1;



create table t1 (a bigint);

insert into t1 values (1), (2), (3), (0), (0);

alter table t1 modify a bigint not null auto_increment primary key; 

select * from t1;

drop table t1;



# We still should be able to preserve zero in NO_AUTO_VALUE_ON_ZERO mode

create table t1 (a bigint);

insert into t1 values (0), (1), (2), (3);

set sql_mode=NO_AUTO_VALUE_ON_ZERO;

alter table t1 modify a bigint not null auto_increment primary key; 

set sql_mode= '';

select * from t1;

drop table t1;



# It also sensible to preserve zeroes if we are converting auto_increment

# column to auto_increment column (or not touching it at all, which is more

# common case probably)

create table t1 (a int auto_increment primary key , b int null);

set sql_mode=NO_AUTO_VALUE_ON_ZERO;

insert into t1 values (0,1),(1,2),(2,3);

select * from t1;

set sql_mode= '';

alter table t1 modify b varchar(255);

insert into t1 values (0,4);

select * from t1;

drop table t1;

mysql-test/t/type_timestamp.test

+6 −6
Original line number Diff line number Diff line
@@ -267,13 +267,13 @@ select * from t1; 
drop table t1;



#

# Test for bug #4491, TIMESTAMP(19) should be possible to create and not

# only read in 4.0

# Let us test behavior of ALTER TABLE when it converts columns 

# containing NULL to TIMESTAMP columns.

#

create table t1 (ts timestamp(19));

show create table t1;

set TIMESTAMP=1000000000;

insert into t1 values ();

create table t1 (a bigint, b bigint);

insert into t1 values (NULL, NULL), (20030101000000, 20030102000000);

set timestamp=1000000019;

alter table t1 modify a timestamp, modify b timestamp;

select * from t1;

drop table t1;

sql/field_conv.cc

+16 −9
Original line number Diff line number Diff line
@@ -252,7 +252,8 @@ static void do_copy_timestamp(Copy_field *copy) 
{

  if (*copy->from_null_ptr & copy->from_bit)

  {

    ((Field_timestamp*) copy->to_field)->set_time();// Same as set_field_to_null

    /* Same as in set_field_to_null_with_conversions() */

    ((Field_timestamp*) copy->to_field)->set_time();

  }

  else

    (copy->do_copy2)(copy);
@@ -262,7 +263,11 @@ static void do_copy_timestamp(Copy_field *copy) 
static void do_copy_next_number(Copy_field *copy)

{

  if (*copy->from_null_ptr & copy->from_bit)

    copy->to_field->reset();			// Same as set_field_to_null

  {

    /* Same as in set_field_to_null_with_conversions() */

    copy->to_field->table->auto_increment_field_not_null= FALSE;

    copy->to_field->reset();

  }

  else

    (copy->do_copy2)(copy);

}
@@ -437,17 +442,19 @@ void Copy_field::set(Field *to,Field *from,bool save) 
      }

    }

    else

      do_copy=do_copy_not_null;

  }

  else if (to_field->real_maybe_null())

    {

    to_null_ptr=	to->null_ptr;

    to_bit=		to->null_bit;

      if (to_field->type() == FIELD_TYPE_TIMESTAMP)

        do_copy= do_copy_timestamp;               // Automatic timestamp

      else if (to_field == to_field->table->next_number_field)

        do_copy= do_copy_next_number;

      else

        do_copy= do_copy_not_null;

    }

  }

  else if (to_field->real_maybe_null())

  {

    to_null_ptr=	to->null_ptr;

    to_bit=		to->null_bit;

    do_copy= do_copy_maybe_null;

  }

  else