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
70596536
Commit
70596536
authored
Nov 24, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added missing errorcode handling in NdbIndexStat causing test failure
parent
c9865bf9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-1
storage/ndb/src/ndbapi/NdbIndexStat.cpp
storage/ndb/src/ndbapi/NdbIndexStat.cpp
+3
-0
No files found.
mysql-test/t/disabled.def
View file @
70596536
...
@@ -15,4 +15,3 @@ rpl_relayrotate : Unstable test case, bug#12429
...
@@ -15,4 +15,3 @@ rpl_relayrotate : Unstable test case, bug#12429
rpl_until : Unstable test case, bug#12429
rpl_until : Unstable test case, bug#12429
rpl_deadlock : Unstable test case, bug#12429
rpl_deadlock : Unstable test case, bug#12429
kill : Unstable test case, bug#9712
kill : Unstable test case, bug#9712
ndb_alter_table : Martin will fix
storage/ndb/src/ndbapi/NdbIndexStat.cpp
View file @
70596536
...
@@ -423,11 +423,13 @@ NdbIndexStat::records_in_range(NdbDictionary::Index* index, NdbIndexScanOperatio
...
@@ -423,11 +423,13 @@ NdbIndexStat::records_in_range(NdbDictionary::Index* index, NdbIndexScanOperatio
NdbTransaction
*
trans
=
op
->
m_transConnection
;
NdbTransaction
*
trans
=
op
->
m_transConnection
;
if
(
op
->
interpret_exit_last_row
()
==
-
1
||
if
(
op
->
interpret_exit_last_row
()
==
-
1
||
op
->
getValue
(
NdbDictionary
::
Column
::
RECORDS_IN_RANGE
,
(
char
*
)
out
)
==
0
)
{
op
->
getValue
(
NdbDictionary
::
Column
::
RECORDS_IN_RANGE
,
(
char
*
)
out
)
==
0
)
{
m_error
=
op
->
getNdbError
();
DBUG_PRINT
(
"error"
,
(
"op:%d"
,
op
->
getNdbError
().
code
));
DBUG_PRINT
(
"error"
,
(
"op:%d"
,
op
->
getNdbError
().
code
));
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
}
if
(
trans
->
execute
(
NdbTransaction
::
NoCommit
,
if
(
trans
->
execute
(
NdbTransaction
::
NoCommit
,
NdbTransaction
::
AbortOnError
,
forceSend
)
==
-
1
)
{
NdbTransaction
::
AbortOnError
,
forceSend
)
==
-
1
)
{
m_error
=
trans
->
getNdbError
();
DBUG_PRINT
(
"error"
,
(
"trans:%d op:%d"
,
trans
->
getNdbError
().
code
,
DBUG_PRINT
(
"error"
,
(
"trans:%d op:%d"
,
trans
->
getNdbError
().
code
,
op
->
getNdbError
().
code
));
op
->
getNdbError
().
code
));
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
...
@@ -443,6 +445,7 @@ NdbIndexStat::records_in_range(NdbDictionary::Index* index, NdbIndexScanOperatio
...
@@ -443,6 +445,7 @@ NdbIndexStat::records_in_range(NdbDictionary::Index* index, NdbIndexScanOperatio
cnt
++
;
cnt
++
;
}
}
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
m_error
=
op
->
getNdbError
();
DBUG_PRINT
(
"error"
,
(
"trans:%d op:%d"
,
trans
->
getNdbError
().
code
,
DBUG_PRINT
(
"error"
,
(
"trans:%d op:%d"
,
trans
->
getNdbError
().
code
,
op
->
getNdbError
().
code
));
op
->
getNdbError
().
code
));
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
...
...
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