summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-09-15 18:43:07 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2010-09-15 18:43:07 +0300
commit6c0ad7212b710f82554af7f4f8d9d26362d4f3fd (patch)
tree6b726e6af5b9720bfeb4b49ba637b93323d1d137 /storage
parent92c05f1b51953d8cb40a3e829d7411439f5a663b (diff)
downloadmariadb-git-6c0ad7212b710f82554af7f4f8d9d26362d4f3fd.tar.gz
(partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6
Fix compiler warning: row/row0vers.c: In function 'row_vers_impl_x_locked_off_kernel': row/row0vers.c:74:9: error: variable 'err' set but not used [-Werror=unused-but-set-variable]
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/row/row0vers.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/storage/innodb_plugin/row/row0vers.c b/storage/innodb_plugin/row/row0vers.c
index a4fbb5289aa..b6d35363f08 100644
--- a/storage/innodb_plugin/row/row0vers.c
+++ b/storage/innodb_plugin/row/row0vers.c
@@ -71,7 +71,9 @@ row_vers_impl_x_locked_off_kernel(
warning */
trx_t* trx;
ulint rec_del;
+#ifdef UNIV_DEBUG
ulint err;
+#endif /* UNIV_DEBUG */
mtr_t mtr;
ulint comp;
@@ -169,9 +171,12 @@ row_vers_impl_x_locked_off_kernel(
heap2 = heap;
heap = mem_heap_create(1024);
- err = trx_undo_prev_version_build(clust_rec, &mtr, version,
- clust_index, clust_offsets,
- heap, &prev_version);
+#ifdef UNIV_DEBUG
+ err =
+#endif /* UNIV_DEBUG */
+ trx_undo_prev_version_build(clust_rec, &mtr, version,
+ clust_index, clust_offsets,
+ heap, &prev_version);
mem_heap_free(heap2); /* free version and clust_offsets */
if (prev_version == NULL) {