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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1165fb56
Commit
1165fb56
authored
17 years ago
by
jani@ua141d10.elisa.omakaista.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
parents
6e9add70
45fb6c90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
22 deletions
+24
-22
mysql-test/r/trigger.result
mysql-test/r/trigger.result
+6
-5
mysql-test/t/trigger.test
mysql-test/t/trigger.test
+3
-3
sql/sql_insert.cc
sql/sql_insert.cc
+15
-14
No files found.
mysql-test/r/trigger.result
View file @
1165fb56
...
...
@@ -1398,18 +1398,19 @@ id val
1 test1
2 test2
INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val);
INSERT INTO t1 VALUES (3,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);
INSERT INTO t1 VALUES (2,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val);
INSERT INTO t1 VALUES (3,'test4') ON DUPLICATE KEY UPDATE val=VALUES(val);
SELECT * FROM t1;
id val
1 test1
2 test
2
3 test
3
2 test
3
3 test
4
SELECT * FROM t2;
id val
1 test1
2 test2
3 test
2
4 test
3
3 test
3
4 test
4
DROP TRIGGER trg27006_a_insert;
DROP TRIGGER trg27006_a_update;
drop table t1,t2;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/trigger.test
View file @
1165fb56
...
...
@@ -1700,8 +1700,7 @@ DROP PROCEDURE bug22580_proc_1;
DROP
PROCEDURE
bug22580_proc_2
;
#
# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY
# UPDATE if the row wasn't actually changed.
# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE
#
--
disable_warnings
DROP
TRIGGER
IF
EXISTS
trg27006_a_update
;
...
...
@@ -1730,7 +1729,8 @@ INSERT INTO t1(val) VALUES ('test1'),('test2');
SELECT
*
FROM
t1
;
SELECT
*
FROM
t2
;
INSERT
INTO
t1
VALUES
(
2
,
'test2'
)
ON
DUPLICATE
KEY
UPDATE
val
=
VALUES
(
val
);
INSERT
INTO
t1
VALUES
(
3
,
'test3'
)
ON
DUPLICATE
KEY
UPDATE
val
=
VALUES
(
val
);
INSERT
INTO
t1
VALUES
(
2
,
'test3'
)
ON
DUPLICATE
KEY
UPDATE
val
=
VALUES
(
val
);
INSERT
INTO
t1
VALUES
(
3
,
'test4'
)
ON
DUPLICATE
KEY
UPDATE
val
=
VALUES
(
val
);
SELECT
*
FROM
t1
;
SELECT
*
FROM
t2
;
DROP
TRIGGER
trg27006_a_insert
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_insert.cc
View file @
1165fb56
...
...
@@ -1260,22 +1260,23 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
compare_record
(
table
))
{
info
->
updated
++
;
/*
If ON DUP KEY UPDATE updates a row instead of inserting one, it's
like a regular UPDATE statement: it should not affect the value of a
next SELECT LAST_INSERT_ID() or mysql_insert_id().
Except if LAST_INSERT_ID(#) was in the INSERT query, which is
handled separately by THD::arg_of_last_insert_id_function.
*/
insert_id_for_cur_row
=
table
->
file
->
insert_id_for_cur_row
=
0
;
if
(
table
->
next_number_field
)
table
->
file
->
adjust_next_insert_id_after_explicit_value
(
table
->
next_number_field
->
val_int
());
trg_error
=
(
table
->
triggers
&&
table
->
triggers
->
process_triggers
(
thd
,
TRG_EVENT_UPDATE
,
TRG_ACTION_AFTER
,
TRUE
));
info
->
copied
++
;
}
/*
If ON DUP KEY UPDATE updates a row instead of inserting one, it's
like a regular UPDATE statement: it should not affect the value of a
next SELECT LAST_INSERT_ID() or mysql_insert_id().
Except if LAST_INSERT_ID(#) was in the INSERT query, which is
handled separately by THD::arg_of_last_insert_id_function.
*/
insert_id_for_cur_row
=
table
->
file
->
insert_id_for_cur_row
=
0
;
if
(
table
->
next_number_field
)
table
->
file
->
adjust_next_insert_id_after_explicit_value
(
table
->
next_number_field
->
val_int
());
trg_error
=
(
table
->
triggers
&&
table
->
triggers
->
process_triggers
(
thd
,
TRG_EVENT_UPDATE
,
TRG_ACTION_AFTER
,
TRUE
));
goto
ok_or_after_trg_err
;
}
else
/* DUP_REPLACE */
...
...
This diff is collapsed.
Click to expand it.
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