#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:vasil.dimov@strippedfg6wq7q3d12
3603 Marko Mäkelä 2011-04-21
Fix the UNIV_HOTBACKUP build.
modified:
storage/innobase/dict/dict0dict.c
storage/innobase/include/dict0dict.h
storage/innobase/include/log0recv.h
storage/innobase/include/srv0mon.h
storage/innobase/include/trx0sys.h
storage/innobase/include/univ.i
storage/innobase/log/log0recv.c
storage/innobase/os/os0file.c
storage/innobase/page/page0zip.c
storage/innobase/srv/srv0mon.c
=== modified file 'storage/innobase/dict/dict0dict.c'
--- a/storage/innobase/dict/dict0dict.c revid:vasil.dimov@stripped0-q808ffg6wq7q3d12
+++ b/storage/innobase/dict/dict0dict.c revid:marko.makela@strippedcfj583
@@ -5473,9 +5473,8 @@ dict_close(void)
rw_lock_free(&dict_table_stats_latches[i]);
}
}
-#endif /* !UNIV_HOTBACKUP */
-#ifdef UNIV_DEBUG
+# ifdef UNIV_DEBUG
/**********************************************************************//**
Validate the dictionary table LRU list.
@return TRUE if valid */
@@ -5560,4 +5559,5 @@ dict_non_lru_find_table(
return(FALSE);
}
-#endif /* UNIV_DEBUG */
+# endif /* UNIV_DEBUG */
+#endif /* !UNIV_HOTBACKUP */
=== modified file 'storage/innobase/include/dict0dict.h'
--- a/storage/innobase/include/dict0dict.h revid:vasil.dimov@stripped
+++ b/storage/innobase/include/dict0dict.h revid:marko.makela@stripped
@@ -688,6 +688,7 @@ ulint
dict_table_zip_size(
/*================*/
const dict_table_t* table); /*!< in: table */
+#ifndef UNIV_HOTBACKUP
/*********************************************************************//**
Obtain exclusive locks on all index trees of the table. This is to prevent
accessing index trees while InnoDB is updating internal metadata for
@@ -714,7 +715,6 @@ dict_table_col_in_clustered_key(
/*============================*/
const dict_table_t* table, /*!< in: table */
ulint n); /*!< in: column number */
-#ifndef UNIV_HOTBACKUP
/*******************************************************************//**
Copies types of columns contained in table to tuple and sets all
fields of the tuple to the SQL NULL value. This function should
=== modified file 'storage/innobase/include/log0recv.h'
--- a/storage/innobase/include/log0recv.h revid:vasil.dimov@strippedq7q3d12
+++ b/storage/innobase/include/log0recv.h revid:marko.makela@stripped
@@ -40,19 +40,17 @@ Reads the checkpoint info needed in hot
@return TRUE if success */
UNIV_INTERN
ibool
-recv_read_cp_info_for_backup(
-/*=========================*/
+recv_read_checkpoint_info_for_backup(
+/*=================================*/
const byte* hdr, /*!< in: buffer containing the log group
header */
lsn_t* lsn, /*!< out: checkpoint lsn */
lsn_t* offset, /*!< out: checkpoint offset in the log group */
- ulint* fsp_limit,/*!< out: fsp limit of space 0,
- 1000000000 if the database is running
- with < version 3.23.50 of InnoDB */
- ib_uint64_t* cp_no, /*!< out: checkpoint number */
- lsn_t* first_header_lsn);
+ lsn_t* cp_no, /*!< out: checkpoint number */
+ lsn_t* first_header_lsn)
/*!< out: lsn of of the start of the
first log file */
+ __attribute__((nonnull));
/*******************************************************************//**
Scans the log segment and n_bytes_scanned is set to the length of valid
log scanned. */
=== modified file 'storage/innobase/include/srv0mon.h'
--- a/storage/innobase/include/srv0mon.h revid:vasil.dimov@stripped
+++ b/storage/innobase/include/srv0mon.h revid:marko.makela@stripped
@@ -28,6 +28,7 @@ Created 12/15/2009 Jimmy Yang
#define srv0mon_h
#include "univ.i"
+#ifndef UNIV_HOTBACKUP
/** Possible status values for "mon_status" in "struct monitor_value" */
@@ -754,5 +755,9 @@ srv_mon_default_on(void);
#ifndef UNIV_NONINL
#include "srv0mon.ic"
#endif
+#else /* !UNIV_HOTBACKUP */
+# define MONITOR_INC(x) ((void) 0)
+# define MONITOR_DEC(x) ((void) 0)
+#endif /* !UNIV_HOTBACKUP */
#endif
=== modified file 'storage/innobase/include/trx0sys.h'
--- a/storage/innobase/include/trx0sys.h revid:vasil.dimov@stripped7q3d12
+++ b/storage/innobase/include/trx0sys.h revid:marko.makela@stripped
@@ -379,14 +379,12 @@ UNIV_INTERN
void
trx_sys_file_format_tag_init(void);
/*==============================*/
-#ifndef UNIV_HOTBACKUP
/*****************************************************************//**
Shutdown/Close the transaction system. */
UNIV_INTERN
void
trx_sys_close(void);
/*===============*/
-#endif /* !UNIV_HOTBACKUP */
/*****************************************************************//**
Get the name representation of the file format from its id.
@return pointer to the name */
@@ -406,31 +404,28 @@ trx_sys_file_format_max_set(
ulint format_id, /*!< in: file format id */
const char** name); /*!< out: max file format name or
NULL if not needed. */
-/*****************************************************************//**
-Get the name representation of the file format from its id.
-@return pointer to the max format name */
+/*********************************************************************
+Creates the rollback segments */
UNIV_INTERN
-const char*
-trx_sys_file_format_max_get(void);
-/*=============================*/
+void
+trx_sys_create_rsegs(
+/*=================*/
+ ulint n_rsegs); /*!< number of rollback segments to create */
/*****************************************************************//**
-Check for the max file format tag stored on disk.
-@return DB_SUCCESS or error code */
-UNIV_INTERN
+Get the number of transaction in the system, independent of their state.
+@return count of transactions in trx_sys_t::trx_list */
+UNIV_INLINE
ulint
-trx_sys_file_format_max_check(
-/*==========================*/
- ulint max_format_id); /*!< in: the max format id to check */
-/********************************************************************//**
-Update the file format tag in the system tablespace only if the given
-format id is greater than the known max id.
-@return TRUE if format_id was bigger than the known max id */
+trx_sys_get_n_trx(void);
+/*===================*/
+
+/*********************************************************************
+Check if there are any active (non-prepared) transactions.
+@return total number of active transactions or 0 if none */
UNIV_INTERN
-ibool
-trx_sys_file_format_max_upgrade(
-/*============================*/
- const char** name, /*!< out: max file format name */
- ulint format_id); /*!< in: file format identifier */
+ulint
+trx_sys_any_active_transactions(void);
+/*=================================*/
#else /* !UNIV_HOTBACKUP */
/*****************************************************************//**
Prints to stderr the MySQL binlog info in the system header if the
@@ -467,6 +462,32 @@ trx_sys_read_pertable_file_format_id(
datafile */
ulint *format_id); /*!< out: file format of the per-table
data file */
+#endif /* !UNIV_HOTBACKUP */
+/*****************************************************************//**
+Get the name representation of the file format from its id.
+@return pointer to the max format name */
+UNIV_INTERN
+const char*
+trx_sys_file_format_max_get(void);
+/*=============================*/
+/*****************************************************************//**
+Check for the max file format tag stored on disk.
+@return DB_SUCCESS or error code */
+UNIV_INTERN
+ulint
+trx_sys_file_format_max_check(
+/*==========================*/
+ ulint max_format_id); /*!< in: the max format id to check */
+/********************************************************************//**
+Update the file format tag in the system tablespace only if the given
+format id is greater than the known max id.
+@return TRUE if format_id was bigger than the known max id */
+UNIV_INTERN
+ibool
+trx_sys_file_format_max_upgrade(
+/*============================*/
+ const char** name, /*!< out: max file format name */
+ ulint format_id); /*!< in: file format identifier */
/*****************************************************************//**
Get the name representation of the file format from its id.
@return pointer to the name */
@@ -476,31 +497,6 @@ trx_sys_file_format_id_to_name(
/*===========================*/
const ulint id); /*!< in: id of the file format */
-#endif /* !UNIV_HOTBACKUP */
-
-/*********************************************************************
-Creates the rollback segments */
-UNIV_INTERN
-void
-trx_sys_create_rsegs(
-/*=================*/
- ulint n_rsegs); /*!< number of rollback segments to create */
-/*****************************************************************//**
-Get the number of transaction in the system, independent of their state.
-@return count of transactions in trx_sys_t::trx_list */
-UNIV_INLINE
-ulint
-trx_sys_get_n_trx(void);
-/*===================*/
-
-/*********************************************************************
-Check if there are any active (non-prepared) transactions.
-@return total number of active transactions or 0 if none */
-UNIV_INTERN
-ulint
-trx_sys_any_active_transactions(void);
-/*=================================*/
-
#ifdef UNIV_DEBUG
/*************************************************************//**
Validate the trx_sys_t::trx_list. */
=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i revid:vasil.dimov@oracle.com-20110421081100-q808ffg6wq7q3d12
+++ b/storage/innobase/include/univ.i revid:marko.makela@stripped10421092445-13329p4tqicfj583
@@ -132,7 +132,7 @@ Sun Studio */
/* Following defines are to enable performance schema
instrumentation in each of four InnoDB modules if
HAVE_PSI_INTERFACE is defined. */
-#ifdef HAVE_PSI_INTERFACE
+#if defined HAVE_PSI_INTERFACE && !defined UNIV_HOTBACKUP
# define UNIV_PFS_MUTEX
# define UNIV_PFS_RWLOCK
/* For I/O instrumentation, performance schema rely
=== modified file 'storage/innobase/log/log0recv.c'
--- a/storage/innobase/log/log0recv.c revid:vasil.dimov@stripped-20110421081100-q808ffg6wq7q3d12
+++ b/storage/innobase/log/log0recv.c revid:marko.makela@stripped5-13329p4tqicfj583
@@ -768,8 +768,8 @@ recv_read_checkpoint_info_for_backup(
header */
lsn_t* lsn, /*!< out: checkpoint lsn */
lsn_t* offset, /*!< out: checkpoint offset in the log group */
- ib_uint64_t* cp_no, /*!< out: checkpoint number */
- ib_uint64_t* first_header_lsn)
+ lsn_t* cp_no, /*!< out: checkpoint number */
+ lsn_t* first_header_lsn)
/*!< out: lsn of of the start of the
first log file */
{
=== modified file 'storage/innobase/os/os0file.c'
--- a/storage/innobase/os/os0file.c revid:vasil.dimov@strippedwq7q3d12
+++ b/storage/innobase/os/os0file.c revid:marko.makela@stripped
@@ -304,6 +304,7 @@ UNIV_INTERN ulint os_n_pending_writes =
UNIV_INTERN ulint os_n_pending_reads = 0;
#ifdef UNIV_DEBUG
+# ifndef UNIV_HOTBACKUP
/**********************************************************************//**
Validates the consistency the aio system some of the time.
@return TRUE if ok or the check was skipped */
@@ -330,6 +331,7 @@ os_aio_validate_skip(void)
os_aio_validate_count = OS_AIO_VALIDATE_SKIP;
return(os_aio_validate());
}
+# endif /* !UNIV_HOTBACKUP */
#endif /* UNIV_DEBUG */
#ifdef __WIN__
=== modified file 'storage/innobase/page/page0zip.c'
--- a/storage/innobase/page/page0zip.c revid:vasil.dimov@stripped
+++ b/storage/innobase/page/page0zip.c revid:marko.makela@oracle.com-20110421092445-13329p4tqicfj583
@@ -46,7 +46,6 @@ Created June 2005 by Marko Makela
#else /* !UNIV_HOTBACKUP */
# define lock_move_reorganize_page(block, temp_block) ((void) 0)
# define buf_LRU_stat_inc_unzip() ((void) 0)
-# define MONITOR_INC(x) ((void) 0)
#endif /* !UNIV_HOTBACKUP */
#ifndef UNIV_HOTBACKUP
=== modified file 'storage/innobase/srv/srv0mon.c'
--- a/storage/innobase/srv/srv0mon.c revid:vasil.dimov@stripped421081100-q808ffg6wq7q3d12
+++ b/storage/innobase/srv/srv0mon.c revid:marko.makela@strippedp4tqicfj583
@@ -23,6 +23,7 @@ Database monitor counter interfaces
Created 12/9/2009 Jimmy Yang
*******************************************************/
+#ifndef UNIV_HOTBACKUP
#include "os0file.h"
#include "mach0data.h"
#include "srv0mon.h"
@@ -1520,4 +1521,4 @@ srv_mon_default_on(void)
}
}
}
-
+#endif /* !UNIV_HOTBACKUP */
Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20110421092445-13329p4tqicfj583.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk-innodb branch (marko.makela:3603) | marko.makela | 21 Apr |
