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
5e77d287
Commit
5e77d287
authored
Mar 07, 2006
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
parents
23332d0d
a0f82c18
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
4 deletions
+19
-4
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+19
-4
No files found.
sql/ha_ndbcluster.cc
View file @
5e77d287
...
@@ -5995,6 +5995,22 @@ static int ndbcluster_end(ha_panic_function type)
...
@@ -5995,6 +5995,22 @@ static int ndbcluster_end(ha_panic_function type)
delete
g_ndb_cluster_connection
;
delete
g_ndb_cluster_connection
;
g_ndb_cluster_connection
=
NULL
;
g_ndb_cluster_connection
=
NULL
;
#ifdef HAVE_NDB_BINLOG
{
pthread_mutex_lock
(
&
ndbcluster_mutex
);
for
(
uint
i
=
0
;
i
<
ndbcluster_open_tables
.
records
;
i
++
)
{
NDB_SHARE
*
share
=
(
NDB_SHARE
*
)
hash_element
(
&
ndbcluster_open_tables
,
i
);
#ifndef DBUG_OFF
fprintf
(
stderr
,
"NDB: table share %s with use_count %d not freed
\n
"
,
share
->
key
,
share
->
use_count
);
#endif
real_free_share
(
&
share
);
}
pthread_mutex_unlock
(
&
ndbcluster_mutex
);
}
#endif
hash_free
(
&
ndbcluster_open_tables
);
hash_free
(
&
ndbcluster_open_tables
);
pthread_mutex_destroy
(
&
ndbcluster_mutex
);
pthread_mutex_destroy
(
&
ndbcluster_mutex
);
pthread_mutex_destroy
(
&
LOCK_ndb_util_thread
);
pthread_mutex_destroy
(
&
LOCK_ndb_util_thread
);
...
@@ -6843,11 +6859,10 @@ void ndbcluster_real_free_share(NDB_SHARE **share)
...
@@ -6843,11 +6859,10 @@ void ndbcluster_real_free_share(NDB_SHARE **share)
#ifdef HAVE_NDB_BINLOG
#ifdef HAVE_NDB_BINLOG
if
((
*
share
)
->
table
)
if
((
*
share
)
->
table
)
{
{
// (*share)->table->mem_root is freed by closefrm
closefrm
((
*
share
)
->
table
,
0
);
closefrm
((
*
share
)
->
table
,
0
);
#if 0 // todo ?
// (*share)->table_share->mem_root is freed by free_table_share
free_root(&(*share)->table->mem_root, MYF(0));
free_table_share
((
*
share
)
->
table_share
);
#endif
#ifndef DBUG_OFF
#ifndef DBUG_OFF
bzero
((
gptr
)(
*
share
)
->
table_share
,
sizeof
(
*
(
*
share
)
->
table_share
));
bzero
((
gptr
)(
*
share
)
->
table_share
,
sizeof
(
*
(
*
share
)
->
table_share
));
bzero
((
gptr
)(
*
share
)
->
table
,
sizeof
(
*
(
*
share
)
->
table
));
bzero
((
gptr
)(
*
share
)
->
table
,
sizeof
(
*
(
*
share
)
->
table
));
...
...
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