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
14ec452b
Commit
14ec452b
authored
Mar 24, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
parents
6a582297
6c9727bf
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
22 deletions
+30
-22
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_binlog.cc
+9
-6
storage/ndb/src/kernel/vm/DLFifoList.hpp
storage/ndb/src/kernel/vm/DLFifoList.hpp
+8
-7
storage/ndb/src/kernel/vm/DLList.hpp
storage/ndb/src/kernel/vm/DLList.hpp
+6
-4
storage/ndb/src/kernel/vm/SLList.hpp
storage/ndb/src/kernel/vm/SLList.hpp
+6
-4
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+1
-1
No files found.
sql/ha_ndbcluster_binlog.cc
View file @
14ec452b
...
@@ -765,25 +765,28 @@ static int ndbcluster_create_schema_table(THD *thd)
...
@@ -765,25 +765,28 @@ static int ndbcluster_create_schema_table(THD *thd)
void
ndbcluster_setup_binlog_table_shares
(
THD
*
thd
)
void
ndbcluster_setup_binlog_table_shares
(
THD
*
thd
)
{
{
int
done_find_all_files
=
0
;
int
done_find_all_files
=
0
;
if
(
!
apply_status
_share
&&
if
(
!
schema
_share
&&
ndbcluster_check_
apply_status
_share
()
==
0
)
ndbcluster_check_
schema
_share
()
==
0
)
{
{
if
(
!
done_find_all_files
)
if
(
!
done_find_all_files
)
{
{
ndbcluster_find_all_files
(
thd
);
ndbcluster_find_all_files
(
thd
);
done_find_all_files
=
1
;
done_find_all_files
=
1
;
}
}
ndbcluster_create_apply_status_table
(
thd
);
ndbcluster_create_schema_table
(
thd
);
// always make sure we create the 'schema' first
if
(
!
schema_share
)
return
;
}
}
if
(
!
schema
_share
&&
if
(
!
apply_status
_share
&&
ndbcluster_check_
schema
_share
()
==
0
)
ndbcluster_check_
apply_status
_share
()
==
0
)
{
{
if
(
!
done_find_all_files
)
if
(
!
done_find_all_files
)
{
{
ndbcluster_find_all_files
(
thd
);
ndbcluster_find_all_files
(
thd
);
done_find_all_files
=
1
;
done_find_all_files
=
1
;
}
}
ndbcluster_create_
schema
_table
(
thd
);
ndbcluster_create_
apply_status
_table
(
thd
);
}
}
}
}
...
...
storage/ndb/src/kernel/vm/DLFifoList.hpp
View file @
14ec452b
...
@@ -312,15 +312,16 @@ inline
...
@@ -312,15 +312,16 @@ inline
void
void
DLFifoListImpl
<
P
,
T
,
U
>::
release
()
DLFifoListImpl
<
P
,
T
,
U
>::
release
()
{
{
Ptr
<
T
>
p
;
Ptr
<
T
>
ptr
;
while
(
head
.
firstItem
!=
RNIL
)
Uint32
curr
=
head
.
firstItem
;
while
(
curr
!=
RNIL
)
{
{
p
.
i
=
head
.
firstItem
;
thePool
.
getPtr
(
ptr
,
curr
);
p
.
p
=
thePool
.
getPtr
(
head
.
firstItem
);
curr
=
ptr
.
p
->
U
::
nextList
;
T
*
t
=
p
.
p
;
thePool
.
release
(
ptr
);
head
.
firstItem
=
t
->
U
::
nextList
;
release
(
p
);
}
}
head
.
firstItem
=
RNIL
;
head
.
lastItem
=
RNIL
;
}
}
template
<
typename
P
,
typename
T
,
typename
U
>
template
<
typename
P
,
typename
T
,
typename
U
>
...
...
storage/ndb/src/kernel/vm/DLList.hpp
View file @
14ec452b
...
@@ -332,13 +332,15 @@ void
...
@@ -332,13 +332,15 @@ void
DLListImpl
<
P
,
T
,
U
>::
release
()
DLListImpl
<
P
,
T
,
U
>::
release
()
{
{
Ptr
<
T
>
ptr
;
Ptr
<
T
>
ptr
;
while
((
ptr
.
i
=
head
.
firstItem
)
!=
RNIL
)
Uint32
curr
=
head
.
firstItem
;
while
(
curr
!=
RNIL
)
{
{
thePool
.
getPtr
(
ptr
);
thePool
.
getPtr
(
ptr
,
curr
);
head
.
firstItem
=
ptr
.
p
->
U
::
nextList
;
curr
=
ptr
.
p
->
U
::
nextList
;
thePool
.
release
(
ptr
);
thePool
.
release
(
ptr
);
}
}
}
head
.
firstItem
=
RNIL
;
}
template
<
typename
P
,
typename
T
,
typename
U
>
template
<
typename
P
,
typename
T
,
typename
U
>
inline
inline
...
...
storage/ndb/src/kernel/vm/SLList.hpp
View file @
14ec452b
...
@@ -302,13 +302,15 @@ void
...
@@ -302,13 +302,15 @@ void
SLListImpl
<
P
,
T
,
U
>::
release
()
SLListImpl
<
P
,
T
,
U
>::
release
()
{
{
Ptr
<
T
>
ptr
;
Ptr
<
T
>
ptr
;
while
((
ptr
.
i
=
head
.
firstItem
)
!=
RNIL
)
Uint32
curr
=
head
.
firstItem
;
while
(
curr
!=
RNIL
)
{
{
thePool
.
getPtr
(
ptr
);
thePool
.
getPtr
(
ptr
,
curr
);
head
.
firstItem
=
ptr
.
p
->
U
::
nextList
;
curr
=
ptr
.
p
->
U
::
nextList
;
thePool
.
release
(
ptr
);
thePool
.
release
(
ptr
);
}
}
}
head
.
firstItem
=
RNIL
;
}
template
<
typename
P
,
typename
T
,
typename
U
>
template
<
typename
P
,
typename
T
,
typename
U
>
inline
inline
...
...
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file @
14ec452b
...
@@ -1303,7 +1303,7 @@ NdbDictionaryImpl::fetchGlobalTableImpl(const BaseString& internalTableName)
...
@@ -1303,7 +1303,7 @@ NdbDictionaryImpl::fetchGlobalTableImpl(const BaseString& internalTableName)
int
ret
=
getBlobTables
(
*
impl
);
int
ret
=
getBlobTables
(
*
impl
);
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
delete
impl
;
delete
impl
;
return
0
;
impl
=
0
;
}
}
}
}
...
...
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