Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
844df8f0
Commit
844df8f0
authored
Sep 18, 2006
by
acurtis/antony@xiphis.org/ltamd64.xiphis.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post merge fixes
parent
424857e0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
24 deletions
+14
-24
mysql-test/r/strict_autoinc_1myisam.result
mysql-test/r/strict_autoinc_1myisam.result
+3
-3
mysql-test/r/strict_autoinc_2innodb.result
mysql-test/r/strict_autoinc_2innodb.result
+3
-3
mysql-test/r/strict_autoinc_3heap.result
mysql-test/r/strict_autoinc_3heap.result
+3
-3
mysql-test/r/strict_autoinc_5ndb.result
mysql-test/r/strict_autoinc_5ndb.result
+3
-3
mysql-test/t/strict_autoinc_4bdb.test
mysql-test/t/strict_autoinc_4bdb.test
+0
-10
sql/handler.cc
sql/handler.cc
+2
-2
No files found.
mysql-test/r/strict_autoinc_1myisam.result
View file @
844df8f0
...
...
@@ -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
View file @
844df8f0
...
...
@@ -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
View file @
844df8f0
...
...
@@ -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
View file @
844df8f0
...
...
@@ -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
deleted
100644 → 0
View file @
424857e0
--
source
include
/
have_bdb
.
inc
#
# Bug#20573 Strict mode auto-increment
#
let
$type
=
'BDB'
;
--
source
include
/
strict_autoinc
.
inc
# end of test
sql/handler.cc
View file @
844df8f0
...
...
@@ -1871,10 +1871,10 @@ int handler::update_auto_increment()
variables
->
auto_increment_increment
);
/* Row-based replication does not need to store intervals in binlog */
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
(),
auto_inc_interval_for_cur_row
.
values
(),
variables
->
auto_increment_increment
);
}
/*
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
));
DBUG_RETURN
(
result
?
/* some failure occurred */
-
1
:
0
);
DBUG_RETURN
(
0
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment