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
83587008
Commit
83587008
authored
Jul 21, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-push
parents
570cfc8e
de5af58d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
ndb/test/include/HugoOperations.hpp
ndb/test/include/HugoOperations.hpp
+3
-3
ndb/test/ndbapi/testNdbApi.cpp
ndb/test/ndbapi/testNdbApi.cpp
+2
-2
ndb/test/src/HugoOperations.cpp
ndb/test/src/HugoOperations.cpp
+5
-4
No files found.
ndb/test/include/HugoOperations.hpp
View file @
83587008
...
...
@@ -103,7 +103,7 @@ public:
NDBT_ResultRow
&
get_row
(
Uint32
idx
)
{
return
*
rows
[
idx
];}
int
execute_async
(
Ndb
*
,
ExecType
,
AbortOption
=
AbortOnError
);
int
execute_async
(
Ndb
*
,
NdbTransaction
::
ExecType
,
NdbTransaction
::
AbortOption
=
NdbTransaction
::
AbortOnError
);
int
wait_async
(
Ndb
*
,
int
timeout
=
-
1
);
protected:
...
...
@@ -121,8 +121,8 @@ protected:
int
m_async_reply
;
int
m_async_return
;
friend
void
HugoOperations_async_callback
(
int
,
Ndb
Conne
ction
*
,
void
*
);
void
callback
(
int
res
,
Ndb
Conne
ction
*
);
friend
void
HugoOperations_async_callback
(
int
,
Ndb
Transa
ction
*
,
void
*
);
void
callback
(
int
res
,
Ndb
Transa
ction
*
);
};
#endif
ndb/test/ndbapi/testNdbApi.cpp
View file @
83587008
...
...
@@ -1099,7 +1099,7 @@ int runBug_11133(NDBT_Context* ctx, NDBT_Step* step){
C2
(
hugoOps
.
execute_NoCommit
(
pNdb
)
==
0
);
C2
(
hugoOps2
.
startTransaction
(
&
ndb2
)
==
0
);
C2
(
hugoOps2
.
pkWriteRecord
(
&
ndb2
,
0
,
1
)
==
0
);
C2
(
hugoOps2
.
execute_async
(
&
ndb2
,
NoCommit
)
==
0
);
C2
(
hugoOps2
.
execute_async
(
&
ndb2
,
N
dbTransaction
::
N
oCommit
)
==
0
);
C2
(
hugoOps
.
execute_Commit
(
pNdb
)
==
0
);
C2
(
hugoOps2
.
wait_async
(
&
ndb2
)
==
0
);
C2
(
hugoOps
.
closeTransaction
(
pNdb
)
==
0
);
...
...
@@ -1110,7 +1110,7 @@ int runBug_11133(NDBT_Context* ctx, NDBT_Step* step){
C2
(
hugoOps
.
execute_NoCommit
(
pNdb
)
==
0
);
C2
(
hugoOps2
.
startTransaction
(
&
ndb2
)
==
0
);
C2
(
hugoOps2
.
pkWriteRecord
(
&
ndb2
,
0
,
1
)
==
0
);
C2
(
hugoOps2
.
execute_async
(
&
ndb2
,
NoCommit
)
==
0
);
C2
(
hugoOps2
.
execute_async
(
&
ndb2
,
N
dbTransaction
::
N
oCommit
)
==
0
);
C2
(
hugoOps
.
execute_Commit
(
pNdb
)
==
0
);
C2
(
hugoOps2
.
wait_async
(
&
ndb2
)
==
0
);
C2
(
hugoOps
.
closeTransaction
(
pNdb
)
==
0
);
...
...
ndb/test/src/HugoOperations.cpp
View file @
83587008
...
...
@@ -409,13 +409,13 @@ int HugoOperations::execute_Rollback(Ndb* pNdb){
}
void
HugoOperations_async_callback
(
int
res
,
Ndb
Conne
ction
*
pCon
,
void
*
ho
)
HugoOperations_async_callback
(
int
res
,
Ndb
Transa
ction
*
pCon
,
void
*
ho
)
{
((
HugoOperations
*
)
ho
)
->
callback
(
res
,
pCon
);
}
void
HugoOperations
::
callback
(
int
res
,
Ndb
Conne
ction
*
pCon
)
HugoOperations
::
callback
(
int
res
,
Ndb
Transa
ction
*
pCon
)
{
assert
(
pCon
==
pTrans
);
m_async_reply
=
1
;
...
...
@@ -423,7 +423,8 @@ HugoOperations::callback(int res, NdbConnection* pCon)
}
int
HugoOperations
::
execute_async
(
Ndb
*
pNdb
,
ExecType
et
,
AbortOption
eao
){
HugoOperations
::
execute_async
(
Ndb
*
pNdb
,
NdbTransaction
::
ExecType
et
,
NdbTransaction
::
AbortOption
eao
){
m_async_reply
=
0
;
pTrans
->
executeAsynchPrepare
(
et
,
...
...
@@ -591,7 +592,7 @@ int HugoOperations::compareRecordToCopy(int numRecords ){
void
HugoOperations
::
refresh
()
{
Ndb
Connection
*
t
=
getTransaction
();
Ndb
Transaction
*
t
=
getTransaction
();
if
(
t
)
t
->
refresh
();
}
...
...
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