diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-10 10:31:33 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-10 10:31:33 +0300 |
| commit | b712dce3d57335d3957afe94d1c3200880aebe99 (patch) | |
| tree | b118b585c21710f0fef58c3d009fdd39a4578791 /sql/ha_ndbcluster.cc | |
| parent | 49bb8cba8e964bec96c1ca9cdc486b3a468dd822 (diff) | |
| parent | d476bbb0becb27d7d3cb1fc5cc0ac4d401622893 (diff) | |
| download | mariadb-git-b712dce3d57335d3957afe94d1c3200880aebe99.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 176eefb25c9..83cceb0da76 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4316,7 +4316,7 @@ int ha_ndbcluster::end_bulk_insert() } else { - IF_DBUG(int res=) trans->restart(); + int res __attribute__((unused))= trans->restart(); DBUG_ASSERT(res == 0); } } @@ -5928,7 +5928,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) { DBUG_PRINT("NDB_SHARE", ("%s temporary use_count: %u", share->key, share->use_count)); - IF_DBUG(int r=) rename_share(share, to); + int r __attribute__((unused))= rename_share(share, to); DBUG_ASSERT(r == 0); } #endif @@ -5952,7 +5952,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) #ifdef HAVE_NDB_BINLOG if (share) { - IF_DBUG(int ret=) rename_share(share, from); + int ret __attribute__((unused))= rename_share(share, from); DBUG_ASSERT(ret == 0); /* ndb_share reference temporary free */ DBUG_PRINT("NDB_SHARE", ("%s temporary free use_count: %u", |