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
f546ae9f
Commit
f546ae9f
authored
Dec 08, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents
835c7207
6f01db22
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+1
-1
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+1
-1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+7
-2
No files found.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @
f546ae9f
...
...
@@ -479,7 +479,7 @@ Dbdict::packTableIntoPages(SimpleProperties::Writer & w,
CreateFragmentationReq
::
SignalLength
);
ndbrequire
(
signal
->
theData
[
0
]
==
0
);
Uint16
*
data
=
(
Uint16
*
)
&
signal
->
theData
[
25
];
Uint32
count
=
2
+
data
[
0
]
*
data
[
1
];
Uint32
count
=
2
+
(
1
+
data
[
0
])
*
data
[
1
];
w
.
add
(
DictTabInfo
::
ReplicaDataLen
,
2
*
count
);
for
(
Uint32
i
=
0
;
i
<
count
;
i
++
)
data
[
i
]
=
htons
(
data
[
i
]);
...
...
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @
f546ae9f
...
...
@@ -6728,7 +6728,7 @@ void Dbdih::execCREATE_FRAGMENTATION_REQ(Signal * signal)
FragmentstorePtr
fragPtr
;
ReplicaRecordPtr
replicaPtr
;
getFragstore
(
primTabPtr
.
p
,
fragNo
,
fragPtr
);
fragments
[
count
++
]
=
c_nextLogPart
++
;
fragments
[
count
++
]
=
fragPtr
.
p
->
m_log_part_id
;
fragments
[
count
++
]
=
fragPtr
.
p
->
preferredPrimary
;
for
(
replicaPtr
.
i
=
fragPtr
.
p
->
storedReplicas
;
replicaPtr
.
i
!=
RNIL
;
...
...
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file @
f546ae9f
...
...
@@ -2191,9 +2191,14 @@ NdbDictInterface::parseTableInfo(NdbTableImpl ** ret,
impl
->
m_replicaCount
=
replicaCount
;
impl
->
m_fragmentCount
=
fragCount
;
DBUG_PRINT
(
"info"
,
(
"replicaCount=%x , fragCount=%x"
,
replicaCount
,
fragCount
));
for
(
i
=
0
;
i
<
(
Uint32
)
(
fragCount
*
replicaCount
);
i
++
)
Uint32
pos
=
2
;
for
(
i
=
0
;
i
<
(
Uint32
)
fragCount
;
i
++
)
{
impl
->
m_fragments
.
push_back
(
ntohs
(
tableDesc
->
ReplicaData
[
i
+
2
]));
pos
++
;
// skip logpart
for
(
Uint32
j
=
0
;
j
<
(
Uint32
)
replicaCount
;
j
++
)
{
impl
->
m_fragments
.
push_back
(
ntohs
(
tableDesc
->
ReplicaData
[
pos
++
]));
}
}
Uint32
topBit
=
(
1
<<
31
);
...
...
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