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
33680fa2
Commit
33680fa2
authored
Apr 02, 2007
by
tomas@whalegate.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction of manual merge
parent
0accd5f2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+4
-4
No files found.
sql/ha_ndbcluster.cc
View file @
33680fa2
...
@@ -8537,7 +8537,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
...
@@ -8537,7 +8537,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
/* Lock mutex and fill list with pointers to all open tables */
/* Lock mutex and fill list with pointers to all open tables */
NDB_SHARE
*
share
;
NDB_SHARE
*
share
;
pthread_mutex_lock
(
&
ndbcluster_mutex
);
pthread_mutex_lock
(
&
ndbcluster_mutex
);
uint
i
,
record_count
=
ndbcluster_open_tables
.
records
;
uint
i
,
open_count
,
record_count
=
ndbcluster_open_tables
.
records
;
if
(
share_list_size
<
record_count
)
if
(
share_list_size
<
record_count
)
{
{
NDB_SHARE
**
new_share_list
=
new
NDB_SHARE
*
[
record_count
];
NDB_SHARE
**
new_share_list
=
new
NDB_SHARE
*
[
record_count
];
...
@@ -8552,7 +8552,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
...
@@ -8552,7 +8552,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
share_list_size
=
record_count
;
share_list_size
=
record_count
;
share_list
=
new_share_list
;
share_list
=
new_share_list
;
}
}
for
(
i
=
0
;
i
<
record_count
;
i
++
)
for
(
i
=
0
,
open_count
=
0
;
i
<
record_count
;
i
++
)
{
{
share
=
(
NDB_SHARE
*
)
hash_element
(
&
ndbcluster_open_tables
,
i
);
share
=
(
NDB_SHARE
*
)
hash_element
(
&
ndbcluster_open_tables
,
i
);
#ifdef HAVE_NDB_BINLOG
#ifdef HAVE_NDB_BINLOG
...
@@ -8567,12 +8567,12 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
...
@@ -8567,12 +8567,12 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
i
,
share
->
table_name
,
share
->
use_count
));
i
,
share
->
table_name
,
share
->
use_count
));
/* Store pointer to table */
/* Store pointer to table */
share_list
[
i
]
=
share
;
share_list
[
open_count
++
]
=
share
;
}
}
pthread_mutex_unlock
(
&
ndbcluster_mutex
);
pthread_mutex_unlock
(
&
ndbcluster_mutex
);
/* Iterate through the open files list */
/* Iterate through the open files list */
for
(
i
=
0
;
i
<
record
_count
;
i
++
)
for
(
i
=
0
;
i
<
open
_count
;
i
++
)
{
{
share
=
share_list
[
i
];
share
=
share_list
[
i
];
#ifdef HAVE_NDB_BINLOG
#ifdef HAVE_NDB_BINLOG
...
...
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