Skip to content

M
mariadb
Commit 7f51ff1d authored by marko's avatar marko
Browse files
Options

branches/zip: Remove references to UNIV_HOTBACKUP from files that are 

not used when building InnoDB Hot Backup.  Declare
innobase_invalidate_query_cache() in ha_prototypes.h.
parent 27977e1b
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 210 deletions
dict/dict0crea.c
View file @ 7f51ff1d
...@@ -1156,7 +1156,6 @@ function_exit: ...@@ -1156,7 +1156,6 @@ function_exit:
return(thr); return(thr);
} }
#ifndef UNIV_HOTBACKUP
/******************************************************************** /********************************************************************
Creates the foreign key constraints system tables inside InnoDB Creates the foreign key constraints system tables inside InnoDB
at database creation or database start if they are not found or are at database creation or database start if they are not found or are
...@@ -1500,4 +1499,3 @@ dict_create_add_foreigns_to_dictionary( ...@@ -1500,4 +1499,3 @@ dict_create_add_foreigns_to_dictionary(
return(DB_SUCCESS); return(DB_SUCCESS);
} }
#endif /* !UNIV_HOTBACKUP */
dict/dict0load.c
View file @ 7f51ff1d
...@@ -24,9 +24,7 @@ Created 4/24/1996 Heikki Tuuri ...@@ -24,9 +24,7 @@ Created 4/24/1996 Heikki Tuuri
*******************************************************/ *******************************************************/
#include "dict0load.h" #include "dict0load.h"
#ifndef UNIV_HOTBACKUP
#include "mysql_version.h" #include "mysql_version.h"
#endif /* !UNIV_HOTBACKUP */
#ifdef UNIV_NONINL #ifdef UNIV_NONINL
#include "dict0load.ic" #include "dict0load.ic"
...@@ -960,7 +958,7 @@ err_exit: ...@@ -960,7 +958,7 @@ err_exit:
mem_heap_empty(heap); mem_heap_empty(heap);
err = dict_load_indexes(table, heap); err = dict_load_indexes(table, heap);
#ifndef UNIV_HOTBACKUP
/* If the force recovery flag is set, we open the table irrespective /* If the force recovery flag is set, we open the table irrespective
of the error condition, since the user may want to dump data from the of the error condition, since the user may want to dump data from the
clustered index. However we load the foreign key information only if clustered index. However we load the foreign key information only if
...@@ -971,7 +969,7 @@ err_exit: ...@@ -971,7 +969,7 @@ err_exit:
dict_table_remove_from_cache(table); dict_table_remove_from_cache(table);
table = NULL; table = NULL;
} }
# if 0 #if 0
if (err != DB_SUCCESS && table != NULL) { if (err != DB_SUCCESS && table != NULL) {
mutex_enter(&dict_foreign_err_mutex); mutex_enter(&dict_foreign_err_mutex);
...@@ -994,8 +992,7 @@ err_exit: ...@@ -994,8 +992,7 @@ err_exit:
mutex_exit(&dict_foreign_err_mutex); mutex_exit(&dict_foreign_err_mutex);
} }
# endif /* 0 */ #endif /* 0 */
#endif /* !UNIV_HOTBACKUP */
mem_heap_free(heap); mem_heap_free(heap);
return(table); return(table);
...@@ -1113,7 +1110,6 @@ dict_load_sys_table( ...@@ -1113,7 +1110,6 @@ dict_load_sys_table(
mem_heap_free(heap); mem_heap_free(heap);
} }
#ifndef UNIV_HOTBACKUP
/************************************************************************ /************************************************************************
Loads foreign key constraint col names (also for the referenced table). */ Loads foreign key constraint col names (also for the referenced table). */
static static
...@@ -1457,4 +1453,3 @@ load_next_index: ...@@ -1457,4 +1453,3 @@ load_next_index:
return(DB_SUCCESS); return(DB_SUCCESS);
} }
#endif /* !UNIV_HOTBACKUP */
handler/ha_innodb.cc
View file @ 7f51ff1d
...@@ -1583,20 +1583,20 @@ innobase_query_caching_of_table_permitted( ...@@ -1583,20 +1583,20 @@ innobase_query_caching_of_table_permitted(
} }
/********************************************************************* /*********************************************************************
Invalidates the MySQL query cache for the table. Invalidates the MySQL query cache for the table. */
NOTE that the exact prototype of this function has to be in
/innobase/row/row0ins.c! */
extern "C" UNIV_INTERN extern "C" UNIV_INTERN
void void
innobase_invalidate_query_cache( innobase_invalidate_query_cache(
/*============================*/ /*============================*/
trx_t* trx, /* in: transaction which modifies the table */ trx_t* trx, /* in: transaction which
char* full_name, /* in: concatenation of database name, null modifies the table */
char '\0', table name, null char'\0'; const char* full_name, /* in: concatenation of
NOTE that in Windows this is always database name, null char '\0',
in LOWER CASE! */ table name, null char '\0';
ulint full_name_len) /* in: full name length where also the null NOTE that in Windows this is
chars count */ always in LOWER CASE! */
ulint full_name_len) /* in: full name length where
also the null chars count */
{ {
/* Note that the sync0sync.h rank of the query cache mutex is just /* Note that the sync0sync.h rank of the query cache mutex is just
above the InnoDB kernel mutex. The caller of this function must not above the InnoDB kernel mutex. The caller of this function must not
...@@ -1605,7 +1605,7 @@ innobase_invalidate_query_cache( ...@@ -1605,7 +1605,7 @@ innobase_invalidate_query_cache(
/* Argument TRUE below means we are using transactions */ /* Argument TRUE below means we are using transactions */
#ifdef HAVE_QUERY_CACHE #ifdef HAVE_QUERY_CACHE
mysql_query_cache_invalidate4((THD*) trx->mysql_thd, mysql_query_cache_invalidate4((THD*) trx->mysql_thd,
(const char*) full_name, full_name,
(uint32) full_name_len, (uint32) full_name_len,
TRUE); TRUE);
#endif #endif
......
include/dict0crea.h
View file @ 7f51ff1d
...@@ -97,7 +97,6 @@ dict_drop_index_tree( ...@@ -97,7 +97,6 @@ dict_drop_index_tree(
rec_t* rec, /* in/out: record in the clustered index rec_t* rec, /* in/out: record in the clustered index
of SYS_INDEXES table */ of SYS_INDEXES table */
mtr_t* mtr); /* in: mtr having the latch on the record page */ mtr_t* mtr); /* in: mtr having the latch on the record page */
#ifndef UNIV_HOTBACKUP
/******************************************************************** /********************************************************************
Creates the foreign key constraints system tables inside InnoDB Creates the foreign key constraints system tables inside InnoDB
at database creation or database start if they are not found or are at database creation or database start if they are not found or are
...@@ -129,7 +128,6 @@ dict_create_add_foreigns_to_dictionary( ...@@ -129,7 +128,6 @@ dict_create_add_foreigns_to_dictionary(
was generated here */ was generated here */
dict_table_t* table, /* in: table */ dict_table_t* table, /* in: table */
trx_t* trx); /* in: transaction */ trx_t* trx); /* in: transaction */
#endif /* !UNIV_HOTBACKUP */
/* Table create node structure */ /* Table create node structure */
......
include/dict0load.h
View file @ 7f51ff1d
...@@ -87,7 +87,6 @@ void ...@@ -87,7 +87,6 @@ void
dict_load_sys_table( dict_load_sys_table(
/*================*/ /*================*/
dict_table_t* table); /* in: system table */ dict_table_t* table); /* in: system table */
#ifndef UNIV_HOTBACKUP
/*************************************************************************** /***************************************************************************
Loads foreign key constraints where the table is either the foreign key Loads foreign key constraints where the table is either the foreign key
holder or where the table is referenced by a foreign key. Adds these holder or where the table is referenced by a foreign key. Adds these
...@@ -102,7 +101,6 @@ dict_load_foreigns( ...@@ -102,7 +101,6 @@ dict_load_foreigns(
const char* table_name, /* in: table name */ const char* table_name, /* in: table name */
ibool check_charsets);/* in: TRUE=check charsets ibool check_charsets);/* in: TRUE=check charsets
compatibility */ compatibility */
#endif /* !UNIV_HOTBACKUP */
/************************************************************************ /************************************************************************
Prints to the standard output information on all tables found in the data Prints to the standard output information on all tables found in the data
dictionary system table. */ dictionary system table. */
......
include/ha_prototypes.h
View file @ 7f51ff1d
...@@ -19,9 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA ...@@ -19,9 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#ifndef HA_INNODB_PROTOTYPES_H #ifndef HA_INNODB_PROTOTYPES_H
#define HA_INNODB_PROTOTYPES_H #define HA_INNODB_PROTOTYPES_H
#ifndef UNIV_HOTBACKUP #include "trx0types.h"
#include "univ.i" /* ulint, uint */
#include "m_ctype.h" /* CHARSET_INFO */ #include "m_ctype.h" /* CHARSET_INFO */
/* Prototypes for global functions in ha_innodb.cc that are called by /* Prototypes for global functions in ha_innodb.cc that are called by
...@@ -64,6 +62,22 @@ innobase_raw_format( ...@@ -64,6 +62,22 @@ innobase_raw_format(
ulint buf_size); /* in: output buffer size ulint buf_size); /* in: output buffer size
in bytes */ in bytes */
/*********************************************************************
Invalidates the MySQL query cache for the table. */
UNIV_INTERN
void
innobase_invalidate_query_cache(
/*============================*/
trx_t* trx, /* in: transaction which
modifies the table */
const char* full_name, /* in: concatenation of
database name, null char '\0',
table name, null char '\0';
NOTE that in Windows this is
always in LOWER CASE! */
ulint full_name_len); /* in: full name length where
also the null chars count */
/********************************************************************* /*********************************************************************
Convert a table or index name to the MySQL system_charset_info (UTF-8) Convert a table or index name to the MySQL system_charset_info (UTF-8)
and quote it if needed. */ and quote it if needed. */
...@@ -264,4 +278,3 @@ thd_lock_wait_timeout( ...@@ -264,4 +278,3 @@ thd_lock_wait_timeout(
the global innodb_lock_wait_timeout */ the global innodb_lock_wait_timeout */
#endif #endif
#endif
include/os0sync.ic
View file @ 7f51ff1d
...@@ -42,13 +42,6 @@ os_fast_mutex_trylock( ...@@ -42,13 +42,6 @@ os_fast_mutex_trylock(
EnterCriticalSection(fast_mutex); EnterCriticalSection(fast_mutex);
return(0); return(0);
#else
#if defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10)
/* Since the hot backup version is standalone, MySQL does not redefine
pthread_mutex_trylock for HP-UX-10.20, and consequently we must invert
the return value here */
return((ulint) (1 - pthread_mutex_trylock(fast_mutex)));
#else #else
/* NOTE that the MySQL my_pthread.h redefines pthread_mutex_trylock /* NOTE that the MySQL my_pthread.h redefines pthread_mutex_trylock
so that it returns 0 on success. In the operating system so that it returns 0 on success. In the operating system
...@@ -58,5 +51,4 @@ os_fast_mutex_trylock( ...@@ -58,5 +51,4 @@ os_fast_mutex_trylock(
return((ulint) pthread_mutex_trylock(fast_mutex)); return((ulint) pthread_mutex_trylock(fast_mutex));
#endif #endif
#endif
} }
include/rem0cmp.h
View file @ 7f51ff1d
...@@ -141,7 +141,6 @@ cmp_dtuple_is_prefix_of_rec( ...@@ -141,7 +141,6 @@ cmp_dtuple_is_prefix_of_rec(
const dtuple_t* dtuple, /* in: data tuple */ const dtuple_t* dtuple, /* in: data tuple */
const rec_t* rec, /* in: physical record */ const rec_t* rec, /* in: physical record */
const ulint* offsets);/* in: array returned by rec_get_offsets() */ const ulint* offsets);/* in: array returned by rec_get_offsets() */
#ifndef UNIV_HOTBACKUP
/***************************************************************** /*****************************************************************
Compare two physical records that contain the same number of columns, Compare two physical records that contain the same number of columns,
none of which are stored externally. */ none of which are stored externally. */
...@@ -156,7 +155,6 @@ cmp_rec_rec_simple( ...@@ -156,7 +155,6 @@ cmp_rec_rec_simple(
const ulint* offsets1,/* in: rec_get_offsets(rec1, index) */ const ulint* offsets1,/* in: rec_get_offsets(rec1, index) */
const ulint* offsets2,/* in: rec_get_offsets(rec2, index) */ const ulint* offsets2,/* in: rec_get_offsets(rec2, index) */
const dict_index_t* index); /* in: data dictionary index */ const dict_index_t* index); /* in: data dictionary index */
#endif /* !UNIV_HOTBACKUP */
/***************************************************************** /*****************************************************************
This function is used to compare two physical records. Only the common This function is used to compare two physical records. Only the common
first fields are compared, and if an externally stored field is first fields are compared, and if an externally stored field is
......
include/row0mysql.h
View file @ 7f51ff1d
...@@ -351,7 +351,6 @@ void ...@@ -351,7 +351,6 @@ void
row_mysql_unfreeze_data_dictionary( row_mysql_unfreeze_data_dictionary(
/*===============================*/ /*===============================*/
trx_t* trx); /* in/out: transaction */ trx_t* trx); /* in/out: transaction */
#ifndef UNIV_HOTBACKUP
/************************************************************************* /*************************************************************************
Creates a table for MySQL. If the name of the table ends in Creates a table for MySQL. If the name of the table ends in
one of "innodb_monitor", "innodb_lock_monitor", "innodb_tablespace_monitor", one of "innodb_monitor", "innodb_lock_monitor", "innodb_tablespace_monitor",
...@@ -502,7 +501,6 @@ row_check_table_for_mysql( ...@@ -502,7 +501,6 @@ row_check_table_for_mysql(
/* out: DB_ERROR or DB_SUCCESS */ /* out: DB_ERROR or DB_SUCCESS */
row_prebuilt_t* prebuilt); /* in: prebuilt struct in MySQL row_prebuilt_t* prebuilt); /* in: prebuilt struct in MySQL
handle */ handle */
#endif /* !UNIV_HOTBACKUP */
/************************************************************************* /*************************************************************************
Determines if a table is a magic monitor table. */ Determines if a table is a magic monitor table. */
......
include/sync0sync.h
View file @ 7f51ff1d
...@@ -40,9 +40,7 @@ Created 9/5/1995 Heikki Tuuri ...@@ -40,9 +40,7 @@ Created 9/5/1995 Heikki Tuuri
#include "os0sync.h" #include "os0sync.h"
#include "sync0arr.h" #include "sync0arr.h"
#ifndef UNIV_HOTBACKUP
extern my_bool timed_mutexes; extern my_bool timed_mutexes;
#endif /* UNIV_HOTBACKUP */
/********************************************************************** /**********************************************************************
Initializes the synchronization data structures. */ Initializes the synchronization data structures. */
...@@ -515,9 +513,8 @@ struct mutex_struct { ...@@ -515,9 +513,8 @@ struct mutex_struct {
ulint magic_n; ulint magic_n;
# define MUTEX_MAGIC_N (ulint)979585 # define MUTEX_MAGIC_N (ulint)979585
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#ifndef UNIV_HOTBACKUP
ulong count_os_wait; /* count of os_wait */ ulong count_os_wait; /* count of os_wait */
# ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
ulong count_using; /* count of times mutex used */ ulong count_using; /* count of times mutex used */
ulong count_spin_loop; /* count of spin loops */ ulong count_spin_loop; /* count of spin loops */
ulong count_spin_rounds; /* count of spin rounds */ ulong count_spin_rounds; /* count of spin rounds */
...@@ -526,8 +523,7 @@ struct mutex_struct { ...@@ -526,8 +523,7 @@ struct mutex_struct {
ulonglong lmax_spent_time; /* mutex os_wait timer msec */ ulonglong lmax_spent_time; /* mutex os_wait timer msec */
const char* cmutex_name;/* mutex name */ const char* cmutex_name;/* mutex name */
ulint mutex_type;/* 0 - usual mutex 1 - rw_lock mutex */ ulint mutex_type;/* 0 - usual mutex 1 - rw_lock mutex */
# endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#endif /* !UNIV_HOTBACKUP */
}; };
/* The global array of wait cells for implementation of the databases own /* The global array of wait cells for implementation of the databases own
......
include/sync0sync.ic
View file @ 7f51ff1d
...@@ -254,9 +254,7 @@ mutex_enter_func( ...@@ -254,9 +254,7 @@ mutex_enter_func(
/* Note that we do not peek at the value of lock_word before trying /* Note that we do not peek at the value of lock_word before trying
the atomic test_and_set; we could peek, and possibly save time. */ the atomic test_and_set; we could peek, and possibly save time. */
#if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP ut_d(mutex->count_using++);
mutex->count_using++;
#endif /* UNIV_DEBUG && !UNIV_HOTBACKUP */
if (!mutex_test_and_set(mutex)) { if (!mutex_test_and_set(mutex)) {
ut_d(mutex->thread_id = os_thread_get_curr_id()); ut_d(mutex->thread_id = os_thread_get_curr_id());
......
lock/lock0lock.c
View file @ 7f51ff1d
...@@ -1438,7 +1438,6 @@ lock_rec_has_expl( ...@@ -1438,7 +1438,6 @@ lock_rec_has_expl(
} }
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
# ifndef UNIV_HOTBACKUP
/************************************************************************* /*************************************************************************
Checks if some other transaction has a lock request in the queue. */ Checks if some other transaction has a lock request in the queue. */
static static
...@@ -1485,7 +1484,6 @@ lock_rec_other_has_expl_req( ...@@ -1485,7 +1484,6 @@ lock_rec_other_has_expl_req(
return(NULL); return(NULL);
} }
# endif /* !UNIV_HOTBACKUP */
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
/************************************************************************* /*************************************************************************
...@@ -4330,8 +4328,6 @@ lock_rec_print( ...@@ -4330,8 +4328,6 @@ lock_rec_print(
} }
} }
#ifndef UNIV_HOTBACKUP
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
/* Print the number of lock structs from lock_print_info_summary() only /* Print the number of lock structs from lock_print_info_summary() only
in non-production builds for performance reasons, see in non-production builds for performance reasons, see
...@@ -4575,7 +4571,7 @@ loop: ...@@ -4575,7 +4571,7 @@ loop:
goto loop; goto loop;
} }
# ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
/************************************************************************* /*************************************************************************
Validates the lock queue on a table. */ Validates the lock queue on a table. */
static static
...@@ -4910,8 +4906,7 @@ lock_validate(void) ...@@ -4910,8 +4906,7 @@ lock_validate(void)
return(TRUE); return(TRUE);
} }
# endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#endif /* !UNIV_HOTBACKUP */
/*============ RECORD LOCK CHECKS FOR ROW OPERATIONS ====================*/ /*============ RECORD LOCK CHECKS FOR ROW OPERATIONS ====================*/
/************************************************************************* /*************************************************************************
......
os/os0sync.c
View file @ 7f51ff1d
...@@ -161,12 +161,8 @@ os_event_create( ...@@ -161,12 +161,8 @@ os_event_create(
os_fast_mutex_init(&(event->os_mutex)); os_fast_mutex_init(&(event->os_mutex));
#if defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10)
ut_a(0 == pthread_cond_init(&(event->cond_var),
pthread_condattr_default));
#else
ut_a(0 == pthread_cond_init(&(event->cond_var), NULL)); ut_a(0 == pthread_cond_init(&(event->cond_var), NULL));
#endif
event->is_set = FALSE; event->is_set = FALSE;
/* We return this value in os_event_reset(), which can then be /* We return this value in os_event_reset(), which can then be
...@@ -674,12 +670,8 @@ os_fast_mutex_init( ...@@ -674,12 +670,8 @@ os_fast_mutex_init(
ut_a(fast_mutex); ut_a(fast_mutex);
InitializeCriticalSection((LPCRITICAL_SECTION) fast_mutex); InitializeCriticalSection((LPCRITICAL_SECTION) fast_mutex);
#else
#if defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10)
ut_a(0 == pthread_mutex_init(fast_mutex, pthread_mutexattr_default));
#else #else
ut_a(0 == pthread_mutex_init(fast_mutex, MY_MUTEX_INIT_FAST)); ut_a(0 == pthread_mutex_init(fast_mutex, MY_MUTEX_INIT_FAST));
#endif
#endif #endif
if (UNIV_LIKELY(os_sync_mutex_inited)) { if (UNIV_LIKELY(os_sync_mutex_inited)) {
/* When creating os_sync_mutex itself (in Unix) we cannot /* When creating os_sync_mutex itself (in Unix) we cannot
......
rem/rem0cmp.c
View file @ 7f51ff1d
...@@ -73,7 +73,6 @@ cmp_debug_dtuple_rec_with_match( ...@@ -73,7 +73,6 @@ cmp_debug_dtuple_rec_with_match(
returns, contains the value for current returns, contains the value for current
comparison */ comparison */
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#ifndef UNIV_HOTBACKUP
/***************************************************************** /*****************************************************************
This function is used to compare two data fields for which the data type This function is used to compare two data fields for which the data type
is such that we must use MySQL code to compare them. The prototype here is such that we must use MySQL code to compare them. The prototype here
...@@ -92,7 +91,6 @@ innobase_mysql_cmp( ...@@ -92,7 +91,6 @@ innobase_mysql_cmp(
const unsigned char* b, /* in: data field */ const unsigned char* b, /* in: data field */
unsigned int b_length); /* in: data field length, unsigned int b_length); /* in: data field length,
not UNIV_SQL_NULL */ not UNIV_SQL_NULL */
#endif /* !UNIV_HOTBACKUP */
/************************************************************************* /*************************************************************************
Transforms the character code so that it is ordered appropriately for the Transforms the character code so that it is ordered appropriately for the
language. This is only used for the latin1 char set. MySQL does the language. This is only used for the latin1 char set. MySQL does the
...@@ -161,7 +159,6 @@ cmp_cols_are_equal( ...@@ -161,7 +159,6 @@ cmp_cols_are_equal(
return(col1->mtype != DATA_INT || col1->len == col2->len); return(col1->mtype != DATA_INT || col1->len == col2->len);
} }
#ifndef UNIV_HOTBACKUP
/***************************************************************** /*****************************************************************
Innobase uses this function to compare two data fields for which the data type Innobase uses this function to compare two data fields for which the data type
is such that we must compare whole fields or call MySQL to do the comparison */ is such that we must compare whole fields or call MySQL to do the comparison */
...@@ -288,7 +285,6 @@ cmp_whole_field( ...@@ -288,7 +285,6 @@ cmp_whole_field(
return(0); return(0);
} }
#endif /* !UNIV_HOTBACKUP */
/***************************************************************** /*****************************************************************
This function is used to compare two data fields for which we know the This function is used to compare two data fields for which we know the
...@@ -308,7 +304,6 @@ cmp_data_data_slow( ...@@ -308,7 +304,6 @@ cmp_data_data_slow(
buffer) */ buffer) */
ulint len2) /* in: data field length or UNIV_SQL_NULL */ ulint len2) /* in: data field length or UNIV_SQL_NULL */
{ {
#ifndef UNIV_HOTBACKUP
ulint data1_byte; ulint data1_byte;
ulint data2_byte; ulint data2_byte;
ulint cur_bytes; ulint cur_bytes;
...@@ -401,12 +396,6 @@ next_byte: ...@@ -401,12 +396,6 @@ next_byte:
data1++; data1++;
data2++; data2++;
} }
#else /* !UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
#endif /* !UNIV_HOTBACKUP */
return(0); /* Not reached */ return(0); /* Not reached */
} }
...@@ -442,7 +431,6 @@ cmp_dtuple_rec_with_match( ...@@ -442,7 +431,6 @@ cmp_dtuple_rec_with_match(
matched; when function returns, contains the matched; when function returns, contains the
value for current comparison */ value for current comparison */
{ {
#ifndef UNIV_HOTBACKUP
const dfield_t* dtuple_field; /* current field in logical record */ const dfield_t* dtuple_field; /* current field in logical record */
ulint dtuple_f_len; /* the length of the current field ulint dtuple_f_len; /* the length of the current field
in the logical record */ in the logical record */
...@@ -650,13 +638,6 @@ order_resolved: ...@@ -650,13 +638,6 @@ order_resolved:
*matched_bytes = cur_bytes; *matched_bytes = cur_bytes;
return(ret); return(ret);
#else /* !UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
return(0);
#endif /* !UNIV_HOTBACKUP */
} }
/****************************************************************** /******************************************************************
...@@ -720,7 +701,6 @@ cmp_dtuple_is_prefix_of_rec( ...@@ -720,7 +701,6 @@ cmp_dtuple_is_prefix_of_rec(
return(FALSE); return(FALSE);
} }
#ifndef UNIV_HOTBACKUP
/***************************************************************** /*****************************************************************
Compare two physical records that contain the same number of columns, Compare two physical records that contain the same number of columns,
none of which are stored externally. */ none of which are stored externally. */
...@@ -870,7 +850,6 @@ next_field: ...@@ -870,7 +850,6 @@ next_field:
/* If we ran out of fields, rec1 was equal to rec2. */ /* If we ran out of fields, rec1 was equal to rec2. */
return(0); return(0);
} }
#endif /* !UNIV_HOTBACKUP */
/***************************************************************** /*****************************************************************
This function is used to compare two physical records. Only the common This function is used to compare two physical records. Only the common
...@@ -897,7 +876,6 @@ cmp_rec_rec_with_match( ...@@ -897,7 +876,6 @@ cmp_rec_rec_with_match(
matched; when the function returns, contains matched; when the function returns, contains
the value for the current comparison */ the value for the current comparison */
{ {
#ifndef UNIV_HOTBACKUP
ulint rec1_n_fields; /* the number of fields in rec */ ulint rec1_n_fields; /* the number of fields in rec */
ulint rec1_f_len; /* length of current field in rec */ ulint rec1_f_len; /* length of current field in rec */
const byte* rec1_b_ptr; /* pointer to the current byte const byte* rec1_b_ptr; /* pointer to the current byte
...@@ -1111,13 +1089,6 @@ order_resolved: ...@@ -1111,13 +1089,6 @@ order_resolved:
*matched_bytes = cur_bytes; *matched_bytes = cur_bytes;
return(ret); return(ret);
#else /* !UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
return(0);
#endif /* !UNIV_HOTBACKUP */
} }
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
......
row/row0ins.c
View file @ 7f51ff1d
...@@ -28,6 +28,7 @@ Created 4/20/1996 Heikki Tuuri ...@@ -28,6 +28,7 @@ Created 4/20/1996 Heikki Tuuri
#include "row0ins.ic" #include "row0ins.ic"
#endif #endif
#include "ha_prototypes.h"
#include "dict0dict.h" #include "dict0dict.h"
#include "dict0boot.h" #include "dict0boot.h"
#include "trx0undo.h" #include "trx0undo.h"
...@@ -50,23 +51,6 @@ Created 4/20/1996 Heikki Tuuri ...@@ -50,23 +51,6 @@ Created 4/20/1996 Heikki Tuuri
#define ROW_INS_NEXT 2 #define ROW_INS_NEXT 2
/*********************************************************************
This prototype is copied from /mysql/sql/ha_innodb.cc.
Invalidates the MySQL query cache for the table.
NOTE that the exact prototype of this function has to be in
/innobase/row/row0ins.c! */
extern
void
innobase_invalidate_query_cache(
/*============================*/
trx_t* trx, /* in: transaction which modifies the table */
char* full_name, /* in: concatenation of database name, null
char '\0', table name, null char'\0';
NOTE that in Windows this is always
in LOWER CASE! */
ulint full_name_len); /* in: full name length where also the null
chars count */
/************************************************************************* /*************************************************************************
Creates an insert node struct. */ Creates an insert node struct. */
UNIV_INTERN UNIV_INTERN
...@@ -767,10 +751,7 @@ row_ins_invalidate_query_cache( ...@@ -767,10 +751,7 @@ row_ins_invalidate_query_cache(
ut_a(ptr); ut_a(ptr);
*ptr = '\0'; *ptr = '\0';
/* We call a function in ha_innodb.cc */
#ifndef UNIV_HOTBACKUP
innobase_invalidate_query_cache(thr_get_trx(thr), buf, len); innobase_invalidate_query_cache(thr_get_trx(thr), buf, len);
#endif
mem_free(buf); mem_free(buf);
} }
...@@ -1172,7 +1153,6 @@ row_ins_set_shared_rec_lock( ...@@ -1172,7 +1153,6 @@ row_ins_set_shared_rec_lock(
return(err); return(err);
} }
#ifndef UNIV_HOTBACKUP
/************************************************************************* /*************************************************************************
Sets a exclusive lock on a record. Used in locking possible duplicate key Sets a exclusive lock on a record. Used in locking possible duplicate key
records */ records */
...@@ -1203,7 +1183,6 @@ row_ins_set_exclusive_rec_lock( ...@@ -1203,7 +1183,6 @@ row_ins_set_exclusive_rec_lock(
return(err); return(err);
} }
#endif /* !UNIV_HOTBACKUP */
/******************************************************************* /*******************************************************************
Checks if foreign key constraint fails for an index entry. Sets shared locks Checks if foreign key constraint fails for an index entry. Sets shared locks
...@@ -1611,7 +1590,6 @@ row_ins_check_foreign_constraints( ...@@ -1611,7 +1590,6 @@ row_ins_check_foreign_constraints(
return(DB_SUCCESS); return(DB_SUCCESS);
} }
#ifndef UNIV_HOTBACKUP
/******************************************************************* /*******************************************************************
Checks if a unique key violation to rec would occur at the index entry Checks if a unique key violation to rec would occur at the index entry
insert. */ insert. */
...@@ -1663,7 +1641,6 @@ row_ins_dupl_error_with_rec( ...@@ -1663,7 +1641,6 @@ row_ins_dupl_error_with_rec(
return(!rec_get_deleted_flag(rec, rec_offs_comp(offsets))); return(!rec_get_deleted_flag(rec, rec_offs_comp(offsets)));
} }
#endif /* !UNIV_HOTBACKUP */
/******************************************************************* /*******************************************************************
Scans a unique non-clustered index at a given index entry to determine Scans a unique non-clustered index at a given index entry to determine
...@@ -1679,7 +1656,6 @@ row_ins_scan_sec_index_for_duplicate( ...@@ -1679,7 +1656,6 @@ row_ins_scan_sec_index_for_duplicate(
dtuple_t* entry, /* in: index entry */ dtuple_t* entry, /* in: index entry */
que_thr_t* thr) /* in: query thread */ que_thr_t* thr) /* in: query thread */
{ {
#ifndef UNIV_HOTBACKUP
ulint n_unique; ulint n_unique;
ulint i; ulint i;
int cmp; int cmp;
...@@ -1789,13 +1765,6 @@ row_ins_scan_sec_index_for_duplicate( ...@@ -1789,13 +1765,6 @@ row_ins_scan_sec_index_for_duplicate(
dtuple_set_n_fields_cmp(entry, n_fields_cmp); dtuple_set_n_fields_cmp(entry, n_fields_cmp);
return(err); return(err);
#else /* UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
return(DB_FAIL);
#endif /* UNIV_HOTBACKUP */
} }
/******************************************************************* /*******************************************************************
...@@ -1815,7 +1784,6 @@ row_ins_duplicate_error_in_clust( ...@@ -1815,7 +1784,6 @@ row_ins_duplicate_error_in_clust(
que_thr_t* thr, /* in: query thread */ que_thr_t* thr, /* in: query thread */
mtr_t* mtr) /* in: mtr */ mtr_t* mtr) /* in: mtr */
{ {
#ifndef UNIV_HOTBACKUP
ulint err; ulint err;
rec_t* rec; rec_t* rec;
ulint n_unique; ulint n_unique;
...@@ -1939,13 +1907,6 @@ func_exit: ...@@ -1939,13 +1907,6 @@ func_exit:
mem_heap_free(heap); mem_heap_free(heap);
} }
return(err); return(err);
#else /* UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
return(DB_FAIL);
#endif /* UNIV_HOTBACKUP */
} }
/******************************************************************* /*******************************************************************
......
row/row0mysql.c
View file @ 7f51ff1d
...@@ -78,7 +78,6 @@ the above strings. */ ...@@ -78,7 +78,6 @@ the above strings. */
((str1_len) == sizeof(str2_onstack) \ ((str1_len) == sizeof(str2_onstack) \
&& memcmp(str1, str2_onstack, sizeof(str2_onstack)) == 0) && memcmp(str1, str2_onstack, sizeof(str2_onstack)) == 0)
#ifndef UNIV_HOTBACKUP
/*********************************************************************** /***********************************************************************
Determine if the given name is a name reserved for MySQL system tables. */ Determine if the given name is a name reserved for MySQL system tables. */
static static
...@@ -98,7 +97,6 @@ row_mysql_is_system_table( ...@@ -98,7 +97,6 @@ row_mysql_is_system_table(
|| 0 == strcmp(name + 6, "user") || 0 == strcmp(name + 6, "user")
|| 0 == strcmp(name + 6, "db")); || 0 == strcmp(name + 6, "db"));
} }
#endif /* !UNIV_HOTBACKUP */
/************************************************************************* /*************************************************************************
If a table is not yet in the drop list, adds the table to the list of tables If a table is not yet in the drop list, adds the table to the list of tables
...@@ -489,7 +487,6 @@ row_mysql_handle_errors( ...@@ -489,7 +487,6 @@ row_mysql_handle_errors(
que_thr_t* thr, /* in: query thread */ que_thr_t* thr, /* in: query thread */
trx_savept_t* savept) /* in: savepoint or NULL */ trx_savept_t* savept) /* in: savepoint or NULL */
{ {
#ifndef UNIV_HOTBACKUP
ulint err; ulint err;
handle_new_error: handle_new_error:
...@@ -583,13 +580,6 @@ handle_new_error: ...@@ -583,13 +580,6 @@ handle_new_error:
trx->error_state = DB_SUCCESS; trx->error_state = DB_SUCCESS;
return(FALSE); return(FALSE);
#else /* UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
return(FALSE);
#endif /* UNIV_HOTBACKUP */
} }
/************************************************************************ /************************************************************************
...@@ -1743,7 +1733,6 @@ row_mysql_unlock_data_dictionary( ...@@ -1743,7 +1733,6 @@ row_mysql_unlock_data_dictionary(
trx->dict_operation_lock_mode = 0; trx->dict_operation_lock_mode = 0;
} }
#ifndef UNIV_HOTBACKUP
/************************************************************************* /*************************************************************************
Creates a table for MySQL. If the name of the table ends in Creates a table for MySQL. If the name of the table ends in
one of "innodb_monitor", "innodb_lock_monitor", "innodb_tablespace_monitor", one of "innodb_monitor", "innodb_lock_monitor", "innodb_tablespace_monitor",
...@@ -2110,12 +2099,11 @@ row_table_add_foreign_constraints( ...@@ -2110,12 +2099,11 @@ row_table_add_foreign_constraints(
err = dict_create_foreign_constraints(trx, sql_string, name, err = dict_create_foreign_constraints(trx, sql_string, name,
reject_fks); reject_fks);
#ifndef UNIV_HOTBACKUP
if (err == DB_SUCCESS) { if (err == DB_SUCCESS) {
/* Check that also referencing constraints are ok */ /* Check that also referencing constraints are ok */
err = dict_load_foreigns(name, TRUE); err = dict_load_foreigns(name, TRUE);
} }
#endif /* !UNIV_HOTBACKUP */
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
/* We have special error handling here */ /* We have special error handling here */
...@@ -3375,9 +3363,7 @@ funct_exit: ...@@ -3375,9 +3363,7 @@ funct_exit:
trx->op_info = ""; trx->op_info = "";
#ifndef UNIV_HOTBACKUP
srv_wake_master_thread(); srv_wake_master_thread();
#endif /* !UNIV_HOTBACKUP */
return((int) err); return((int) err);
} }
...@@ -4198,7 +4184,6 @@ row_check_table_for_mysql( ...@@ -4198,7 +4184,6 @@ row_check_table_for_mysql(
return(ret); return(ret);
} }
#endif /* !UNIV_HOTBACKUP */
/************************************************************************* /*************************************************************************
Determines if a table is a magic monitor table. */ Determines if a table is a magic monitor table. */
......
row/row0row.c
View file @ 7f51ff1d
...@@ -824,8 +824,6 @@ row_search_index_entry( ...@@ -824,8 +824,6 @@ row_search_index_entry(
return(!page_rec_is_infimum(rec) && low_match == n_fields); return(!page_rec_is_infimum(rec) && low_match == n_fields);
} }
#ifndef UNIV_HOTBACKUP
#include <my_sys.h> #include <my_sys.h>
/*********************************************************************** /***********************************************************************
...@@ -1020,8 +1018,6 @@ row_raw_format( ...@@ -1020,8 +1018,6 @@ row_raw_format(
return(ret); return(ret);
} }
#endif /* !UNIV_HOTBACKUP */
#ifdef UNIV_COMPILE_TEST_FUNCS #ifdef UNIV_COMPILE_TEST_FUNCS
#include "ut0dbg.h" #include "ut0dbg.h"
......
srv/srv0srv.c
View file @ 7f51ff1d
...@@ -356,12 +356,11 @@ UNIV_INTERN ulint srv_n_rows_inserted = 0; ...@@ -356,12 +356,11 @@ UNIV_INTERN ulint srv_n_rows_inserted = 0;
UNIV_INTERN ulint srv_n_rows_updated = 0; UNIV_INTERN ulint srv_n_rows_updated = 0;
UNIV_INTERN ulint srv_n_rows_deleted = 0; UNIV_INTERN ulint srv_n_rows_deleted = 0;
UNIV_INTERN ulint srv_n_rows_read = 0; UNIV_INTERN ulint srv_n_rows_read = 0;
#ifndef UNIV_HOTBACKUP
static ulint srv_n_rows_inserted_old = 0; static ulint srv_n_rows_inserted_old = 0;
static ulint srv_n_rows_updated_old = 0; static ulint srv_n_rows_updated_old = 0;
static ulint srv_n_rows_deleted_old = 0; static ulint srv_n_rows_deleted_old = 0;
static ulint srv_n_rows_read_old = 0; static ulint srv_n_rows_read_old = 0;
#endif /* !UNIV_HOTBACKUP */
UNIV_INTERN ulint srv_n_lock_wait_count = 0; UNIV_INTERN ulint srv_n_lock_wait_count = 0;
UNIV_INTERN ulint srv_n_lock_wait_current_count = 0; UNIV_INTERN ulint srv_n_lock_wait_current_count = 0;
...@@ -660,7 +659,6 @@ srv_table_get_nth_slot( ...@@ -660,7 +659,6 @@ srv_table_get_nth_slot(
return(srv_sys->threads + index); return(srv_sys->threads + index);
} }
#ifndef UNIV_HOTBACKUP
/************************************************************************* /*************************************************************************
Gets the number of threads in the system. */ Gets the number of threads in the system. */
UNIV_INTERN UNIV_INTERN
...@@ -766,7 +764,6 @@ srv_suspend_thread(void) ...@@ -766,7 +764,6 @@ srv_suspend_thread(void)
return(event); return(event);
} }
#endif /* !UNIV_HOTBACKUP */
/************************************************************************* /*************************************************************************
Releases threads of the type given from suspension in the thread table. Releases threads of the type given from suspension in the thread table.
...@@ -1286,7 +1283,6 @@ srv_boot(void) ...@@ -1286,7 +1283,6 @@ srv_boot(void)
return(DB_SUCCESS); return(DB_SUCCESS);
} }
#ifndef UNIV_HOTBACKUP
/************************************************************************* /*************************************************************************
Reserves a slot in the thread table for the current MySQL OS thread. Reserves a slot in the thread table for the current MySQL OS thread.
NOTE! The kernel mutex has to be reserved by the caller! */ NOTE! The kernel mutex has to be reserved by the caller! */
...@@ -1351,7 +1347,6 @@ srv_table_reserve_slot_for_mysql(void) ...@@ -1351,7 +1347,6 @@ srv_table_reserve_slot_for_mysql(void)
return(slot); return(slot);
} }
#endif /* !UNIV_HOTBACKUP */
/******************************************************************* /*******************************************************************
Puts a MySQL OS thread to wait for a lock to be released. If an error Puts a MySQL OS thread to wait for a lock to be released. If an error
...@@ -1366,7 +1361,6 @@ srv_suspend_mysql_thread( ...@@ -1366,7 +1361,6 @@ srv_suspend_mysql_thread(
que_thr_t* thr) /* in: query thread associated with the MySQL que_thr_t* thr) /* in: query thread associated with the MySQL
OS thread */ OS thread */
{ {
#ifndef UNIV_HOTBACKUP
srv_slot_t* slot; srv_slot_t* slot;
os_event_t event; os_event_t event;
double wait_time; double wait_time;
...@@ -1531,12 +1525,6 @@ srv_suspend_mysql_thread( ...@@ -1531,12 +1525,6 @@ srv_suspend_mysql_thread(
trx->error_state = DB_LOCK_WAIT_TIMEOUT; trx->error_state = DB_LOCK_WAIT_TIMEOUT;
} }
#else /* UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
#endif /* UNIV_HOTBACKUP */
} }
/************************************************************************ /************************************************************************
...@@ -1549,7 +1537,6 @@ srv_release_mysql_thread_if_suspended( ...@@ -1549,7 +1537,6 @@ srv_release_mysql_thread_if_suspended(
que_thr_t* thr) /* in: query thread associated with the que_thr_t* thr) /* in: query thread associated with the
MySQL OS thread */ MySQL OS thread */
{ {
#ifndef UNIV_HOTBACKUP
srv_slot_t* slot; srv_slot_t* slot;
ulint i; ulint i;
...@@ -1569,15 +1556,8 @@ srv_release_mysql_thread_if_suspended( ...@@ -1569,15 +1556,8 @@ srv_release_mysql_thread_if_suspended(
} }
/* not found */ /* not found */
#else /* UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
#endif /* UNIV_HOTBACKUP */
} }
#ifndef UNIV_HOTBACKUP
/********************************************************************** /**********************************************************************
Refreshes the values used to calculate per-second averages. */ Refreshes the values used to calculate per-second averages. */
static static
...@@ -2634,4 +2614,3 @@ suspend_thread: ...@@ -2634,4 +2614,3 @@ suspend_thread:
OS_THREAD_DUMMY_RETURN; /* Not reached, avoid compiler warning */ OS_THREAD_DUMMY_RETURN; /* Not reached, avoid compiler warning */
} }
#endif /* !UNIV_HOTBACKUP */
sync/sync0rw.c
View file @ 7f51ff1d
...@@ -238,11 +238,8 @@ rw_lock_create_func( ...@@ -238,11 +238,8 @@ rw_lock_create_func(
lock->mutex.cfile_name = cfile_name; lock->mutex.cfile_name = cfile_name;
lock->mutex.cline = cline; lock->mutex.cline = cline;
# if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP ut_d(lock->mutex.cmutex_name = cmutex_name);
lock->mutex.cmutex_name = cmutex_name; ut_d(lock->mutex.mutex_type = 1);
lock->mutex.mutex_type = 1;
# endif /* UNIV_DEBUG && !UNIV_HOTBACKUP */
#else /* INNODB_RW_LOCKS_USE_ATOMICS */ #else /* INNODB_RW_LOCKS_USE_ATOMICS */
# ifdef UNIV_DEBUG # ifdef UNIV_DEBUG
UT_NOT_USED(cmutex_name); UT_NOT_USED(cmutex_name);
......
sync/sync0sync.c
View file @ 7f51ff1d
...@@ -255,9 +255,8 @@ mutex_create_func( ...@@ -255,9 +255,8 @@ mutex_create_func(
#endif /* UNIV_SYNC_DEBUG */ #endif /* UNIV_SYNC_DEBUG */
mutex->cfile_name = cfile_name; mutex->cfile_name = cfile_name;
mutex->cline = cline; mutex->cline = cline;
#ifndef UNIV_HOTBACKUP
mutex->count_os_wait = 0; mutex->count_os_wait = 0;
# ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
mutex->cmutex_name= cmutex_name; mutex->cmutex_name= cmutex_name;
mutex->count_using= 0; mutex->count_using= 0;
mutex->mutex_type= 0; mutex->mutex_type= 0;
...@@ -266,8 +265,7 @@ mutex_create_func( ...@@ -266,8 +265,7 @@ mutex_create_func(
mutex->count_spin_loop= 0; mutex->count_spin_loop= 0;
mutex->count_spin_rounds= 0; mutex->count_spin_rounds= 0;
mutex->count_os_yield= 0; mutex->count_os_yield= 0;
# endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#endif /* !UNIV_HOTBACKUP */
/* Check that lock_word is aligned; this is important on Intel */ /* Check that lock_word is aligned; this is important on Intel */
ut_ad(((ulint)(&(mutex->lock_word))) % 4 == 0); ut_ad(((ulint)(&(mutex->lock_word))) % 4 == 0);
...@@ -439,13 +437,13 @@ mutex_spin_wait( ...@@ -439,13 +437,13 @@ mutex_spin_wait(
{ {
ulint index; /* index of the reserved wait cell */ ulint index; /* index of the reserved wait cell */
ulint i; /* spin round count */ ulint i; /* spin round count */
#if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP #ifdef UNIV_DEBUG
ib_int64_t lstart_time = 0, lfinish_time; /* for timing os_wait */ ib_int64_t lstart_time = 0, lfinish_time; /* for timing os_wait */
ulint ltime_diff; ulint ltime_diff;
ulint sec; ulint sec;
ulint ms; ulint ms;
uint timer_started = 0; uint timer_started = 0;
#endif /* UNIV_DEBUG && !UNIV_HOTBACKUP */ #endif /* UNIV_DEBUG */
ut_ad(mutex); ut_ad(mutex);
/* This update is not thread safe, but we don't mind if the count /* This update is not thread safe, but we don't mind if the count
...@@ -465,9 +463,7 @@ mutex_loop: ...@@ -465,9 +463,7 @@ mutex_loop:
a memory word. */ a memory word. */
spin_loop: spin_loop:
#if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP ut_d(mutex->count_spin_loop++);
mutex->count_spin_loop++;
#endif /* UNIV_DEBUG && !UNIV_HOTBACKUP */
while (mutex_get_lock_word(mutex) != 0 && i < SYNC_SPIN_ROUNDS) { while (mutex_get_lock_word(mutex) != 0 && i < SYNC_SPIN_ROUNDS) {
if (srv_spin_wait_delay) { if (srv_spin_wait_delay) {
...@@ -478,14 +474,14 @@ spin_loop: ...@@ -478,14 +474,14 @@ spin_loop:
} }
if (i == SYNC_SPIN_ROUNDS) { if (i == SYNC_SPIN_ROUNDS) {
#if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP #ifdef UNIV_DEBUG
mutex->count_os_yield++; mutex->count_os_yield++;
if (timed_mutexes == 1 && timer_started==0) { if (timed_mutexes == 1 && timer_started==0) {
ut_usectime(&sec, &ms); ut_usectime(&sec, &ms);
lstart_time= (ib_int64_t)sec * 1000000 + ms; lstart_time= (ib_int64_t)sec * 1000000 + ms;
timer_started = 1; timer_started = 1;
} }
#endif /* UNIV_DEBUG && !UNIV_HOTBACKUP */ #endif /* UNIV_DEBUG */
os_thread_yield(); os_thread_yield();
} }
...@@ -499,9 +495,7 @@ spin_loop: ...@@ -499,9 +495,7 @@ spin_loop:
mutex_spin_round_count += i; mutex_spin_round_count += i;
#if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP ut_d(mutex->count_spin_rounds += i);
mutex->count_spin_rounds += i;
#endif /* UNIV_DEBUG && !UNIV_HOTBACKUP */
if (mutex_test_and_set(mutex) == 0) { if (mutex_test_and_set(mutex) == 0) {
/* Succeeded! */ /* Succeeded! */
...@@ -578,9 +572,8 @@ spin_loop: ...@@ -578,9 +572,8 @@ spin_loop:
mutex_os_wait_count++; mutex_os_wait_count++;
#ifndef UNIV_HOTBACKUP
mutex->count_os_wait++; mutex->count_os_wait++;
# ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
/* !!!!! Sometimes os_wait can be called without os_thread_yield */ /* !!!!! Sometimes os_wait can be called without os_thread_yield */
if (timed_mutexes == 1 && timer_started==0) { if (timed_mutexes == 1 && timer_started==0) {
...@@ -588,14 +581,13 @@ spin_loop: ...@@ -588,14 +581,13 @@ spin_loop:
lstart_time= (ib_int64_t)sec * 1000000 + ms; lstart_time= (ib_int64_t)sec * 1000000 + ms;
timer_started = 1; timer_started = 1;
} }
# endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
#endif /* !UNIV_HOTBACKUP */
sync_array_wait_event(sync_primary_wait_array, index); sync_array_wait_event(sync_primary_wait_array, index);
goto mutex_loop; goto mutex_loop;
finish_timing: finish_timing:
#if defined UNIV_DEBUG && !defined UNIV_HOTBACKUP #ifdef UNIV_DEBUG
if (timed_mutexes == 1 && timer_started==1) { if (timed_mutexes == 1 && timer_started==1) {
ut_usectime(&sec, &ms); ut_usectime(&sec, &ms);
lfinish_time= (ib_int64_t)sec * 1000000 + ms; lfinish_time= (ib_int64_t)sec * 1000000 + ms;
...@@ -607,7 +599,7 @@ finish_timing: ...@@ -607,7 +599,7 @@ finish_timing:
mutex->lmax_spent_time= ltime_diff; mutex->lmax_spent_time= ltime_diff;
} }
} }
#endif /* UNIV_DEBUG && !UNIV_HOTBACKUP */ #endif /* UNIV_DEBUG */
return; return;
} }
......
trx/trx0roll.c
View file @ 7f51ff1d
...@@ -68,7 +68,6 @@ trx_general_rollback_for_mysql( ...@@ -68,7 +68,6 @@ trx_general_rollback_for_mysql(
trx_savept_t* savept) /* in: pointer to savepoint undo number, if trx_savept_t* savept) /* in: pointer to savepoint undo number, if
partial rollback requested */ partial rollback requested */
{ {
#ifndef UNIV_HOTBACKUP
mem_heap_t* heap; mem_heap_t* heap;
que_thr_t* thr; que_thr_t* thr;
roll_node_t* roll_node; roll_node_t* roll_node;
...@@ -120,13 +119,6 @@ trx_general_rollback_for_mysql( ...@@ -120,13 +119,6 @@ trx_general_rollback_for_mysql(
srv_active_wake_master_thread(); srv_active_wake_master_thread();
return((int) trx->error_state); return((int) trx->error_state);
#else /* UNIV_HOTBACKUP */
/* This function depends on MySQL code that is not included in
InnoDB Hot Backup builds. Besides, this function should never
be called in InnoDB Hot Backup. */
ut_error;
return(DB_FAIL);
#endif /* UNIV_HOTBACKUP */
} }
/*********************************************************************** /***********************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7