1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
diff -r 908616611518 innobase/buf/buf0buf.c
--- a/innobase/buf/buf0buf.c 2008-12-19 02:19:35.000000000 +0900
+++ b/innobase/buf/buf0buf.c 2009-03-09 10:09:43.000000000 +0900
@@ -314,7 +314,7 @@
return(TRUE);
}
-#ifndef UNIV_HOTBACKUP
+#ifdef UNDEFINED
if (recv_lsn_checks_on && log_peek_lsn(¤t_lsn)) {
if (ut_dulint_cmp(current_lsn,
mach_read_from_8(read_buf + FIL_PAGE_LSN))
diff -r 908616611518 innobase/fil/fil0fil.c
--- a/innobase/fil/fil0fil.c Tue Mar 03 08:02:54 2009 -0800
+++ b/innobase/fil/fil0fil.c Tue Mar 03 08:06:20 2009 -0800
@@ -2027,7 +2027,7 @@
}
if (success) {
-#ifndef UNIV_HOTBACKUP
+#ifdef UNDEFINED
/* Write a log record about the deletion of the .ibd
file, so that ibbackup can replay it in the
--apply-log phase. We use a dummy mtr and the familiar
@@ -2300,7 +2300,7 @@
mutex_exit(&(system->mutex));
-#ifndef UNIV_HOTBACKUP
+#ifdef UNDEFINED
if (success) {
mtr_t mtr;
@@ -2471,7 +2471,7 @@
fil_node_create(path, size, *space_id, FALSE);
-#ifndef UNIV_HOTBACKUP
+#ifdef UNDEFINED
{
mtr_t mtr;
@@ -2890,7 +2890,7 @@
cannot be ok. */
size = (((ib_longlong)size_high) << 32) + (ib_longlong)size_low;
-#ifndef UNIV_HOTBACKUP
+#ifdef UNDEFINED
if (size < FIL_IBD_FILE_INITIAL_SIZE * UNIV_PAGE_SIZE) {
fprintf(stderr,
"InnoDB: Error: the size of single-table tablespace file %s\n"
diff -r 908616611518 innobase/log/log0recv.c
--- a/innobase/log/log0recv.c Tue Mar 03 08:02:54 2009 -0800
+++ b/innobase/log/log0recv.c Tue Mar 03 08:06:20 2009 -0800
@@ -35,12 +35,12 @@
#include "fil0fil.h"
#include "sync0sync.h"
-#ifdef UNIV_HOTBACKUP
+//#ifdef UNIV_HOTBACKUP
/* This is set to FALSE if the backup was originally taken with the
ibbackup --include regexp option: then we do not want to create tables in
directories which were not included */
ibool recv_replay_file_ops = TRUE;
-#endif /* UNIV_HOTBACKUP */
+//#endif /* UNIV_HOTBACKUP */
/* Log records are stored in the hash table in chunks at most of this size;
this must be less than UNIV_PAGE_SIZE as it is stored in the buffer pool */
@@ -450,7 +450,7 @@
/***************************************************************************
Checks the consistency of the checkpoint info */
-static
+//static
ibool
recv_check_cp_is_consistent(
/*========================*/
@@ -479,7 +479,7 @@
/************************************************************
Looks for the maximum consistent checkpoint from the log groups. */
-static
+//static
ulint
recv_find_max_checkpoint(
/*=====================*/
@@ -644,7 +644,7 @@
Checks the 4-byte checksum to the trailer checksum field of a log block.
We also accept a log block in the old format < InnoDB-3.23.52 where the
checksum field contains the log block number. */
-static
+//static
ibool
log_block_checksum_is_ok_or_old_format(
/*===================================*/
@@ -2076,7 +2076,7 @@
} else if (store_to_hash && (type == MLOG_FILE_CREATE
|| type == MLOG_FILE_RENAME
|| type == MLOG_FILE_DELETE)) {
-#ifdef UNIV_HOTBACKUP
+//#ifdef UNIV_HOTBACKUP
if (recv_replay_file_ops) {
/* In ibbackup --apply-log, replay an .ibd file
@@ -2093,7 +2093,7 @@
ut_a(0);
}
}
-#endif
+//#endif
/* In normal mysqld crash recovery we do not try to
replay file operations */
} else if (store_to_hash) {
diff -r 908616611518 innobase/os/os0file.c
--- a/innobase/os/os0file.c Tue Mar 03 08:02:54 2009 -0800
+++ b/innobase/os/os0file.c Tue Mar 03 08:06:20 2009 -0800
@@ -435,7 +435,7 @@
}
#undef USE_FILE_LOCK
-#define USE_FILE_LOCK
+//#define USE_FILE_LOCK
#if defined(UNIV_HOTBACKUP) || defined(__WIN__) || defined(__NETWARE__)
/* InnoDB Hot Backup does not lock the data files.
* On Windows, mandatory locking is used.
diff -r 908616611518 innobase/srv/srv0start.c
--- a/innobase/srv/srv0start.c Tue Mar 03 08:02:54 2009 -0800
+++ b/innobase/srv/srv0start.c Tue Mar 03 08:06:20 2009 -0800
@@ -547,7 +547,7 @@
#ifndef UNIV_HOTBACKUP
/*************************************************************************
Creates or opens the log files and closes them. */
-static
+//static
ulint
open_or_create_log_file(
/*====================*/
@@ -693,7 +693,7 @@
/*************************************************************************
Creates or opens database data files and closes them. */
-static
+//static
ulint
open_or_create_data_files(
/*======================*/
|