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
6e313310
Commit
6e313310
authored
23 years ago
by
serg@serg.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents
eb9cbe2c
a7e40c57
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
0 deletions
+30
-0
myisam/mi_write.c
myisam/mi_write.c
+11
-0
mysql-test/r/bulk_replace.result
mysql-test/r/bulk_replace.result
+5
-0
mysql-test/t/bulk_replace.test
mysql-test/t/bulk_replace.test
+14
-0
No files found.
myisam/mi_write.c
View file @
6e313310
...
@@ -156,6 +156,17 @@ err:
...
@@ -156,6 +156,17 @@ err:
save_errno
=
my_errno
;
save_errno
=
my_errno
;
if
(
my_errno
==
HA_ERR_FOUND_DUPP_KEY
||
my_errno
==
HA_ERR_RECORD_FILE_FULL
)
if
(
my_errno
==
HA_ERR_FOUND_DUPP_KEY
||
my_errno
==
HA_ERR_RECORD_FILE_FULL
)
{
{
if
(
info
->
bulk_insert
)
{
int
j
;
for
(
j
=
0
;
j
<
share
->
base
.
keys
;
j
++
)
{
if
(
is_tree_inited
(
&
info
->
bulk_insert
[
j
]))
{
reset_tree
(
&
info
->
bulk_insert
[
j
]);
}
}
}
info
->
errkey
=
(
int
)
i
;
info
->
errkey
=
(
int
)
i
;
while
(
i
--
>
0
)
while
(
i
--
>
0
)
{
{
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/bulk_replace.result
0 → 100644
View file @
6e313310
a b c
3 1 3
2 2 2
Table Op Msg_type Msg_text
test.t1 check status OK
This diff is collapsed.
Click to expand it.
mysql-test/t/bulk_replace.test
0 → 100644
View file @
6e313310
#
# this is a test of bulk-insert code
# as used by REPLACE
#
# by Monty
#
drop
table
if
exists
t1
;
CREATE
TABLE
t1
(
a
int
,
unique
(
a
),
b
int
not
null
,
unique
(
b
),
c
int
not
null
,
index
(
c
));
replace
into
t1
values
(
1
,
1
,
1
),(
2
,
2
,
2
),(
3
,
1
,
3
);
select
*
from
t1
;
check
table
t1
;
drop
table
t1
;
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