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
da44e731
Commit
da44e731
authored
May 15, 2006
by
pekka@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ndb - bug#19537: arithmetic conversion Uint64 reg to Uint32 attr
parent
9326f67d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
171 additions
and
40 deletions
+171
-40
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+6
-0
ndb/test/ndbapi/Makefile.am
ndb/test/ndbapi/Makefile.am
+3
-0
ndb/test/ndbapi/testInterpreter.cpp
ndb/test/ndbapi/testInterpreter.cpp
+162
-40
No files found.
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
View file @
da44e731
...
@@ -1494,6 +1494,7 @@ int Dbtup::interpreterNextLab(Signal* signal,
...
@@ -1494,6 +1494,7 @@ int Dbtup::interpreterNextLab(Signal* signal,
// word read. Thus we set the register to be a 32 bit register.
// word read. Thus we set the register to be a 32 bit register.
/* ------------------------------------------------------------- */
/* ------------------------------------------------------------- */
TregMemBuffer
[
theRegister
]
=
0x50
;
TregMemBuffer
[
theRegister
]
=
0x50
;
// arithmetic conversion if big-endian
*
(
Int64
*
)(
TregMemBuffer
+
theRegister
+
2
)
=
TregMemBuffer
[
theRegister
+
1
];
*
(
Int64
*
)(
TregMemBuffer
+
theRegister
+
2
)
=
TregMemBuffer
[
theRegister
+
1
];
}
else
if
(
TnoDataRW
==
3
)
{
}
else
if
(
TnoDataRW
==
3
)
{
/* ------------------------------------------------------------- */
/* ------------------------------------------------------------- */
...
@@ -1557,6 +1558,11 @@ int Dbtup::interpreterNextLab(Signal* signal,
...
@@ -1557,6 +1558,11 @@ int Dbtup::interpreterNextLab(Signal* signal,
Tlen
=
TattrNoOfWords
+
1
;
Tlen
=
TattrNoOfWords
+
1
;
if
(
Toptype
==
ZUPDATE
)
{
if
(
Toptype
==
ZUPDATE
)
{
if
(
TattrNoOfWords
<=
2
)
{
if
(
TattrNoOfWords
<=
2
)
{
if
(
TattrNoOfWords
==
1
)
{
// arithmetic conversion if big-endian
TdataForUpdate
[
1
]
=
*
(
Int64
*
)
&
TregMemBuffer
[
theRegister
+
2
];
TdataForUpdate
[
2
]
=
0
;
}
if
(
TregType
==
0
)
{
if
(
TregType
==
0
)
{
/* --------------------------------------------------------- */
/* --------------------------------------------------------- */
// Write a NULL value into the attribute
// Write a NULL value into the attribute
...
...
ndb/test/ndbapi/Makefile.am
View file @
da44e731
...
@@ -24,6 +24,7 @@ testOIBasic \
...
@@ -24,6 +24,7 @@ testOIBasic \
testOperations
\
testOperations
\
testRestartGci
\
testRestartGci
\
testScan
\
testScan
\
testInterpreter
\
testScanInterpreter
\
testScanInterpreter
\
testScanPerf
\
testScanPerf
\
testSystemRestart
\
testSystemRestart
\
...
@@ -61,6 +62,7 @@ testOIBasic_SOURCES = testOIBasic.cpp
...
@@ -61,6 +62,7 @@ testOIBasic_SOURCES = testOIBasic.cpp
testOperations_SOURCES
=
testOperations.cpp
testOperations_SOURCES
=
testOperations.cpp
testRestartGci_SOURCES
=
testRestartGci.cpp
testRestartGci_SOURCES
=
testRestartGci.cpp
testScan_SOURCES
=
testScan.cpp ScanFunctions.hpp
testScan_SOURCES
=
testScan.cpp ScanFunctions.hpp
testInterpreter_SOURCES
=
testInterpreter.cpp
testScanInterpreter_SOURCES
=
testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp
testScanInterpreter_SOURCES
=
testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp
testScanPerf_SOURCES
=
testScanPerf.cpp
testScanPerf_SOURCES
=
testScanPerf.cpp
testSystemRestart_SOURCES
=
testSystemRestart.cpp
testSystemRestart_SOURCES
=
testSystemRestart.cpp
...
@@ -152,3 +154,4 @@ testScan.dsp: Makefile \
...
@@ -152,3 +154,4 @@ testScan.dsp: Makefile \
@
$(top_srcdir)
/ndb/config/win-includes
$@
$(INCLUDES)
@
$(top_srcdir)
/ndb/config/win-includes
$@
$(INCLUDES)
@
$(top_srcdir)
/ndb/config/win-sources
$@
$(testScan_SOURCES)
@
$(top_srcdir)
/ndb/config/win-sources
$@
$(testScan_SOURCES)
@
$(top_srcdir)
/ndb/config/win-libraries
$@
LINK
$(LDADD)
@
$(top_srcdir)
/ndb/config/win-libraries
$@
LINK
$(LDADD)
ndb/test/ndbapi/testInterpreter.cpp
View file @
da44e731
...
@@ -79,46 +79,46 @@ int runTestIncValue32(NDBT_Context* ctx, NDBT_Step* step){
...
@@ -79,46 +79,46 @@ int runTestIncValue32(NDBT_Context* ctx, NDBT_Step* step){
Ndb
*
pNdb
=
GETNDB
(
step
);
Ndb
*
pNdb
=
GETNDB
(
step
);
NdbConnection
*
pTrans
=
pNdb
->
startTransaction
();
NdbConnection
*
pTrans
=
pNdb
->
startTransaction
();
if
(
pTrans
==
NULL
){
if
(
pTrans
==
NULL
){
ERR
(
pNdb
->
getNdbError
());
ERR
(
pNdb
->
getNdbError
());
return
NDBT_FAILED
;
return
NDBT_FAILED
;
}
}
NdbOperation
*
pOp
=
pTrans
->
getNdbOperation
(
pTab
->
getName
());
NdbOperation
*
pOp
=
pTrans
->
getNdbOperation
(
pTab
->
getName
());
if
(
pOp
==
NULL
)
{
if
(
pOp
==
NULL
)
{
ERR
(
pTrans
->
getNdbError
());
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
return
NDBT_FAILED
;
}
}
int
check
=
pOp
->
interpretedUpdateTuple
();
int
check
=
pOp
->
interpretedUpdateTuple
();
if
(
check
==
-
1
)
{
if
(
check
==
-
1
)
{
ERR
(
pTrans
->
getNdbError
());
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
return
NDBT_FAILED
;
}
}
// Primary keys
// Primary keys
Uint32
pkVal
=
1
;
Uint32
pkVal
=
1
;
check
=
pOp
->
equal
(
"KOL1"
,
pkVal
);
check
=
pOp
->
equal
(
"KOL1"
,
pkVal
);
if
(
check
==
-
1
)
{
if
(
check
==
-
1
)
{
ERR
(
pTrans
->
getNdbError
());
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
return
NDBT_FAILED
;
}
}
// Attributes
// Attributes
// Update column
// Update column
Uint32
valToIncWith
=
1
;
Uint32
valToIncWith
=
1
;
check
=
pOp
->
incValue
(
"KOL2"
,
valToIncWith
);
check
=
pOp
->
incValue
(
"KOL2"
,
valToIncWith
);
if
(
check
==
-
1
)
{
if
(
check
==
-
1
)
{
ERR
(
pTrans
->
getNdbError
());
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
return
NDBT_FAILED
;
}
}
NdbRecAttr
*
valueRec
=
pOp
->
getValue
(
"KOL2"
);
NdbRecAttr
*
valueRec
=
pOp
->
getValue
(
"KOL2"
);
if
(
valueRec
==
NULL
)
{
if
(
valueRec
==
NULL
)
{
...
@@ -142,6 +142,122 @@ int runTestIncValue32(NDBT_Context* ctx, NDBT_Step* step){
...
@@ -142,6 +142,122 @@ int runTestIncValue32(NDBT_Context* ctx, NDBT_Step* step){
return
NDBT_OK
;
return
NDBT_OK
;
}
}
int
runTestBug19537
(
NDBT_Context
*
ctx
,
NDBT_Step
*
step
){
int
result
=
NDBT_OK
;
const
NdbDictionary
::
Table
*
pTab
=
ctx
->
getTab
();
Ndb
*
pNdb
=
GETNDB
(
step
);
if
(
strcmp
(
pTab
->
getName
(),
"T1"
)
!=
0
)
{
g_err
<<
"runTestBug19537: skip, table != T1"
<<
endl
;
return
NDBT_OK
;
}
NdbConnection
*
pTrans
=
pNdb
->
startTransaction
();
if
(
pTrans
==
NULL
){
ERR
(
pNdb
->
getNdbError
());
return
NDBT_FAILED
;
}
NdbOperation
*
pOp
=
pTrans
->
getNdbOperation
(
pTab
->
getName
());
if
(
pOp
==
NULL
)
{
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
if
(
pOp
->
interpretedUpdateTuple
()
==
-
1
)
{
ERR
(
pOp
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
// Primary keys
const
Uint32
pkVal
=
1
;
if
(
pOp
->
equal
(
"KOL1"
,
pkVal
)
==
-
1
)
{
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
// Load 64-bit constant into register 1 and
// write from register 1 to 32-bit column KOL2
const
Uint64
reg_val
=
0x0102030405060708ULL
;
const
Uint32
*
reg_ptr32
=
(
const
Uint32
*
)
&
reg_val
;
if
(
reg_ptr32
[
0
]
==
0x05060708
&&
reg_ptr32
[
1
]
==
0x01020304
)
{
g_err
<<
"runTestBug19537: platform is LITTLE endian"
<<
endl
;
}
else
if
(
reg_ptr32
[
0
]
==
0x01020304
&&
reg_ptr32
[
1
]
==
0x05060708
)
{
g_err
<<
"runTestBug19537: platform is BIG endian"
<<
endl
;
}
else
{
g_err
<<
"runTestBug19537: impossible platform"
<<
hex
<<
" [0]="
<<
reg_ptr32
[
0
]
<<
" [1]="
<<
reg_ptr32
[
1
]
<<
endl
;
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
if
(
pOp
->
load_const_u64
(
1
,
reg_val
)
==
-
1
||
pOp
->
write_attr
(
"KOL2"
,
1
)
==
-
1
)
{
ERR
(
pOp
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
if
(
pTrans
->
execute
(
Commit
)
==
-
1
)
{
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
// Read value via a new transaction
pTrans
=
pNdb
->
startTransaction
();
if
(
pTrans
==
NULL
){
ERR
(
pNdb
->
getNdbError
());
return
NDBT_FAILED
;
}
pOp
=
pTrans
->
getNdbOperation
(
pTab
->
getName
());
if
(
pOp
==
NULL
)
{
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
Uint32
kol2
=
0x09090909
;
if
(
pOp
->
readTuple
()
==
-
1
||
pOp
->
equal
(
"KOL1"
,
pkVal
)
==
-
1
||
pOp
->
getValue
(
"KOL2"
,
(
char
*
)
&
kol2
)
==
0
)
{
ERR
(
pOp
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
if
(
pTrans
->
execute
(
Commit
)
==
-
1
)
{
ERR
(
pTrans
->
getNdbError
());
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
// Expected conversion as in C - truncate to lower (logical) word
if
(
kol2
==
0x01020304
)
{
g_err
<<
"runTestBug19537: the bug manifests itself !"
<<
endl
;
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
if
(
kol2
!=
0x05060708
)
{
g_err
<<
"runTestBug19537: impossible KOL2 "
<<
hex
<<
kol2
<<
endl
;
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_FAILED
;
}
pNdb
->
closeTransaction
(
pTrans
);
return
NDBT_OK
;
}
NDBT_TESTSUITE
(
testInterpreter
);
NDBT_TESTSUITE
(
testInterpreter
);
TESTCASE
(
"IncValue32"
,
TESTCASE
(
"IncValue32"
,
...
@@ -156,6 +272,12 @@ TESTCASE("IncValue64",
...
@@ -156,6 +272,12 @@ TESTCASE("IncValue64",
INITIALIZER
(
runTestIncValue64
);
INITIALIZER
(
runTestIncValue64
);
FINALIZER
(
runClearTable
);
FINALIZER
(
runClearTable
);
}
}
TESTCASE
(
"Bug19537"
,
"Test big-endian write_attr of 32 bit integer
\n
"
){
INITIALIZER
(
runLoadTable
);
INITIALIZER
(
runTestBug19537
);
FINALIZER
(
runClearTable
);
}
#if 0
#if 0
TESTCASE("MaxTransactions",
TESTCASE("MaxTransactions",
"Start transactions until no more can be created\n"){
"Start transactions until no more can be created\n"){
...
...
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