diff options
| author | Satya Bodapati <satya.bodapati@oracle.com> | 2013-09-12 12:28:16 +0530 |
|---|---|---|
| committer | Satya Bodapati <satya.bodapati@oracle.com> | 2013-09-12 12:28:16 +0530 |
| commit | 64a845e0a6e0baa355042c693db833b03e9b6106 (patch) | |
| tree | 25cdcf8f941f12b934cb5ec8986716f886e49f6a | |
| parent | 59402fe0a76bae115c622cc241995180c4bdf4c9 (diff) | |
| download | mariadb-git-64a845e0a6e0baa355042c693db833b03e9b6106.tar.gz | |
Additional Fix to BUG#16755251 for 5.1 build failure and
disable testcase due to BUG#17446090
| -rw-r--r-- | storage/innobase/btr/btr0cur.c | 1 | ||||
| -rw-r--r-- | storage/innobase/include/btr0cur.h | 2 | ||||
| -rw-r--r-- | storage/innodb_plugin/btr/btr0cur.c | 2 | ||||
| -rw-r--r-- | storage/innodb_plugin/include/btr0cur.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c index 4ad4bacdc0f..8704e443099 100644 --- a/storage/innobase/btr/btr0cur.c +++ b/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( /*========================*/ diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h index bab405fa91e..5095fd5e875 100644 --- a/storage/innobase/include/btr0cur.h +++ b/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( /*========================*/ diff --git a/storage/innodb_plugin/btr/btr0cur.c b/storage/innodb_plugin/btr/btr0cur.c index f653929193a..93b150341b0 100644 --- a/storage/innodb_plugin/btr/btr0cur.c +++ b/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( /*========================*/ diff --git a/storage/innodb_plugin/include/btr0cur.h b/storage/innodb_plugin/include/btr0cur.h index 2321d718f03..5d07fffbf8c 100644 --- a/storage/innodb_plugin/include/btr0cur.h +++ b/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( /*========================*/ |