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
201705a4
Commit
201705a4
authored
Jan 31, 2007
by
mskold/marty@linux.site
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
parents
1ce3dc96
4cc8da4d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
2 deletions
+50
-2
mysql-test/r/ndb_read_multi_range.result
mysql-test/r/ndb_read_multi_range.result
+17
-0
mysql-test/t/ndb_read_multi_range.test
mysql-test/t/ndb_read_multi_range.test
+29
-0
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+4
-2
No files found.
mysql-test/r/ndb_read_multi_range.result
View file @
201705a4
...
@@ -442,3 +442,20 @@ SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila');
...
@@ -442,3 +442,20 @@ SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila');
id tag doc type
id tag doc type
sakila 1 Some text goes here text
sakila 1 Some text goes here text
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (
var1 int(2) NOT NULL,
var2 int(2) NOT NULL,
PRIMARY KEY (var1)
) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;
CREATE TABLE t2 (
var1 int(2) NOT NULL,
var2 int(2) NOT NULL,
PRIMARY KEY (var1)
) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;
CREATE TRIGGER testtrigger
AFTER UPDATE ON t1 FOR EACH ROW BEGIN
REPLACE INTO t2 SELECT * FROM t1 WHERE t1.var1 = NEW.var1;END|
INSERT INTO t1 VALUES (1,1),(2,2),(3,3);
UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);
DROP TRIGGER testtrigger;
DROP TABLE t1, t2;
mysql-test/t/ndb_read_multi_range.test
View file @
201705a4
...
@@ -272,3 +272,32 @@ SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','orka');
...
@@ -272,3 +272,32 @@ SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','orka');
SELECT
id
,
tag
,
doc
,
type
FROM
t1
WHERE
id
IN
(
'flipper'
,
'sakila'
);
SELECT
id
,
tag
,
doc
,
type
FROM
t1
WHERE
id
IN
(
'flipper'
,
'sakila'
);
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#bug#25522
CREATE
TABLE
t1
(
var1
int
(
2
)
NOT
NULL
,
var2
int
(
2
)
NOT
NULL
,
PRIMARY
KEY
(
var1
)
)
ENGINE
=
ndbcluster
DEFAULT
CHARSET
=
ascii
CHECKSUM
=
1
;
CREATE
TABLE
t2
(
var1
int
(
2
)
NOT
NULL
,
var2
int
(
2
)
NOT
NULL
,
PRIMARY
KEY
(
var1
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
ascii
CHECKSUM
=
1
;
DELIMITER
|
;
CREATE
TRIGGER
testtrigger
AFTER
UPDATE
ON
t1
FOR
EACH
ROW
BEGIN
REPLACE
INTO
t2
SELECT
*
FROM
t1
WHERE
t1
.
var1
=
NEW
.
var1
;
END
|
DELIMITER
;
|
INSERT
INTO
t1
VALUES
(
1
,
1
),(
2
,
2
),(
3
,
3
);
UPDATE
t1
SET
var2
=
9
WHERE
var1
IN
(
1
,
2
,
3
);
DROP
TRIGGER
testtrigger
;
DROP
TABLE
t1
,
t2
;
sql/ha_ndbcluster.cc
View file @
201705a4
...
@@ -4347,10 +4347,10 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type)
...
@@ -4347,10 +4347,10 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type)
ERR_RETURN
(
ndb
->
getNdbError
());
ERR_RETURN
(
ndb
->
getNdbError
());
no_uncommitted_rows_reset
(
thd
);
no_uncommitted_rows_reset
(
thd
);
thd_ndb
->
stmt
=
trans
;
thd_ndb
->
stmt
=
trans
;
thd_ndb
->
query_state
&=
NDB_QUERY_NORMAL
;
m_active_trans
=
trans
;
trans_register_ha
(
thd
,
FALSE
,
ndbcluster_hton
);
trans_register_ha
(
thd
,
FALSE
,
ndbcluster_hton
);
}
}
thd_ndb
->
query_state
&=
NDB_QUERY_NORMAL
;
m_active_trans
=
trans
;
// Start of statement
// Start of statement
m_ops_pending
=
0
;
m_ops_pending
=
0
;
...
@@ -8292,6 +8292,8 @@ ha_ndbcluster::read_multi_range_next(KEY_MULTI_RANGE ** multi_range_found_p)
...
@@ -8292,6 +8292,8 @@ ha_ndbcluster::read_multi_range_next(KEY_MULTI_RANGE ** multi_range_found_p)
if
(
multi_range_curr
==
multi_range_end
)
if
(
multi_range_curr
==
multi_range_end
)
{
{
DBUG_MULTI_RANGE
(
16
);
DBUG_MULTI_RANGE
(
16
);
Thd_ndb
*
thd_ndb
=
get_thd_ndb
(
current_thd
);
thd_ndb
->
query_state
&=
NDB_QUERY_NORMAL
;
DBUG_RETURN
(
HA_ERR_END_OF_FILE
);
DBUG_RETURN
(
HA_ERR_END_OF_FILE
);
}
}
...
...
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