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

post merge fixes

Browse Source
This commit is contained in:
acurtis/antony@xiphis.org/ltamd64.xiphis.org
2006-09-18 15:52:16 -07:00
parent 424857e0e4
commit 844df8f085
6 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/strict_autoinc_1myisam.result
View File

@@ -6,21 +6,21 @@ primary key (`a`)
) engine = 'MYISAM' ; ) engine = 'MYISAM' ;
set @@sql_mode='strict_all_tables'; set @@sql_mode='strict_all_tables';
insert into t1 values(1000); 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; select count(*) from t1;
count(*) count(*)
0 0
set auto_increment_increment=1000; set auto_increment_increment=1000;
set auto_increment_offset=700; set auto_increment_offset=700;
insert into t1 values(null); 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; select count(*) from t1;
count(*) count(*)
0 0
set @@sql_mode=@org_mode; set @@sql_mode=@org_mode;
insert into t1 values(null); insert into t1 values(null);
Warnings: 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; select * from t1;
a a
127 127

6
mysql-test/r/strict_autoinc_2innodb.result
View File

@@ -6,21 +6,21 @@ primary key (`a`)
) engine = 'InnoDB' ; ) engine = 'InnoDB' ;
set @@sql_mode='strict_all_tables'; set @@sql_mode='strict_all_tables';
insert into t1 values(1000); 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; select count(*) from t1;
count(*) count(*)
0 0
set auto_increment_increment=1000; set auto_increment_increment=1000;
set auto_increment_offset=700; set auto_increment_offset=700;
insert into t1 values(null); 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; select count(*) from t1;
count(*) count(*)
0 0
set @@sql_mode=@org_mode; set @@sql_mode=@org_mode;
insert into t1 values(null); insert into t1 values(null);
Warnings: 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; select * from t1;
a a
127 127

6
mysql-test/r/strict_autoinc_3heap.result
View File

@@ -6,21 +6,21 @@ primary key (`a`)
) engine = 'MEMORY' ; ) engine = 'MEMORY' ;
set @@sql_mode='strict_all_tables'; set @@sql_mode='strict_all_tables';
insert into t1 values(1000); 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; select count(*) from t1;
count(*) count(*)
0 0
set auto_increment_increment=1000; set auto_increment_increment=1000;
set auto_increment_offset=700; set auto_increment_offset=700;
insert into t1 values(null); 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; select count(*) from t1;
count(*) count(*)
0 0
set @@sql_mode=@org_mode; set @@sql_mode=@org_mode;
insert into t1 values(null); insert into t1 values(null);
Warnings: 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; select * from t1;
a a
127 127

6
mysql-test/r/strict_autoinc_5ndb.result
View File

@@ -6,21 +6,21 @@ primary key (`a`)
) engine = 'NDB' ; ) engine = 'NDB' ;
set @@sql_mode='strict_all_tables'; set @@sql_mode='strict_all_tables';
insert into t1 values(1000); 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; select count(*) from t1;
count(*) count(*)
0 0
set auto_increment_increment=1000; set auto_increment_increment=1000;
set auto_increment_offset=700; set auto_increment_offset=700;
insert into t1 values(null); 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; select count(*) from t1;
count(*) count(*)
0 0
set @@sql_mode=@org_mode; set @@sql_mode=@org_mode;
insert into t1 values(null); insert into t1 values(null);
Warnings: 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; select * from t1;
a a
127 127

10
mysql-test/t/strict_autoinc_4bdb.test
View File

@@ -1,10 +0,0 @@
-- source include/have_bdb.inc
#
# Bug#20573 Strict mode auto-increment
#
let $type= 'BDB' ;
--source include/strict_autoinc.inc
# end of test

4
sql/handler.cc
View File

@@ -1871,10 +1871,10 @@ int handler::update_auto_increment()
variables->auto_increment_increment); variables->auto_increment_increment);
/* Row-based replication does not need to store intervals in binlog */ /* Row-based replication does not need to store intervals in binlog */
if (!thd->current_stmt_binlog_row_based) if (!thd->current_stmt_binlog_row_based)
result= result ||
thd->auto_inc_intervals_in_cur_stmt_for_binlog.append(auto_inc_interval_for_cur_row.minimum(), thd->auto_inc_intervals_in_cur_stmt_for_binlog.append(auto_inc_interval_for_cur_row.minimum(),
auto_inc_interval_for_cur_row.values(), auto_inc_interval_for_cur_row.values(),
variables->auto_increment_increment); variables->auto_increment_increment);
}
/* /*
Record this autogenerated value. If the caller then Record this autogenerated value. If the caller then
@@ -1890,7 +1890,7 @@ int handler::update_auto_increment()
*/ */
set_next_insert_id(compute_next_insert_id(nr, variables)); set_next_insert_id(compute_next_insert_id(nr, variables));
DBUG_RETURN(result ? /* some failure occurred */ -1 : 0); DBUG_RETURN(0);
} }