From e9b3cc0de9b9b66a6cbbcb3844fb73f6f15aafcf Mon Sep 17 00:00:00 2001 From: marko Date: Thu, 23 Feb 2006 13:12:36 +0000 Subject: [PATCH] Add dummy return statements to the #ifdef UNIV_HOTBACKUP branches of some functions that are excluded from InnoDB Hot Backup builds. --- dict/dict0dict.c | 3 +++ row/row0ins.c | 2 ++ row/row0mysql.c | 1 + trx/trx0roll.c | 1 + 4 files changed, 7 insertions(+) diff --git a/dict/dict0dict.c b/dict/dict0dict.c index a7fa9cf9826..bf0a508bb09 100644 --- a/dict/dict0dict.c +++ b/dict/dict0dict.c @@ -2151,6 +2151,7 @@ dict_foreign_find_index( InnoDB Hot Backup builds. Besides, this function should never be called in InnoDB Hot Backup. */ ut_error; + return(NULL); #endif /* UNIV_HOTBACKUP */ } @@ -2548,6 +2549,7 @@ dict_scan_col( InnoDB Hot Backup builds. Besides, this function should never be called in InnoDB Hot Backup. */ ut_error; + return(NULL); #endif /* UNIV_HOTBACKUP */ } @@ -2653,6 +2655,7 @@ dict_scan_table_name( InnoDB Hot Backup builds. Besides, this function should never be called in InnoDB Hot Backup. */ ut_error; + return(NULL); #endif /* UNIV_HOTBACKUP */ } diff --git a/row/row0ins.c b/row/row0ins.c index db3f798b284..d669a71a8e8 100644 --- a/row/row0ins.c +++ b/row/row0ins.c @@ -1751,6 +1751,7 @@ next_rec: InnoDB Hot Backup builds. Besides, this function should never be called in InnoDB Hot Backup. */ ut_error; + return(DB_FAIL); #endif /* UNIV_HOTBACKUP */ } @@ -1894,6 +1895,7 @@ func_exit: InnoDB Hot Backup builds. Besides, this function should never be called in InnoDB Hot Backup. */ ut_error; + return(DB_FAIL); #endif /* UNIV_HOTBACKUP */ } diff --git a/row/row0mysql.c b/row/row0mysql.c index e9719e9e517..605cab26407 100644 --- a/row/row0mysql.c +++ b/row/row0mysql.c @@ -571,6 +571,7 @@ handle_new_error: InnoDB Hot Backup builds. Besides, this function should never be called in InnoDB Hot Backup. */ ut_error; + return(FALSE); #endif /* UNIV_HOTBACKUP */ } diff --git a/trx/trx0roll.c b/trx/trx0roll.c index e7764c5e341..ae145736bdc 100644 --- a/trx/trx0roll.c +++ b/trx/trx0roll.c @@ -109,6 +109,7 @@ trx_general_rollback_for_mysql( InnoDB Hot Backup builds. Besides, this function should never be called in InnoDB Hot Backup. */ ut_error; + return(DB_FAIL); #endif /* UNIV_HOTBACKUP */ }