Commit 2233201b authored by unknown's avatar unknown
Browse files

Bug#20573 

  "strict mode: inserts autogenerated auto_increment value bigger than max"
  Strict mode should fail if autoincrement value is out of range


include/my_base.h:
  Add new handler error codes
sql/ha_berkeley.cc:
  handle error in update_auto_increment()
sql/ha_heap.cc:
  handle error in update_auto_increment()
sql/ha_innodb.cc:
  handle error in update_auto_increment()
sql/ha_myisam.cc:
  handle error in update_auto_increment()
sql/ha_myisammrg.cc:
  handle error in update_auto_increment()
sql/ha_ndbcluster.cc:
  handle error in update_auto_increment()
sql/handler.cc:
  return error from handler::update_auto_increment()
sql/handler.h:
  change return type of handler::update_auto_increment() to int
sql/share/errmsg.txt:
  new error message for auto-increment
mysql-test/include/strict_autoinc.inc:
  New BitKeeper file ``mysql-test/include/strict_autoinc.inc''
mysql-test/r/strict_autoinc_1myisam.result:
  New BitKeeper file ``mysql-test/r/strict_autoinc_1myisam.result''
mysql-test/r/strict_autoinc_2innodb.result:
  New BitKeeper file ``mysql-test/r/strict_autoinc_2innodb.result''
mysql-test/r/strict_autoinc_3heap.result:
  New BitKeeper file ``mysql-test/r/strict_autoinc_3heap.result''
mysql-test/r/strict_autoinc_4bdb.result:
  New BitKeeper file ``mysql-test/r/strict_autoinc_4bdb.result''
mysql-test/r/strict_autoinc_5ndb.result:
  New BitKeeper file ``mysql-test/r/strict_autoinc_5ndb.result''
mysql-test/t/strict_autoinc_1myisam.test:
  New BitKeeper file ``mysql-test/t/strict_autoinc_1myisam.test''
mysql-test/t/strict_autoinc_2innodb.test:
  New BitKeeper file ``mysql-test/t/strict_autoinc_2innodb.test''
mysql-test/t/strict_autoinc_3heap.test:
  New BitKeeper file ``mysql-test/t/strict_autoinc_3heap.test''
mysql-test/t/strict_autoinc_4bdb.test:
  New BitKeeper file ``mysql-test/t/strict_autoinc_4bdb.test''
mysql-test/t/strict_autoinc_5ndb.test:
  New BitKeeper file ``mysql-test/t/strict_autoinc_5ndb.test''
parent 69a29c1e

include/my_base.h

+3 −1
Original line number Diff line number Diff line
@@ -357,8 +357,10 @@ enum ha_base_keytype { 
#define HA_ERR_TABLE_DEF_CHANGED 159  /* The table changed in storage engine */

#define HA_ERR_TABLE_NEEDS_UPGRADE 160  /* The table changed in storage engine */

#define HA_ERR_TABLE_READONLY    161  /* The table is not writable */

#define HA_ERR_AUTOINC_READ_FAILED 162/* Failed to get the next autoinc value */

#define HA_ERR_AUTOINC_ERANGE    163  /* Failed to set the row autoinc value */



#define HA_ERR_LAST              161  /*Copy last error nr.*/

#define HA_ERR_LAST              163  /*Copy last error nr.*/

/* Add error numbers before HA_ERR_LAST and change it accordingly. */

#define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)

mysql-test/include/strict_autoinc.inc

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#

# Test for strict-mode autoincrement

#



set @org_mode=@@sql_mode;

eval create table t1

(

  `a` tinyint(4) NOT NULL auto_increment,

  primary key (`a`)

) engine = $type ;

set @@sql_mode='strict_all_tables';

--error ER_WARN_DATA_OUT_OF_RANGE

insert into t1 values(1000);

select count(*) from t1;



set auto_increment_increment=1000;

set auto_increment_offset=700;

--error ER_WARN_DATA_OUT_OF_RANGE

insert into t1 values(null);

select count(*) from t1;



set @@sql_mode=@org_mode;

insert into t1 values(null);

select * from t1;



drop table t1;



# End of test

mysql-test/r/strict_autoinc_1myisam.result

0 → 100644
+27 −0
Original line number Diff line number Diff line 
set @org_mode=@@sql_mode;

create table t1

(

`a` tinyint(4) NOT NULL auto_increment,

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

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

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

select * from t1;

a

127

drop table t1;

mysql-test/r/strict_autoinc_2innodb.result

0 → 100644
+27 −0
Original line number Diff line number Diff line 
set @org_mode=@@sql_mode;

create table t1

(

`a` tinyint(4) NOT NULL auto_increment,

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

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

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

select * from t1;

a

127

drop table t1;

mysql-test/r/strict_autoinc_3heap.result

0 → 100644
+27 −0
Original line number Diff line number Diff line 
set @org_mode=@@sql_mode;

create table t1

(

`a` tinyint(4) NOT NULL auto_increment,

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

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

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

select * from t1;

a

127

drop table t1;