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
db6591c6
Commit
db6591c6
authored
Jan 27, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
parents
f7606272
3ed97c9d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
16 deletions
+23
-16
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+11
-9
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
+12
-7
No files found.
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @
db6591c6
...
...
@@ -5984,6 +5984,17 @@ void Dbdict::handleTabInfoInit(SimpleProperties::Reader & it,
* Release table
*/
releaseTableObject
(
tablePtr
.
i
,
checkExist
);
return
;
}
if
(
checkExist
&&
tablePtr
.
p
->
m_tablespace_id
!=
RNIL
)
{
/**
* Increase ref count
*/
FilegroupPtr
ptr
;
ndbrequire
(
c_filegroup_hash
.
find
(
ptr
,
tablePtr
.
p
->
m_tablespace_id
));
increase_ref_count
(
ptr
.
p
->
m_obj_ptr_i
);
}
}
//handleTabInfoInit()
...
...
@@ -6238,15 +6249,6 @@ void Dbdict::handleTabInfo(SimpleProperties::Reader & it,
{
tabRequire
(
false
,
CreateTableRef
::
InvalidTablespaceVersion
);
}
{
/**
* Increase ref count
*/
FilegroupPtr
ptr
;
ndbrequire
(
c_filegroup_hash
.
find
(
ptr
,
tablePtr
.
p
->
m_tablespace_id
));
increase_ref_count
(
ptr
.
p
->
m_obj_ptr_i
);
}
}
}
//handleTabInfo()
...
...
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
View file @
db6591c6
...
...
@@ -352,16 +352,21 @@ Dbtup::disk_page_prealloc(Signal* signal,
while
((
pageBits
=
tsman
.
alloc_page_from_extent
(
&
ext
.
p
->
m_key
,
bits
))
<
0
)
if
(
!
list
.
next
(
ext
)
||
++
cnt
==
10
)
break
;
ndbout_c
(
"cnt: %d"
,
cnt
);
if
(
cnt
==
10
||
ext
.
isNull
())
goto
alloc
;
list
.
remove
(
ext
);
alloc
.
m_curr_extent_info_ptr_i
=
ext
.
i
;
ext
.
p
->
m_free_matrix_pos
=
RNIL
;
{
pos
=
RNIL
;
}
else
{
list
.
remove
(
ext
);
alloc
.
m_curr_extent_info_ptr_i
=
ext
.
i
;
ext
.
p
->
m_free_matrix_pos
=
RNIL
;
}
}
else
if
(
pos
==
RNIL
)
{
alloc:
jam
();
/**
* We need to alloc an extent
...
...
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