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
e688303f
Commit
e688303f
authored
17 years ago
by
mskold/marty@linux.site
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
parents
59bebf29
06b3c9a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
mysql-test/t/ndb_read_multi_range.test
mysql-test/t/ndb_read_multi_range.test
+22
-1
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+2
-1
No files found.
mysql-test/t/ndb_read_multi_range.test
View file @
e688303f
...
...
@@ -315,5 +315,26 @@ partition by key(a);
insert
into
t2
values
(
1
,
1
),
(
10
,
10
);
select
*
from
t2
where
a
in
(
1
,
10
)
order
by
a
;
drop
table
t1
,
t2
;
#bug#30337
create
table
t1
(
id
int
primary
key
)
engine
ndb
;
insert
into
t1
values
(
1
),
(
2
),
(
3
);
create
table
t2
(
id
int
primary
key
)
engine
ndb
;
insert
into
t2
select
id
from
t1
;
delimiter
|
;
create
trigger
kaboom
after
delete
on
t1
for
each
row
begin
delete
from
t2
where
id
=
old
.
id
;
end
|
delimiter
;
|
select
*
from
t1
order
by
id
;
delete
from
t1
where
id
in
(
1
,
2
);
select
*
from
t2
order
by
id
;
drop
trigger
kaboom
;
drop
table
t1
;
This diff is collapsed.
Click to expand it.
sql/ha_ndbcluster.cc
View file @
e688303f
...
...
@@ -8520,7 +8520,8 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
if
(
uses_blob_value
()
||
(
cur_index_type
==
UNIQUE_INDEX
&&
has_null_in_unique_index
(
active_index
)
&&
null_value_index_search
(
ranges
,
ranges
+
range_count
,
buffer
)))
null_value_index_search
(
ranges
,
ranges
+
range_count
,
buffer
))
||
m_delete_cannot_batch
||
m_update_cannot_batch
)
{
m_disable_multi_read
=
TRUE
;
DBUG_RETURN
(
handler
::
read_multi_range_first
(
found_range_p
,
...
...
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