Additional Fix to BUG#16755251 for 5.1 build failure and

disable testcase due to BUG#17446090

storage/innobase/btr/btr0cur.c

@@ -1336,7 +1336,6 @@ btr_cur_upd_lock_and_undo(
 
 /***************************************************************
 Writes a redo log record of updating a record in-place. */
-UNIV_INLINE
 void
 btr_cur_update_in_place_log(
 /*========================*/

storage/innobase/include/btr0cur.h

@@ -560,7 +560,7 @@ btr_push_update_extern_fields(
 
 /***************************************************************
 Writes a redo log record of updating a record in-place. */
-UNIV_INLINE
+
 void
 btr_cur_update_in_place_log(
 /*========================*/

storage/innodb_plugin/btr/btr0cur.c

@@ -1530,7 +1530,7 @@ btr_cur_upd_lock_and_undo(
 
 /***********************************************************//**
 Writes a redo log record of updating a record in-place. */
-UNIV_INLINE
+UNIV_INTERN
 void
 btr_cur_update_in_place_log(
 /*========================*/

storage/innodb_plugin/include/btr0cur.h

@@ -638,7 +638,7 @@ btr_push_update_extern_fields(
 
 /***********************************************************//**
 Writes a redo log record of updating a record in-place. */
-UNIV_INLINE
+UNIV_INTERN
 void
 btr_cur_update_in_place_log(
 /*========================*/