diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-25 18:03:05 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-25 18:03:05 +0300 |
| commit | 52c66b56710046034fc631df4f3a165ba5a704f7 (patch) | |
| tree | b7488b7a2e23cf4b596766c1c84f64235543757a /sql/ha_ndbcluster.cc | |
| parent | 72a26125e21fc4c654a8a1c9c1841f79f62d4d7a (diff) | |
| parent | be0add42f53b23d8a5e279cb3041a3fc93e375a0 (diff) | |
| download | mariadb-git-52c66b56710046034fc631df4f3a165ba5a704f7.tar.gz | |
Manual merge/pull from mysql-next-mr.
Conflicts:
- sql/sql_insert.cc
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index f83e40ec402..2c54fd3688a 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6904,7 +6904,7 @@ int ndbcluster_drop_database_impl(const char *path) while ((tabname=it++)) { tablename_to_filename(tabname, tmp, FN_REFLEN - (tmp - full_path)-1); - VOID(pthread_mutex_lock(&LOCK_open)); + pthread_mutex_lock(&LOCK_open); if (ha_ndbcluster::delete_table(0, ndb, full_path, dbname, tabname)) { const NdbError err= dict->getNdbError(); @@ -6914,7 +6914,7 @@ int ndbcluster_drop_database_impl(const char *path) ret= ndb_to_mysql_error(&err); } } - VOID(pthread_mutex_unlock(&LOCK_open)); + pthread_mutex_unlock(&LOCK_open); } DBUG_RETURN(ret); } |