Commit 3d4b52ef authored by unknown's avatar unknown
Browse files

post merge fixes 


BitKeeper/deleted/.del-strict_autoinc_4bdb.test:
  Delete: mysql-test/t/strict_autoinc_4bdb.test
mysql-test/r/strict_autoinc_1myisam.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_2innodb.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_3heap.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_5ndb.result:
  post merge fixes, error message was changed
parent 5d249a71

mysql-test/r/strict_autoinc_1myisam.result

+3 −3
Original line number Diff line number Diff line
@@ -6,21 +6,21 @@ primary key (`a`) 
) engine = 'MYISAM'  ;

set @@sql_mode='strict_all_tables';

insert into t1 values(1000);

ERROR 22003: Out of range value adjusted for column 'a' at row 1

ERROR 22003: Out of range value for column 'a' at row 1

select count(*) from t1;

count(*)

0

set auto_increment_increment=1000;

set auto_increment_offset=700;

insert into t1 values(null);

ERROR 22003: Out of range value adjusted for column 'a' at row 1

ERROR 22003: Out of range value for column 'a' at row 1

select count(*) from t1;

count(*)

0

set @@sql_mode=@org_mode;

insert into t1 values(null);

Warnings:

Warning	1264	Out of range value adjusted for column 'a' at row 1

Warning	1264	Out of range value for column 'a' at row 1

select * from t1;

a

127

mysql-test/r/strict_autoinc_2innodb.result

+3 −3
Original line number Diff line number Diff line
@@ -6,21 +6,21 @@ primary key (`a`) 
) engine = 'InnoDB'  ;

set @@sql_mode='strict_all_tables';

insert into t1 values(1000);

ERROR 22003: Out of range value adjusted for column 'a' at row 1

ERROR 22003: Out of range value for column 'a' at row 1

select count(*) from t1;

count(*)

0

set auto_increment_increment=1000;

set auto_increment_offset=700;

insert into t1 values(null);

ERROR 22003: Out of range value adjusted for column 'a' at row 1

ERROR 22003: Out of range value for column 'a' at row 1

select count(*) from t1;

count(*)

0

set @@sql_mode=@org_mode;

insert into t1 values(null);

Warnings:

Warning	1264	Out of range value adjusted for column 'a' at row 1

Warning	1264	Out of range value for column 'a' at row 1

select * from t1;

a

127

mysql-test/r/strict_autoinc_3heap.result

+3 −3
Original line number Diff line number Diff line
@@ -6,21 +6,21 @@ primary key (`a`) 
) engine = 'MEMORY'  ;

set @@sql_mode='strict_all_tables';

insert into t1 values(1000);

ERROR 22003: Out of range value adjusted for column 'a' at row 1

ERROR 22003: Out of range value for column 'a' at row 1

select count(*) from t1;

count(*)

0

set auto_increment_increment=1000;

set auto_increment_offset=700;

insert into t1 values(null);

ERROR 22003: Out of range value adjusted for column 'a' at row 1

ERROR 22003: Out of range value for column 'a' at row 1

select count(*) from t1;

count(*)

0

set @@sql_mode=@org_mode;

insert into t1 values(null);

Warnings:

Warning	1264	Out of range value adjusted for column 'a' at row 1

Warning	1264	Out of range value for column 'a' at row 1

select * from t1;

a

127

mysql-test/r/strict_autoinc_5ndb.result

+3 −3
Original line number Diff line number Diff line
@@ -6,21 +6,21 @@ primary key (`a`) 
) engine = 'NDB'  ;

set @@sql_mode='strict_all_tables';

insert into t1 values(1000);

ERROR 22003: Out of range value adjusted for column 'a' at row 1

ERROR 22003: Out of range value for column 'a' at row 1

select count(*) from t1;

count(*)

0

set auto_increment_increment=1000;

set auto_increment_offset=700;

insert into t1 values(null);

ERROR 22003: Out of range value adjusted for column 'a' at row 1

ERROR 22003: Out of range value for column 'a' at row 1

select count(*) from t1;

count(*)

0

set @@sql_mode=@org_mode;

insert into t1 values(null);

Warnings:

Warning	1264	Out of range value adjusted for column 'a' at row 1

Warning	1264	Out of range value for column 'a' at row 1

select * from t1;

a

127

mysql-test/t/strict_autoinc_4bdb.test

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
-- source include/have_bdb.inc



#

# Bug#20573 Strict mode auto-increment

#



let $type= 'BDB' ;

--source include/strict_autoinc.inc



# end of test