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
91c36268
Commit
91c36268
authored
Feb 14, 2007
by
tomas@poseidon.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
parents
e865b595
f92d3b3a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+1
-1
storage/ndb/src/common/debugger/EventLogger.cpp
storage/ndb/src/common/debugger/EventLogger.cpp
+2
-2
storage/ndb/src/ndbapi/ObjectMap.hpp
storage/ndb/src/ndbapi/ObjectMap.hpp
+7
-6
No files found.
sql/ha_ndbcluster.cc
View file @
91c36268
...
@@ -3810,7 +3810,7 @@ int ha_ndbcluster::info(uint flag)
...
@@ -3810,7 +3810,7 @@ int ha_ndbcluster::info(uint flag)
if
(
flag
&
HA_STATUS_AUTO
)
if
(
flag
&
HA_STATUS_AUTO
)
{
{
DBUG_PRINT
(
"info"
,
(
"HA_STATUS_AUTO"
));
DBUG_PRINT
(
"info"
,
(
"HA_STATUS_AUTO"
));
if
(
m_table
)
if
(
m_table
&&
table
->
found_next_number_field
)
{
{
Ndb
*
ndb
=
get_ndb
();
Ndb
*
ndb
=
get_ndb
();
Ndb_tuple_id_range_guard
g
(
m_share
);
Ndb_tuple_id_range_guard
g
(
m_share
);
...
...
storage/ndb/src/common/debugger/EventLogger.cpp
View file @
91c36268
...
@@ -530,7 +530,7 @@ void getTextUndoLogBlocked(QQQQ) {
...
@@ -530,7 +530,7 @@ void getTextUndoLogBlocked(QQQQ) {
void
getTextTransporterError
(
QQQQ
)
{
void
getTextTransporterError
(
QQQQ
)
{
struct
myTransporterError
{
struct
myTransporterError
{
int
errorNum
;
Uint32
errorNum
;
char
errorString
[
256
];
char
errorString
[
256
];
};
};
int
i
=
0
;
int
i
=
0
;
...
...
storage/ndb/src/ndbapi/ObjectMap.hpp
View file @
91c36268
...
@@ -46,7 +46,7 @@ private:
...
@@ -46,7 +46,7 @@ private:
}
*
m_map
;
}
*
m_map
;
NdbMutex
*
m_mutex
;
NdbMutex
*
m_mutex
;
void
expand
(
Uint32
newSize
);
int
expand
(
Uint32
newSize
);
};
};
inline
inline
...
@@ -73,9 +73,8 @@ NdbObjectIdMap::map(void * object){
...
@@ -73,9 +73,8 @@ NdbObjectIdMap::map(void * object){
// lock();
// lock();
if
(
m_firstFree
==
InvalidId
){
if
(
m_firstFree
==
InvalidId
&&
expand
(
m_expandSize
))
expand
(
m_expandSize
);
return
InvalidId
;
}
Uint32
ff
=
m_firstFree
;
Uint32
ff
=
m_firstFree
;
m_firstFree
=
m_map
[
ff
].
m_next
;
m_firstFree
=
m_map
[
ff
].
m_next
;
...
@@ -127,7 +126,7 @@ NdbObjectIdMap::getObject(Uint32 id){
...
@@ -127,7 +126,7 @@ NdbObjectIdMap::getObject(Uint32 id){
return
0
;
return
0
;
}
}
inline
void
inline
int
NdbObjectIdMap
::
expand
(
Uint32
incSize
){
NdbObjectIdMap
::
expand
(
Uint32
incSize
){
NdbMutex_Lock
(
m_mutex
);
NdbMutex_Lock
(
m_mutex
);
Uint32
newSize
=
m_size
+
incSize
;
Uint32
newSize
=
m_size
+
incSize
;
...
@@ -146,9 +145,11 @@ NdbObjectIdMap::expand(Uint32 incSize){
...
@@ -146,9 +145,11 @@ NdbObjectIdMap::expand(Uint32 incSize){
}
}
else
else
{
{
ndbout_c
(
"NdbObjectIdMap::expand unable to expand!!"
);
NdbMutex_Unlock
(
m_mutex
);
return
-
1
;
}
}
NdbMutex_Unlock
(
m_mutex
);
NdbMutex_Unlock
(
m_mutex
);
return
0
;
}
}
#endif
#endif
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