database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

no_auto_value_on_zero + alter table bug

Browse Source
This commit is contained in:
serg@serg.mylan
2004-07-30 14:17:12 +02:00
parent 97238e18bc
commit c5e2fbcc53
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/r/auto_increment.result
View File

@@ -206,18 +206,25 @@ select * from t1 order by b;
a b a b
1 1 1 1
200 2 200 2
205 3 0 3
201 4 201 4
202 5 202 5
203 6 203 6
204 7 204 7
create table t2 (a int);
insert t2 values (1),(2);
alter table t2 add b int auto_increment primary key;
select * from t2;
a b
1 1
2 2
drop table t2;
delete from t1 where a=0; delete from t1 where a=0;
update t1 set a=0 where b=5; update t1 set a=0 where b=5;
select * from t1 order by b; select * from t1 order by b;
a b a b
1 1 1 1
200 2 200 2
205 3
201 4 201 4
0 5 0 5
203 6 203 6
@@ -225,7 +232,7 @@ a b
delete from t1 where a=0; delete from t1 where a=0;
update t1 set a=NULL where b=6; update t1 set a=NULL where b=6;
Warnings: Warnings:
Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 5 Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 4
update t1 set a=300 where b=7; update t1 set a=300 where b=7;
SET SQL_MODE=''; SET SQL_MODE='';
insert into t1(a,b)values(NULL,8); insert into t1(a,b)values(NULL,8);
@@ -239,7 +246,6 @@ select * from t1 order by b;
a b a b
1 1 1 1
200 2 200 2
205 3
201 4 201 4
0 6 0 6
300 7 300 7
@@ -256,7 +262,6 @@ select * from t1 order by b;
a b a b
1 1 1 1
200 2 200 2
205 3
201 4 201 4
300 7 300 7
301 8 301 8
@@ -269,13 +274,12 @@ a b
delete from t1 where a=0; delete from t1 where a=0;
update t1 set a=NULL where b=13; update t1 set a=NULL where b=13;
Warnings: Warnings:
Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 10 Warning 1263 Data truncated; NULL supplied to NOT NULL column 'a' at row 9
update t1 set a=500 where b=14; update t1 set a=500 where b=14;
select * from t1 order by b; select * from t1 order by b;
a b a b
1 1 1 1
200 2 200 2
205 3
201 4 201 4
300 7 300 7
301 8 301 8

5
mysql-test/t/auto_increment.test
View File

@@ -140,6 +140,11 @@ insert into t1(b)values(7);
select * from t1 order by b; select * from t1 order by b;
alter table t1 modify b mediumint; alter table t1 modify b mediumint;
select * from t1 order by b; select * from t1 order by b;
create table t2 (a int);
insert t2 values (1),(2);
alter table t2 add b int auto_increment primary key;
select * from t2;
drop table t2;
delete from t1 where a=0; delete from t1 where a=0;
update t1 set a=0 where b=5; update t1 set a=0 where b=5;
select * from t1 order by b; select * from t1 order by b;

17
sql/sql_table.cc
View File

@@ -3271,13 +3271,12 @@ copy_data_between_tables(TABLE *from,TABLE *to,
ha_rows *deleted) ha_rows *deleted)
{ {
int error; int error;
Copy_field *copy,*copy_end; Copy_field *copy,*copy_end, *next_field;
ulong found_count,delete_count; ulong found_count,delete_count;
THD *thd= current_thd; THD *thd= current_thd;
uint length; uint length;
SORT_FIELD *sortorder; SORT_FIELD *sortorder;
READ_RECORD info; READ_RECORD info;
Field *next_field;
TABLE_LIST tables; TABLE_LIST tables;
List<Item> fields; List<Item> fields;
List<Item> all_fields; List<Item> all_fields;
@@ -3298,9 +3297,14 @@ copy_data_between_tables(TABLE *from,TABLE *to,
{ {
def=it++; def=it++;
if (def->field) if (def->field)
{
if (*ptr == to->next_number_field)
next_field= copy_end;
(copy_end++)->set(*ptr,def->field,0); (copy_end++)->set(*ptr,def->field,0);
} }
}
found_count=delete_count=0; found_count=delete_count=0;
if (order) if (order)
@@ -3343,7 +3347,6 @@ copy_data_between_tables(TABLE *from,TABLE *to,
if (handle_duplicates == DUP_IGNORE || if (handle_duplicates == DUP_IGNORE ||
handle_duplicates == DUP_REPLACE) handle_duplicates == DUP_REPLACE)
to->file->extra(HA_EXTRA_IGNORE_DUP_KEY); to->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
next_field=to->next_number_field;
thd->row_count= 0; thd->row_count= 0;
while (!(error=info.read_record(&info))) while (!(error=info.read_record(&info)))
{ {
@@ -3354,10 +3357,14 @@ copy_data_between_tables(TABLE *from,TABLE *to,
break; break;
} }
thd->row_count++; thd->row_count++;
if (next_field) if (to->next_number_field)
next_field->reset(); to->next_number_field->reset();
for (Copy_field *copy_ptr=copy ; copy_ptr != copy_end ; copy_ptr++) for (Copy_field *copy_ptr=copy ; copy_ptr != copy_end ; copy_ptr++)
{
if (copy_ptr == next_field)
to->auto_increment_field_not_null= TRUE;
copy_ptr->do_copy(copy_ptr); copy_ptr->do_copy(copy_ptr);
}
if ((error=to->file->write_row((byte*) to->record[0]))) if ((error=to->file->write_row((byte*) to->record[0])))
{ {
if ((handle_duplicates != DUP_IGNORE && if ((handle_duplicates != DUP_IGNORE &&