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
1cb37294
Commit
1cb37294
authored
Oct 17, 2005
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
parents
d874cb28
1e4f2614
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
38 deletions
+41
-38
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+38
-38
ndb/test/ndbapi/testOperations.cpp
ndb/test/ndbapi/testOperations.cpp
+3
-0
No files found.
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @
1cb37294
...
...
@@ -4346,6 +4346,44 @@ Dbdict::createTab_dih(Signal* signal,
sendSignal
(
DBDIH_REF
,
GSN_DIADDTABREQ
,
signal
,
DiAddTabReq
::
SignalLength
,
JBB
);
/**
* Create KeyDescriptor
*/
KeyDescriptor
*
desc
=
g_key_descriptor_pool
.
getPtr
(
tabPtr
.
i
);
new
(
desc
)
KeyDescriptor
();
Uint32
key
=
0
;
Uint32
tAttr
=
tabPtr
.
p
->
firstAttribute
;
while
(
tAttr
!=
RNIL
)
{
jam
();
AttributeRecord
*
aRec
=
c_attributeRecordPool
.
getPtr
(
tAttr
);
if
(
aRec
->
tupleKey
)
{
desc
->
noOfKeyAttr
++
;
desc
->
keyAttr
[
key
].
attributeDescriptor
=
aRec
->
attributeDescriptor
;
Uint32
csNumber
=
(
aRec
->
extPrecision
>>
16
);
if
(
csNumber
)
{
desc
->
keyAttr
[
key
].
charsetInfo
=
all_charsets
[
csNumber
];
ndbrequire
(
all_charsets
[
csNumber
]);
desc
->
hasCharAttr
=
1
;
}
else
{
desc
->
keyAttr
[
key
].
charsetInfo
=
0
;
}
if
(
AttributeDescriptor
::
getDKey
(
aRec
->
attributeDescriptor
))
{
desc
->
noOfDistrKeys
++
;
}
key
++
;
}
tAttr
=
aRec
->
nextAttrInTable
;
}
ndbrequire
(
key
==
tabPtr
.
p
->
noOfPrimkey
);
}
static
...
...
@@ -4448,44 +4486,6 @@ Dbdict::execADD_FRAGREQ(Signal* signal) {
sendSignal
(
DBLQH_REF
,
GSN_LQHFRAGREQ
,
signal
,
LqhFragReq
::
SignalLength
,
JBB
);
}
/**
* Create KeyDescriptor
*/
KeyDescriptor
*
desc
=
g_key_descriptor_pool
.
getPtr
(
tabPtr
.
i
);
new
(
desc
)
KeyDescriptor
();
Uint32
key
=
0
;
Uint32
tAttr
=
tabPtr
.
p
->
firstAttribute
;
while
(
tAttr
!=
RNIL
)
{
jam
();
AttributeRecord
*
aRec
=
c_attributeRecordPool
.
getPtr
(
tAttr
);
if
(
aRec
->
tupleKey
)
{
desc
->
noOfKeyAttr
++
;
desc
->
keyAttr
[
key
].
attributeDescriptor
=
aRec
->
attributeDescriptor
;
Uint32
csNumber
=
(
aRec
->
extPrecision
>>
16
);
if
(
csNumber
)
{
desc
->
keyAttr
[
key
].
charsetInfo
=
all_charsets
[
csNumber
];
ndbrequire
(
all_charsets
[
csNumber
]);
desc
->
hasCharAttr
=
1
;
}
else
{
desc
->
keyAttr
[
key
].
charsetInfo
=
0
;
}
if
(
AttributeDescriptor
::
getDKey
(
aRec
->
attributeDescriptor
))
{
desc
->
noOfDistrKeys
++
;
}
key
++
;
}
tAttr
=
aRec
->
nextAttrInTable
;
}
ndbrequire
(
key
==
tabPtr
.
p
->
noOfPrimkey
);
}
void
...
...
ndb/test/ndbapi/testOperations.cpp
View file @
1cb37294
...
...
@@ -659,6 +659,9 @@ main(int argc, const char** argv){
for
(
Uint32
i
=
0
;
i
<
12
;
i
++
)
{
if
(
i
==
6
||
i
==
8
||
i
==
10
)
continue
;
BaseString
name
(
"bug_9749"
);
name
.
appfmt
(
"_%d"
,
i
);
NDBT_TestCaseImpl1
*
pt
=
new
NDBT_TestCaseImpl1
(
&
ts
,
...
...
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