mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

(partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6

Browse source 
Fix compiler warning:
row/row0upd.c: In function 'row_upd_in_place_in_select':
row/row0upd.c:2040:9: error: variable 'err' set but not used [-Werror=unused-but-set-variable]
This commit is contained in:
Vasil Dimov 2010-09-14 14:46:13 +03:00
parent 67c388410b
commit c283946dd6
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/innobase/row/row0upd.c
View file

@ -2037,7 +2037,9 @@ row_upd_in_place_in_select(
upd_node_t* node; upd_node_t* node;
btr_pcur_t* pcur; btr_pcur_t* pcur;
btr_cur_t* btr_cur; btr_cur_t* btr_cur;
#ifdef UNIV_DEBUG
ulint err; ulint err;
#endif /* UNIV_DEBUG */
mem_heap_t* heap = NULL; mem_heap_t* heap = NULL;
ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint offsets_[REC_OFFS_NORMAL_SIZE];
*offsets_ = (sizeof offsets_) / sizeof *offsets_; *offsets_ = (sizeof offsets_) / sizeof *offsets_;
@ -2074,7 +2076,10 @@ row_upd_in_place_in_select(
ut_ad(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE); ut_ad(node->cmpl_info & UPD_NODE_NO_ORD_CHANGE);
ut_ad(node->select_will_do_update); ut_ad(node->select_will_do_update);
err = btr_cur_update_in_place(BTR_NO_LOCKING_FLAG, btr_cur, #ifdef UNIV_DEBUG
err =
#endif /* UNIV_DEBUG */
btr_cur_update_in_place(BTR_NO_LOCKING_FLAG, btr_cur,
node->update, node->cmpl_info, node->update, node->cmpl_info,
thr, mtr); thr, mtr);
ut_ad(err == DB_SUCCESS); ut_ad(err == DB_SUCCESS);