Merge lp:~tsarev/percona-server/quilt-5.5-2 into lp:~stewart/percona-server/quilt-5.5
- quilt-5.5-2
- Merge into quilt-5.5
Status: | Rejected |
---|---|
Rejected by: | Stewart Smith |
Proposed branch: | lp:~tsarev/percona-server/quilt-5.5-2 |
Merge into: | lp:~stewart/percona-server/quilt-5.5 |
Prerequisite: | lp:~tsarev/percona-server/quilt-5.5-1 |
Diff against target: |
7372 lines (+1260/-1812) 54 files modified
patches/bug580324.patch (+6/-9) patches/bug813587.patch (+4/-5) patches/control_online_alter_index.patch (+10/-15) patches/error_pad.patch (+2/-3) patches/file-contents.patch (+2/-2) patches/innodb_adaptive_hash_index_partitions.patch (+36/-54) patches/innodb_admin_command_base.patch (+6/-9) patches/innodb_buffer_pool_pages_i_s.patch (+10/-15) patches/innodb_buffer_pool_shm.patch (+4/-6) patches/innodb_bug60788.patch (+10/-11) patches/innodb_deadlock_count.patch (+10/-15) patches/innodb_dict_size_limit.patch (+26/-39) patches/innodb_expand_fast_index_creation.patch (+20/-30) patches/innodb_expand_import.patch (+14/-21) patches/innodb_extend_slow.patch (+38/-52) patches/innodb_extra_rseg.patch (+6/-9) patches/innodb_fast_checksum.patch (+20/-30) patches/innodb_files_extend.patch (+36/-54) patches/innodb_fix_misc.patch (+50/-70) patches/innodb_io_patches.patch (+38/-57) patches/innodb_lru_dump_restore.patch (+33/-44) patches/innodb_opt_lru_count.patch (+14/-21) patches/innodb_overwrite_relay_log_info.patch (+10/-15) patches/innodb_pass_corrupt_table.patch (+58/-87) patches/innodb_recovery_patches.patch (+17/-25) patches/innodb_separate_doublewrite.patch (+32/-48) patches/innodb_show_lock_name.patch (+16/-24) patches/innodb_show_status.patch (+26/-39) patches/innodb_show_status_extend.patch (+18/-27) patches/innodb_show_sys_tables.patch (+8/-12) patches/innodb_split_buf_pool_mutex.patch (+42/-61) patches/innodb_stats.patch (+56/-78) patches/innodb_thread_concurrency_timer_based.patch (+6/-9) patches/log_connection_error.patch (+4/-6) patches/log_warnings_suppress.patch (+13/-19) patches/microsec_process.patch (+4/-6) patches/mysql-test.diff (+216/-324) patches/mysql_dump_ignore_ct.patch (+4/-6) patches/mysql_remove_eol_carret.patch (+8/-12) patches/mysql_syslog.patch (+4/-6) patches/optimizer_fix.patch (+12/-18) patches/percona_support.patch (+2/-3) patches/processlist_row_stats.patch (+6/-8) patches/query_cache_enhance.patch (+14/-21) patches/remove_fcntl_excessive_calls.patch (+4/-6) patches/response_time_distribution.patch (+34/-50) patches/show_slave_status_nolock.patch (+12/-18) patches/show_temp.patch (+20/-30) patches/slave_timeout_fix.patch (+2/-2) patches/slow_extended.patch (+91/-113) patches/sql_no_fcache.patch (+20/-30) patches/start-stop-messages.patch (+13/-13) patches/userstat.patch (+75/-101) patches/utf8_general50_ci.patch (+18/-24) |
To merge this branch: | bzr merge lp:~tsarev/percona-server/quilt-5.5-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Yasufumi Kinoshita (community) | Approve | ||
Stewart Smith | Pending | ||
Review via email: mp+69435@code.launchpad.net |
Commit message
1. patches/
2. patches/
3. patches/
4. patches/
5. patches/
6. patches/
7. patches/
8. patches/
9. patches/
10. patches/
11. patches/
12. patches/
13. update all patches: remove timestamp from header
14. update all patches: remove "diff -ruN a/... b/..." - this is not good, but not found solution for this yet.
Description of the change
1. patches/
2. patches/
3. patches/
4. patches/
5. patches/
6. patches/
7. patches/
8. patches/
9. patches/
10. patches/
11. patches/
12. patches/
13. update all patches: remove timestamp from header
14. update all patches: remove "diff -ruN a/... b/..." - this is not good, but not found solution for this yet.
Oleg Tsarev (tsarev) wrote : | # |
Yasufumi Kinoshita (yasufumi-kinoshita) : | # |
Laurynas Biveinis (laurynas-biveinis) wrote : | # |
LGTM
Stewart Smith (stewart) wrote : | # |
i've done this pretty much anyway, so we don't need this branch.
Unmerged revisions
- 144. By Oleg Tsarev
-
1. patches/
innodb_ bug60788. patch: fix offsets
2. patches/innodb_ extend_ slow.patch: fix offsets
3. patches/innodb_ fix_misc. patch: fix offsets
4. patches/innodb_ lru_dump_ restore. patch: updated on 'quilt refresh'
5. patches/innodb_ recovery_ patches. patch: fix offsets
6. patches/innodb_ split_buf_ pool_mutex. patch: updated on 'quilt refresh'
7. patches/innodb_ stats.patch: updated on 'quilt refresh'
8. patches/processlist_ row_stats. patch: fix offsets
9. patches/response- time-distributi on.patch: fix offsets
10. patches/slow_extended. patch: updated on 'quilt refresh'
11. patches/start-stop- messages. patch: fix offsets
12. patches/userstat. patch: fix offsets
13. update all patches: remove timestamp from header
14. update all patches: remove "diff -ruN a/... b/..." - this is not good, but not found solution for this yet. - 143. By Oleg Tsarev
-
1. Makefile:
* add symlink to quiltrc to $(PERCONA_SERVER) dir
* split "main" target to "prepare" and "main" (prepare just unpack source code and setup for patch appling, main also apply patches)
* add target "regenerate" (old normalize_patches. sh) (requires for future porting to new mysql version)
* fix "clean" target
2. apply_patches:
* fix usages: "--quiltrc=quiltrc"
* now uses sh instead of bash
3. install_tests:
* rename to install_tests from install_tests.sh
* fix path to series
4. normalize_patches:
* rename to normalize_patches from normalize_patches. sh
* now use quilt for regenerate patches
5. quiltrc:
* add QUILT_[REFRESH| DIFF|PATCH] _[ARGS| OPTS] options
6. regenerate_patch.sh:
* removed (unecessary now) - 142. By Stewart Smith
-
add back in applying of handlersocket patch, was accidently removed
- 141. By Stewart Smith
-
move to using quilt for patch management. also has fallback to piping patches to patch for systems without quilt installed
- 140. By Stewart Smith
-
merge FEDERATED bug fix of not clearing errors on close
- 139. By Stewart Smith
-
merge bug745241
- 138. By Alexey Kopytov
-
Merge from LP.
- 137. By Alexey Kopytov
-
Bug #745241: quering global_
temporary_ tables causes server crash The problem was in an insufficient locking in
fill_global_temporary_ tables( ). Iterating thread's temporary_tables list
could lead to race conditions, because other server code assumes that
list to only be accessed by a single (the current) thread at any time.Fixed by introducing a new mutex in THD protecting the temporary_tables
list and acquiring that mutex when modifying the list or in
fill_global_temporary_ tables( ). - 136. By Stewart Smith
-
merge fdatasync() usage for innodb log files
- 135. By Stewart Smith
-
merge bug 802829 fix
Preview Diff
1 | === modified file 'patches/bug580324.patch' |
2 | --- patches/bug580324.patch 2011-07-22 16:56:42 +0000 |
3 | +++ patches/bug580324.patch 2011-07-27 11:32:35 +0000 |
4 | @@ -5,9 +5,8 @@ |
5 | #!!! notice !!! |
6 | # Any small change to this file in the main branch |
7 | # should be done or reviewed by the maintainer! |
8 | -diff -ruN a/sql/sql_base.cc b/sql/sql_base.cc |
9 | ---- a/sql/sql_base.cc 2011-04-09 18:49:00.000000000 +0400 |
10 | -+++ b/sql/sql_base.cc 2011-04-09 18:49:02.000000000 +0400 |
11 | +--- a/sql/sql_base.cc |
12 | ++++ b/sql/sql_base.cc |
13 | @@ -251,8 +251,12 @@ |
14 | const TABLE_LIST *table_list, |
15 | bool tmp_table) |
16 | @@ -23,9 +22,8 @@ |
17 | if (tmp_table) |
18 | { |
19 | int4store(key + key_length, thd->server_id); |
20 | -diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc |
21 | ---- a/sql/sql_parse.cc 2011-04-09 18:49:00.000000000 +0400 |
22 | -+++ b/sql/sql_parse.cc 2011-04-09 18:49:02.000000000 +0400 |
23 | +--- a/sql/sql_parse.cc |
24 | ++++ b/sql/sql_parse.cc |
25 | @@ -1112,11 +1112,18 @@ |
26 | break; |
27 | #else |
28 | @@ -93,9 +91,8 @@ |
29 | thd->set_query(fields, query_length); |
30 | general_log_print(thd, command, "%s %s", table_list.table_name, fields); |
31 | |
32 | -diff -ruN a/strings/ctype-utf8.c b/strings/ctype-utf8.c |
33 | ---- a/strings/ctype-utf8.c 2011-04-09 18:48:03.000000000 +0400 |
34 | -+++ b/strings/ctype-utf8.c 2011-04-09 18:49:02.000000000 +0400 |
35 | +--- a/strings/ctype-utf8.c |
36 | ++++ b/strings/ctype-utf8.c |
37 | @@ -4212,6 +4212,10 @@ |
38 | { |
39 | int code; |
40 | |
41 | === modified file 'patches/bug813587.patch' |
42 | --- patches/bug813587.patch 2011-07-22 16:56:42 +0000 |
43 | +++ patches/bug813587.patch 2011-07-27 11:32:35 +0000 |
44 | @@ -6,10 +6,9 @@ |
45 | # Clear MySQL connection errors in ha_federated::close(), since they |
46 | # can affect queries on other tables due to table cache eviction. |
47 | # |
48 | -diff -ruN Percona-Server.orig/storage/federated/ha_federated.cc Percona-Server/storage/federated/ha_federated.cc |
49 | ---- Percona-Server.orig/storage/federated/ha_federated.cc 2011-05-11 15:54:12.000000000 +0400 |
50 | -+++ Percona-Server/storage/federated/ha_federated.cc 2011-07-21 13:07:30.000000000 +0400 |
51 | -@@ -1675,6 +1675,8 @@ int ha_federated::open(const char *name, |
52 | +--- a/storage/federated/ha_federated.cc |
53 | ++++ b/storage/federated/ha_federated.cc |
54 | +@@ -1675,6 +1675,8 @@ |
55 | |
56 | int ha_federated::close(void) |
57 | { |
58 | @@ -18,7 +17,7 @@ |
59 | DBUG_ENTER("ha_federated::close"); |
60 | |
61 | free_result(); |
62 | -@@ -1685,6 +1687,10 @@ int ha_federated::close(void) |
63 | +@@ -1685,6 +1687,10 @@ |
64 | mysql_close(mysql); |
65 | mysql= NULL; |
66 | |
67 | |
68 | === modified file 'patches/control_online_alter_index.patch' |
69 | --- patches/control_online_alter_index.patch 2011-07-22 16:56:42 +0000 |
70 | +++ patches/control_online_alter_index.patch 2011-07-27 11:32:35 +0000 |
71 | @@ -5,9 +5,8 @@ |
72 | #!!! notice !!! |
73 | # Any small change to this file in the main branch |
74 | # should be done or reviewed by the maintainer! |
75 | -diff -ruN a/sql/handler.h b/sql/handler.h |
76 | ---- a/sql/handler.h 2010-11-03 07:01:14.000000000 +0900 |
77 | -+++ b/sql/handler.h 2010-12-03 13:51:04.727293058 +0900 |
78 | +--- a/sql/handler.h |
79 | ++++ b/sql/handler.h |
80 | @@ -205,6 +205,8 @@ |
81 | #define HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE (1L << 9) |
82 | #define HA_INPLACE_ADD_PK_INDEX_NO_WRITE (1L << 10) |
83 | @@ -17,9 +16,8 @@ |
84 | /* |
85 | HA_PARTITION_FUNCTION_SUPPORTED indicates that the function is |
86 | supported at all. |
87 | -diff -ruN a/sql/sql_class.h b/sql/sql_class.h |
88 | ---- a/sql/sql_class.h 2010-12-02 20:31:56.200956501 +0900 |
89 | -+++ b/sql/sql_class.h 2010-12-03 13:51:04.744953174 +0900 |
90 | +--- a/sql/sql_class.h |
91 | ++++ b/sql/sql_class.h |
92 | @@ -481,6 +481,8 @@ |
93 | my_bool engine_condition_pushdown; |
94 | my_bool keep_files_on_create; |
95 | @@ -29,9 +27,8 @@ |
96 | my_bool old_alter_table; |
97 | my_bool old_passwords; |
98 | my_bool big_tables; |
99 | -diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc |
100 | ---- a/sql/sql_partition.cc 2010-11-03 07:01:14.000000000 +0900 |
101 | -+++ b/sql/sql_partition.cc 2010-12-03 13:59:56.444039002 +0900 |
102 | +--- a/sql/sql_partition.cc |
103 | ++++ b/sql/sql_partition.cc |
104 | @@ -4636,7 +4636,12 @@ |
105 | alter_info->num_parts= curr_part_no - new_part_no; |
106 | } |
107 | @@ -46,9 +43,8 @@ |
108 | { |
109 | my_error(ER_PARTITION_FUNCTION_FAILURE, MYF(0)); |
110 | goto err; |
111 | -diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc |
112 | ---- a/sql/sql_table.cc 2010-11-03 07:01:14.000000000 +0900 |
113 | -+++ b/sql/sql_table.cc 2010-12-03 13:51:04.768955495 +0900 |
114 | +--- a/sql/sql_table.cc |
115 | ++++ b/sql/sql_table.cc |
116 | @@ -6112,6 +6112,10 @@ |
117 | uint *idx_end_p; |
118 | |
119 | @@ -60,9 +56,8 @@ |
120 | DBUG_PRINT("info", ("alter_flags: %lu", alter_flags)); |
121 | /* Check dropped indexes. */ |
122 | for (idx_p= index_drop_buffer, idx_end_p= idx_p + index_drop_count; |
123 | -diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc |
124 | ---- a/sql/sys_vars.cc 2010-12-02 21:23:05.569356468 +0900 |
125 | -+++ b/sql/sys_vars.cc 2010-12-03 14:05:28.857356603 +0900 |
126 | +--- a/sql/sys_vars.cc |
127 | ++++ b/sql/sys_vars.cc |
128 | @@ -2186,6 +2186,13 @@ |
129 | GLOBAL_VAR(opt_optimizer_fix), |
130 | NO_CMD_LINE, DEFAULT(TRUE)); |
131 | |
132 | === modified file 'patches/error_pad.patch' |
133 | --- patches/error_pad.patch 2011-07-22 16:56:42 +0000 |
134 | +++ patches/error_pad.patch 2011-07-27 11:32:35 +0000 |
135 | @@ -5,9 +5,8 @@ |
136 | #!!! notice !!! |
137 | # Any small change to this file in the main branch |
138 | # should be done or reviewed by the maintainer! |
139 | -diff -ruN a/extra/comp_err.c b/extra/comp_err.c |
140 | ---- a/extra/comp_err.c 2011-04-09 18:48:04.000000000 +0400 |
141 | -+++ b/extra/comp_err.c 2011-04-09 18:48:56.000000000 +0400 |
142 | +--- a/extra/comp_err.c |
143 | ++++ b/extra/comp_err.c |
144 | @@ -30,11 +30,12 @@ |
145 | #include <assert.h> |
146 | #include <my_dir.h> |
147 | |
148 | === modified file 'patches/file-contents.patch' |
149 | --- patches/file-contents.patch 2011-07-22 16:56:42 +0000 |
150 | +++ patches/file-contents.patch 2011-07-27 11:32:35 +0000 |
151 | @@ -1,6 +1,6 @@ |
152 | --- a/mysql-test/t/file_contents.test |
153 | +++ b/mysql-test/t/file_contents.test |
154 | -@@ -20,7 +20,7 @@ if ($dir_bin =~ m|/usr/|) { |
155 | +@@ -20,7 +20,7 @@ |
156 | $dir_docs = "$dir_docs/packages/MySQL-server"; |
157 | } else { |
158 | # RedHat: version number in directory name |
159 | @@ -9,7 +9,7 @@ |
160 | } |
161 | } elsif ($dir_bin =~ m|/usr$|) { |
162 | # RPM build during development |
163 | -@@ -28,9 +28,12 @@ if ($dir_bin =~ m|/usr/|) { |
164 | +@@ -28,9 +28,12 @@ |
165 | if(-d "$dir_docs/packages/MySQL-server") { |
166 | # SuSE |
167 | $dir_docs = "$dir_docs/packages/MySQL-server"; |
168 | |
169 | === modified file 'patches/innodb_adaptive_hash_index_partitions.patch' |
170 | --- patches/innodb_adaptive_hash_index_partitions.patch 2011-07-22 16:56:42 +0000 |
171 | +++ patches/innodb_adaptive_hash_index_partitions.patch 2011-07-27 11:32:35 +0000 |
172 | @@ -5,9 +5,8 @@ |
173 | #!!! notice !!! |
174 | # Any small change to this file in the main branch |
175 | # should be done or reviewed by the maintainer! |
176 | -diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c |
177 | ---- a/storage/innobase/btr/btr0btr.c 2010-12-04 15:52:23.355483176 +0900 |
178 | -+++ b/storage/innobase/btr/btr0btr.c 2010-12-04 16:12:48.639514256 +0900 |
179 | +--- a/storage/innobase/btr/btr0btr.c |
180 | ++++ b/storage/innobase/btr/btr0btr.c |
181 | @@ -1518,7 +1518,7 @@ |
182 | } |
183 | ut_a(block); |
184 | @@ -80,9 +79,8 @@ |
185 | |
186 | if (left_page_no == FIL_NULL && !page_is_leaf(page)) { |
187 | |
188 | -diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c |
189 | ---- a/storage/innobase/btr/btr0cur.c 2010-12-04 15:52:23.359513820 +0900 |
190 | -+++ b/storage/innobase/btr/btr0cur.c 2010-12-04 16:12:48.643551837 +0900 |
191 | +--- a/storage/innobase/btr/btr0cur.c |
192 | ++++ b/storage/innobase/btr/btr0cur.c |
193 | @@ -498,7 +498,7 @@ |
194 | #ifdef UNIV_SEARCH_PERF_STAT |
195 | info->n_searches++; |
196 | @@ -162,9 +160,8 @@ |
197 | } |
198 | |
199 | btr_cur_del_mark_set_sec_rec_log(rec, val, mtr); |
200 | -diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c |
201 | ---- a/storage/innobase/btr/btr0sea.c 2010-12-04 15:52:23.387513429 +0900 |
202 | -+++ b/storage/innobase/btr/btr0sea.c 2010-12-04 16:14:51.721884049 +0900 |
203 | +--- a/storage/innobase/btr/btr0sea.c |
204 | ++++ b/storage/innobase/btr/btr0sea.c |
205 | @@ -48,6 +48,8 @@ |
206 | UNIV_INTERN char btr_search_enabled = TRUE; |
207 | UNIV_INTERN ibool btr_search_fully_disabled = FALSE; |
208 | @@ -961,9 +958,8 @@ |
209 | if (UNIV_LIKELY_NULL(heap)) { |
210 | mem_heap_free(heap); |
211 | } |
212 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
213 | ---- a/storage/innobase/buf/buf0buf.c 2010-12-04 15:55:21.351597052 +0900 |
214 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-04 16:12:48.654550708 +0900 |
215 | +--- a/storage/innobase/buf/buf0buf.c |
216 | ++++ b/storage/innobase/buf/buf0buf.c |
217 | @@ -949,6 +949,7 @@ |
218 | |
219 | block->check_index_page_at_flush = FALSE; |
220 | @@ -1016,9 +1012,8 @@ |
221 | |
222 | block->n_hash_helps = 0; |
223 | block->is_hashed = FALSE; |
224 | -diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c |
225 | ---- a/storage/innobase/buf/buf0lru.c 2010-12-04 15:35:29.137347521 +0900 |
226 | -+++ b/storage/innobase/buf/buf0lru.c 2010-12-04 16:12:48.658550840 +0900 |
227 | +--- a/storage/innobase/buf/buf0lru.c |
228 | ++++ b/storage/innobase/buf/buf0lru.c |
229 | @@ -1798,7 +1798,7 @@ |
230 | |
231 | UNIV_MEM_VALID(((buf_block_t*) bpage)->frame, |
232 | @@ -1028,9 +1023,8 @@ |
233 | UNIV_MEM_INVALID(((buf_block_t*) bpage)->frame, |
234 | UNIV_PAGE_SIZE); |
235 | |
236 | -diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c |
237 | ---- a/storage/innobase/dict/dict0dict.c 2010-12-04 15:52:23.398513916 +0900 |
238 | -+++ b/storage/innobase/dict/dict0dict.c 2010-12-04 16:12:48.662550715 +0900 |
239 | +--- a/storage/innobase/dict/dict0dict.c |
240 | ++++ b/storage/innobase/dict/dict0dict.c |
241 | @@ -1811,7 +1811,7 @@ |
242 | zero. */ |
243 | |
244 | @@ -1040,9 +1034,8 @@ |
245 | if (ref_count == 0) { |
246 | break; |
247 | } |
248 | -diff -ruN a/storage/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c |
249 | ---- a/storage/innobase/ha/ha0ha.c 2010-11-03 07:01:13.000000000 +0900 |
250 | -+++ b/storage/innobase/ha/ha0ha.c 2010-12-04 16:12:48.665593752 +0900 |
251 | +--- a/storage/innobase/ha/ha0ha.c |
252 | ++++ b/storage/innobase/ha/ha0ha.c |
253 | @@ -102,7 +102,8 @@ |
254 | ut_ad(table); |
255 | ut_ad(table->magic_n == HASH_TABLE_MAGIC_N); |
256 | @@ -1053,9 +1046,8 @@ |
257 | #endif /* UNIV_SYNC_DEBUG */ |
258 | |
259 | #ifndef UNIV_HOTBACKUP |
260 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
261 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:12:20.185850734 +0900 |
262 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:12:48.674552412 +0900 |
263 | +--- a/storage/innobase/handler/ha_innodb.cc |
264 | ++++ b/storage/innobase/handler/ha_innodb.cc |
265 | @@ -11702,6 +11702,11 @@ |
266 | "Disable with --skip-innodb-adaptive-hash-index.", |
267 | NULL, innodb_adaptive_hash_index_update, TRUE); |
268 | @@ -1076,9 +1068,8 @@ |
269 | MYSQL_SYSVAR(stats_method), |
270 | MYSQL_SYSVAR(replication_delay), |
271 | MYSQL_SYSVAR(status_file), |
272 | -diff -ruN a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h |
273 | ---- a/storage/innobase/include/btr0sea.h 2010-12-03 15:48:03.070987226 +0900 |
274 | -+++ b/storage/innobase/include/btr0sea.h 2010-12-04 16:12:48.707551382 +0900 |
275 | +--- a/storage/innobase/include/btr0sea.h |
276 | ++++ b/storage/innobase/include/btr0sea.h |
277 | @@ -85,7 +85,8 @@ |
278 | ulint |
279 | btr_search_info_get_ref_count( |
280 | @@ -1174,9 +1165,8 @@ |
281 | |
282 | #ifdef UNIV_SEARCH_PERF_STAT |
283 | /** Number of successful adaptive hash index lookups */ |
284 | -diff -ruN a/storage/innobase/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic |
285 | ---- a/storage/innobase/include/btr0sea.ic 2010-11-03 07:01:13.000000000 +0900 |
286 | -+++ b/storage/innobase/include/btr0sea.ic 2010-12-04 16:12:48.709511202 +0900 |
287 | +--- a/storage/innobase/include/btr0sea.ic |
288 | ++++ b/storage/innobase/include/btr0sea.ic |
289 | @@ -62,8 +62,8 @@ |
290 | btr_search_t* info; |
291 | |
292 | @@ -1261,9 +1251,8 @@ |
293 | + } |
294 | +} |
295 | + |
296 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
297 | ---- a/storage/innobase/include/buf0buf.h 2010-12-15 19:00:07.713604580 +0900 |
298 | -+++ b/storage/innobase/include/buf0buf.h 2010-12-15 20:58:03.546839883 +0900 |
299 | +--- a/storage/innobase/include/buf0buf.h |
300 | ++++ b/storage/innobase/include/buf0buf.h |
301 | @@ -1546,7 +1546,7 @@ |
302 | pointers in the adaptive hash index |
303 | pointing to this frame */ |
304 | @@ -1281,9 +1270,8 @@ |
305 | /* @} */ |
306 | # ifdef UNIV_SYNC_DEBUG |
307 | /** @name Debug fields */ |
308 | -diff -ruN a/storage/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic |
309 | ---- a/storage/innobase/include/row0upd.ic 2010-11-03 07:01:13.000000000 +0900 |
310 | -+++ b/storage/innobase/include/row0upd.ic 2010-12-04 16:12:48.710551113 +0900 |
311 | +--- a/storage/innobase/include/row0upd.ic |
312 | ++++ b/storage/innobase/include/row0upd.ic |
313 | @@ -158,7 +158,7 @@ |
314 | ut_ad(dict_index_is_clust(index)); |
315 | ut_ad(rec_offs_validate(rec, index, offsets)); |
316 | @@ -1293,9 +1281,8 @@ |
317 | ut_ad(!buf_block_align(rec)->is_hashed); |
318 | } |
319 | #endif /* UNIV_SYNC_DEBUG */ |
320 | -diff -ruN a/storage/innobase/page/page0page.c b/storage/innobase/page/page0page.c |
321 | ---- a/storage/innobase/page/page0page.c 2010-11-03 07:01:13.000000000 +0900 |
322 | -+++ b/storage/innobase/page/page0page.c 2010-12-04 16:12:48.712550963 +0900 |
323 | +--- a/storage/innobase/page/page0page.c |
324 | ++++ b/storage/innobase/page/page0page.c |
325 | @@ -218,7 +218,7 @@ |
326 | const ibool is_hashed = block->is_hashed; |
327 | |
328 | @@ -1314,9 +1301,8 @@ |
329 | } |
330 | #endif /* !UNIV_HOTBACKUP */ |
331 | } |
332 | -diff -ruN a/storage/innobase/page/page0zip.c b/storage/innobase/page/page0zip.c |
333 | ---- a/storage/innobase/page/page0zip.c 2010-12-04 15:57:13.061494433 +0900 |
334 | -+++ b/storage/innobase/page/page0zip.c 2010-12-04 16:12:48.716470334 +0900 |
335 | +--- a/storage/innobase/page/page0zip.c |
336 | ++++ b/storage/innobase/page/page0zip.c |
337 | @@ -4444,7 +4444,7 @@ |
338 | |
339 | #ifndef UNIV_HOTBACKUP |
340 | @@ -1326,9 +1312,8 @@ |
341 | block->check_index_page_at_flush = TRUE; |
342 | #else /* !UNIV_HOTBACKUP */ |
343 | ut_ad(block == back_block1); |
344 | -diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c |
345 | ---- a/storage/innobase/row/row0sel.c 2010-12-04 16:09:53.204513572 +0900 |
346 | -+++ b/storage/innobase/row/row0sel.c 2010-12-04 16:12:48.722551273 +0900 |
347 | +--- a/storage/innobase/row/row0sel.c |
348 | ++++ b/storage/innobase/row/row0sel.c |
349 | @@ -1210,7 +1210,7 @@ |
350 | ut_ad(plan->unique_search); |
351 | ut_ad(!plan->must_get_clust); |
352 | @@ -1486,9 +1471,8 @@ |
353 | trx->has_search_latch = FALSE; |
354 | } |
355 | |
356 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
357 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-04 16:12:20.231484679 +0900 |
358 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 16:12:48.726551018 +0900 |
359 | +--- a/storage/innobase/srv/srv0srv.c |
360 | ++++ b/storage/innobase/srv/srv0srv.c |
361 | @@ -2045,7 +2045,9 @@ |
362 | "-------------------------------------\n", file); |
363 | ibuf_print(file); |
364 | @@ -1533,9 +1517,8 @@ |
365 | (ulong) btr_search_sys_subtotal, |
366 | |
367 | (ulong) (buf_pool_from_array(0)->page_hash->n_cells * sizeof(hash_cell_t)), |
368 | -diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c |
369 | ---- a/storage/innobase/sync/sync0sync.c 2010-12-03 17:36:44.300986571 +0900 |
370 | -+++ b/storage/innobase/sync/sync0sync.c 2010-12-04 16:12:48.729513564 +0900 |
371 | +--- a/storage/innobase/sync/sync0sync.c |
372 | ++++ b/storage/innobase/sync/sync0sync.c |
373 | @@ -1223,7 +1223,6 @@ |
374 | case SYNC_OUTER_ANY_LATCH: |
375 | case SYNC_FILE_FORMAT_TAG: |
376 | @@ -1552,9 +1535,8 @@ |
377 | case SYNC_BUF_LRU_LIST: |
378 | case SYNC_BUF_FLUSH_LIST: |
379 | case SYNC_BUF_PAGE_HASH: |
380 | -diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c |
381 | ---- a/storage/innobase/trx/trx0trx.c 2010-12-03 17:49:11.623953784 +0900 |
382 | -+++ b/storage/innobase/trx/trx0trx.c 2010-12-04 16:12:48.731513275 +0900 |
383 | +--- a/storage/innobase/trx/trx0trx.c |
384 | ++++ b/storage/innobase/trx/trx0trx.c |
385 | @@ -265,8 +265,14 @@ |
386 | /*=================================*/ |
387 | trx_t* trx) /*!< in: transaction */ |
388 | |
389 | === modified file 'patches/innodb_admin_command_base.patch' |
390 | --- patches/innodb_admin_command_base.patch 2011-07-22 16:56:42 +0000 |
391 | +++ patches/innodb_admin_command_base.patch 2011-07-27 11:32:35 +0000 |
392 | @@ -5,9 +5,8 @@ |
393 | #!!! notice !!! |
394 | # Any small change to this file in the main branch |
395 | # should be done or reviewed by the maintainer! |
396 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
397 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:32:15.624039043 +0900 |
398 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:32:35.424957827 +0900 |
399 | +--- a/storage/innobase/handler/ha_innodb.cc |
400 | ++++ b/storage/innobase/handler/ha_innodb.cc |
401 | @@ -11863,7 +11863,8 @@ |
402 | i_s_innodb_sys_foreign_cols, |
403 | i_s_innodb_sys_stats, |
404 | @@ -18,9 +17,8 @@ |
405 | mysql_declare_plugin_end; |
406 | |
407 | /** @brief Initialize the default value of innodb_commit_concurrency. |
408 | -diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc |
409 | ---- a/storage/innobase/handler/i_s.cc 2010-12-03 17:30:16.299955549 +0900 |
410 | -+++ b/storage/innobase/handler/i_s.cc 2010-12-03 17:32:35.425989972 +0900 |
411 | +--- a/storage/innobase/handler/i_s.cc |
412 | ++++ b/storage/innobase/handler/i_s.cc |
413 | @@ -4177,3 +4177,139 @@ |
414 | STRUCT_FLD(system_vars, NULL), |
415 | STRUCT_FLD(__reserved1, NULL) |
416 | @@ -161,9 +159,8 @@ |
417 | + STRUCT_FLD(system_vars, NULL), |
418 | + STRUCT_FLD(__reserved1, NULL) |
419 | +}; |
420 | -diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h |
421 | ---- a/storage/innobase/handler/i_s.h 2010-12-03 17:30:16.301987692 +0900 |
422 | -+++ b/storage/innobase/handler/i_s.h 2010-12-03 17:32:35.426954555 +0900 |
423 | +--- a/storage/innobase/handler/i_s.h |
424 | ++++ b/storage/innobase/handler/i_s.h |
425 | @@ -46,5 +46,6 @@ |
426 | extern struct st_mysql_plugin i_s_innodb_sys_stats; |
427 | extern struct st_mysql_plugin i_s_innodb_table_stats; |
428 | |
429 | === modified file 'patches/innodb_buffer_pool_pages_i_s.patch' |
430 | --- patches/innodb_buffer_pool_pages_i_s.patch 2011-07-22 16:56:42 +0000 |
431 | +++ patches/innodb_buffer_pool_pages_i_s.patch 2011-07-27 11:32:35 +0000 |
432 | @@ -5,9 +5,8 @@ |
433 | #!!! notice !!! |
434 | # Any small change to this file in the main branch |
435 | # should be done or reviewed by the maintainer! |
436 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
437 | ---- a/storage/innobase/buf/buf0buf.c 2010-12-04 20:20:44.595483291 +0900 |
438 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-06 19:28:04.055227506 +0900 |
439 | +--- a/storage/innobase/buf/buf0buf.c |
440 | ++++ b/storage/innobase/buf/buf0buf.c |
441 | @@ -4560,6 +4560,36 @@ |
442 | mutex_exit(block_mutex); |
443 | } |
444 | @@ -45,9 +44,8 @@ |
445 | /*********************************************************************//** |
446 | Asserts that all file pages in the buffer are in a replaceable state. |
447 | @return TRUE */ |
448 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
449 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 20:20:44.614551139 +0900 |
450 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-06 19:23:47.622195800 +0900 |
451 | +--- a/storage/innobase/handler/ha_innodb.cc |
452 | ++++ b/storage/innobase/handler/ha_innodb.cc |
453 | @@ -12148,6 +12148,9 @@ |
454 | i_s_innodb_sys_stats, |
455 | i_s_innodb_table_stats, |
456 | @@ -58,9 +56,8 @@ |
457 | i_s_innodb_admin_command |
458 | mysql_declare_plugin_end; |
459 | |
460 | -diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc |
461 | ---- a/storage/innobase/handler/i_s.cc 2010-12-04 19:46:39.786513783 +0900 |
462 | -+++ b/storage/innobase/handler/i_s.cc 2010-12-06 19:28:52.270226921 +0900 |
463 | +--- a/storage/innobase/handler/i_s.cc |
464 | ++++ b/storage/innobase/handler/i_s.cc |
465 | @@ -51,6 +51,7 @@ |
466 | #include "trx0sys.h" /* for trx_sys */ |
467 | #include "dict0dict.h" /* for dict_sys */ |
468 | @@ -771,9 +768,8 @@ |
469 | + STRUCT_FLD(__reserved1, NULL) |
470 | +}; |
471 | + |
472 | -diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h |
473 | ---- a/storage/innobase/handler/i_s.h 2010-12-04 19:46:39.657513849 +0900 |
474 | -+++ b/storage/innobase/handler/i_s.h 2010-12-06 19:23:47.635192988 +0900 |
475 | +--- a/storage/innobase/handler/i_s.h |
476 | ++++ b/storage/innobase/handler/i_s.h |
477 | @@ -47,5 +47,8 @@ |
478 | extern struct st_mysql_plugin i_s_innodb_table_stats; |
479 | extern struct st_mysql_plugin i_s_innodb_index_stats; |
480 | @@ -783,9 +779,8 @@ |
481 | +extern struct st_mysql_plugin i_s_innodb_buffer_pool_pages_blob; |
482 | |
483 | #endif /* i_s_h */ |
484 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
485 | ---- a/storage/innobase/include/buf0buf.h 2010-12-04 19:46:40.197471531 +0900 |
486 | -+++ b/storage/innobase/include/buf0buf.h 2010-12-06 19:23:47.638195824 +0900 |
487 | +--- a/storage/innobase/include/buf0buf.h |
488 | ++++ b/storage/innobase/include/buf0buf.h |
489 | @@ -1144,6 +1144,14 @@ |
490 | /*===========*/ |
491 | const buf_pool_t* buf_pool) /*!< in: buffer pool */ |
492 | |
493 | === modified file 'patches/innodb_buffer_pool_shm.patch' |
494 | --- patches/innodb_buffer_pool_shm.patch 2011-07-22 16:56:42 +0000 |
495 | +++ patches/innodb_buffer_pool_shm.patch 2011-07-27 11:32:35 +0000 |
496 | @@ -5,9 +5,8 @@ |
497 | #!!! notice !!! |
498 | # Any small change to this file in the main branch |
499 | # should be done or reviewed by the maintainer! |
500 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
501 | ---- a/storage/innobase/buf/buf0buf.c 2011-04-09 18:48:47.000000000 +0400 |
502 | -+++ b/storage/innobase/buf/buf0buf.c 2011-04-09 18:48:48.000000000 +0400 |
503 | +--- a/storage/innobase/buf/buf0buf.c |
504 | ++++ b/storage/innobase/buf/buf0buf.c |
505 | @@ -1006,10 +1006,12 @@ |
506 | buf_block_t* block; |
507 | byte* frame; |
508 | @@ -32,9 +31,8 @@ |
509 | /* Init block structs and assign frames for them. Then we |
510 | assign the frames to the first blocks (we already mapped the |
511 | memory above). */ |
512 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
513 | ---- a/storage/innobase/handler/ha_innodb.cc 2011-04-09 18:48:47.000000000 +0400 |
514 | -+++ b/storage/innobase/handler/ha_innodb.cc 2011-04-09 18:48:48.000000000 +0400 |
515 | +--- a/storage/innobase/handler/ha_innodb.cc |
516 | ++++ b/storage/innobase/handler/ha_innodb.cc |
517 | @@ -194,6 +194,8 @@ |
518 | static my_bool innobase_create_status_file = FALSE; |
519 | static my_bool innobase_stats_on_metadata = TRUE; |
520 | |
521 | === modified file 'patches/innodb_bug60788.patch' |
522 | --- patches/innodb_bug60788.patch 2011-07-22 16:56:42 +0000 |
523 | +++ patches/innodb_bug60788.patch 2011-07-27 11:32:35 +0000 |
524 | @@ -7,10 +7,9 @@ |
525 | # Changes InnoDB IO code so that fsync(), pread() and pwrite() are restarted |
526 | # when interrupted by a signal. |
527 | # |
528 | -diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c |
529 | ---- a/storage/innobase/os/os0file.c 2011-04-20 12:09:57.000000000 +0400 |
530 | -+++ b/storage/innobase/os/os0file.c 2011-04-20 12:10:04.000000000 +0400 |
531 | -@@ -2092,6 +2092,9 @@ |
532 | +--- a/storage/innobase/os/os0file.c |
533 | ++++ b/storage/innobase/os/os0file.c |
534 | +@@ -2093,6 +2093,9 @@ |
535 | failures++; |
536 | |
537 | retry = TRUE; |
538 | @@ -20,7 +19,7 @@ |
539 | } else { |
540 | |
541 | retry = FALSE; |
542 | -@@ -2222,6 +2225,7 @@ |
543 | +@@ -2223,6 +2226,7 @@ |
544 | off_t offs; |
545 | #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD) |
546 | ssize_t n_bytes; |
547 | @@ -28,7 +27,7 @@ |
548 | #endif /* HAVE_PREAD && !HAVE_BROKEN_PREAD */ |
549 | ulint sec; |
550 | ulint ms; |
551 | -@@ -2262,7 +2266,18 @@ |
552 | +@@ -2263,7 +2267,18 @@ |
553 | os_n_pending_reads++; |
554 | os_mutex_exit(os_file_count_mutex); |
555 | |
556 | @@ -48,7 +47,7 @@ |
557 | |
558 | os_mutex_enter(os_file_count_mutex); |
559 | os_file_n_pending_preads--; |
560 | -@@ -2281,6 +2296,7 @@ |
561 | +@@ -2282,6 +2297,7 @@ |
562 | { |
563 | off_t ret_offset; |
564 | ssize_t ret; |
565 | @@ -56,7 +55,7 @@ |
566 | #ifndef UNIV_HOTBACKUP |
567 | ulint i; |
568 | #endif /* !UNIV_HOTBACKUP */ |
569 | -@@ -2301,7 +2317,17 @@ |
570 | +@@ -2302,7 +2318,17 @@ |
571 | if (ret_offset < 0) { |
572 | ret = -1; |
573 | } else { |
574 | @@ -75,7 +74,7 @@ |
575 | } |
576 | |
577 | #ifndef UNIV_HOTBACKUP |
578 | -@@ -2340,6 +2366,7 @@ |
579 | +@@ -2341,6 +2367,7 @@ |
580 | offset */ |
581 | { |
582 | ssize_t ret; |
583 | @@ -83,7 +82,7 @@ |
584 | off_t offs; |
585 | |
586 | ut_a((offset & 0xFFFFFFFFUL) == offset); |
587 | -@@ -2367,7 +2394,18 @@ |
588 | +@@ -2368,7 +2395,18 @@ |
589 | os_n_pending_writes++; |
590 | os_mutex_exit(os_file_count_mutex); |
591 | |
592 | @@ -103,7 +102,7 @@ |
593 | |
594 | os_mutex_enter(os_file_count_mutex); |
595 | os_file_n_pending_pwrites--; |
596 | -@@ -2414,7 +2452,17 @@ |
597 | +@@ -2415,7 +2453,17 @@ |
598 | goto func_exit; |
599 | } |
600 | |
601 | |
602 | === modified file 'patches/innodb_deadlock_count.patch' |
603 | --- patches/innodb_deadlock_count.patch 2011-07-22 16:56:42 +0000 |
604 | +++ patches/innodb_deadlock_count.patch 2011-07-27 11:32:35 +0000 |
605 | @@ -5,9 +5,8 @@ |
606 | #!!! notice !!! |
607 | # Any small change to this file in the main branch |
608 | # should be done or reviewed by the maintainer! |
609 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
610 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:09:53.145500265 +0900 |
611 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 16:10:24.605515894 +0900 |
612 | +--- a/storage/innobase/handler/ha_innodb.cc |
613 | ++++ b/storage/innobase/handler/ha_innodb.cc |
614 | @@ -686,6 +686,8 @@ |
615 | (char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG}, |
616 | {"dblwr_writes", |
617 | @@ -17,9 +16,8 @@ |
618 | {"dict_tables", |
619 | (char*) &export_vars.innodb_dict_tables, SHOW_LONG}, |
620 | {"have_atomic_builtins", |
621 | -diff -ruN a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h |
622 | ---- a/storage/innobase/include/lock0lock.h 2010-11-03 07:01:13.000000000 +0900 |
623 | -+++ b/storage/innobase/include/lock0lock.h 2010-12-04 16:10:24.605515894 +0900 |
624 | +--- a/storage/innobase/include/lock0lock.h |
625 | ++++ b/storage/innobase/include/lock0lock.h |
626 | @@ -43,6 +43,7 @@ |
627 | #endif /* UNIV_DEBUG */ |
628 | /* Buffer for storing information about the most recent deadlock error */ |
629 | @@ -28,9 +26,8 @@ |
630 | |
631 | /*********************************************************************//** |
632 | Gets the size of a lock struct. |
633 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
634 | ---- a/storage/innobase/include/srv0srv.h 2010-12-04 15:55:21.378480843 +0900 |
635 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-04 16:10:24.606550983 +0900 |
636 | +--- a/storage/innobase/include/srv0srv.h |
637 | ++++ b/storage/innobase/include/srv0srv.h |
638 | @@ -758,6 +758,7 @@ |
639 | ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/ |
640 | ulint innodb_dblwr_pages_written; /*!< srv_dblwr_pages_written */ |
641 | @@ -39,9 +36,8 @@ |
642 | ibool innodb_have_atomic_builtins; /*!< HAVE_ATOMIC_BUILTINS */ |
643 | ulint innodb_log_waits; /*!< srv_log_waits */ |
644 | ulint innodb_log_write_requests; /*!< srv_log_write_requests */ |
645 | -diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c |
646 | ---- a/storage/innobase/lock/lock0lock.c 2010-12-03 17:49:11.609953956 +0900 |
647 | -+++ b/storage/innobase/lock/lock0lock.c 2010-12-04 16:10:24.608513889 +0900 |
648 | +--- a/storage/innobase/lock/lock0lock.c |
649 | ++++ b/storage/innobase/lock/lock0lock.c |
650 | @@ -3328,6 +3328,7 @@ |
651 | break; |
652 | |
653 | @@ -50,9 +46,8 @@ |
654 | fputs("*** WE ROLL BACK TRANSACTION (2)\n", |
655 | lock_latest_err_file); |
656 | break; |
657 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
658 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-04 15:57:13.069513371 +0900 |
659 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 16:10:24.610593039 +0900 |
660 | +--- a/storage/innobase/srv/srv0srv.c |
661 | ++++ b/storage/innobase/srv/srv0srv.c |
662 | @@ -468,6 +468,7 @@ |
663 | static ulint srv_n_rows_deleted_old = 0; |
664 | static ulint srv_n_rows_read_old = 0; |
665 | |
666 | === modified file 'patches/innodb_dict_size_limit.patch' |
667 | --- patches/innodb_dict_size_limit.patch 2011-07-22 16:56:42 +0000 |
668 | +++ patches/innodb_dict_size_limit.patch 2011-07-27 11:32:35 +0000 |
669 | @@ -5,9 +5,8 @@ |
670 | #!!! notice !!! |
671 | # Any small change to this file in the main branch |
672 | # should be done or reviewed by the maintainer! |
673 | -diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c |
674 | ---- a/storage/innobase/btr/btr0sea.c 2010-11-03 07:01:13.000000000 +0900 |
675 | -+++ b/storage/innobase/btr/btr0sea.c 2010-12-03 15:45:47.503988924 +0900 |
676 | +--- a/storage/innobase/btr/btr0sea.c |
677 | ++++ b/storage/innobase/btr/btr0sea.c |
678 | @@ -1185,6 +1185,179 @@ |
679 | mem_free(folds); |
680 | } |
681 | @@ -188,9 +187,8 @@ |
682 | /********************************************************************//** |
683 | Drops a page hash index when a page is freed from a fseg to the file system. |
684 | Drops possible hash index if the page happens to be in the buffer pool. */ |
685 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
686 | ---- a/storage/innobase/buf/buf0buf.c 2011-02-01 18:00:03.000000000 +0900 |
687 | -+++ b/storage/innobase/buf/buf0buf.c 2011-02-01 18:01:59.000000000 +0900 |
688 | +--- a/storage/innobase/buf/buf0buf.c |
689 | ++++ b/storage/innobase/buf/buf0buf.c |
690 | @@ -294,14 +294,14 @@ |
691 | # endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */ |
692 | #endif /* UNIV_PFS_MUTEX || UNIV_PFS_RWLOCK */ |
693 | @@ -214,9 +212,8 @@ |
694 | #endif /* !UNIV_HOTBACKUP */ |
695 | |
696 | /********************************************************************//** |
697 | -diff -ruN a/storage/innobase/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c |
698 | ---- a/storage/innobase/dict/dict0boot.c 2010-11-03 07:01:13.000000000 +0900 |
699 | -+++ b/storage/innobase/dict/dict0boot.c 2010-12-03 15:45:47.503988924 +0900 |
700 | +--- a/storage/innobase/dict/dict0boot.c |
701 | ++++ b/storage/innobase/dict/dict0boot.c |
702 | @@ -284,6 +284,7 @@ |
703 | system tables */ |
704 | /*-------------------------*/ |
705 | @@ -249,9 +246,8 @@ |
706 | |
707 | dict_mem_table_add_col(table, heap, "INDEX_ID", DATA_BINARY, 0, 0); |
708 | dict_mem_table_add_col(table, heap, "POS", DATA_INT, 0, 4); |
709 | -diff -ruN a/storage/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c |
710 | ---- a/storage/innobase/dict/dict0crea.c 2010-11-03 07:01:13.000000000 +0900 |
711 | -+++ b/storage/innobase/dict/dict0crea.c 2010-12-03 15:45:47.521955810 +0900 |
712 | +--- a/storage/innobase/dict/dict0crea.c |
713 | ++++ b/storage/innobase/dict/dict0crea.c |
714 | @@ -1210,6 +1210,9 @@ |
715 | /* Foreign constraint system tables have already been |
716 | created, and they are ok */ |
717 | @@ -274,9 +270,8 @@ |
718 | row_mysql_unlock_data_dictionary(trx); |
719 | |
720 | trx_free_for_mysql(trx); |
721 | -diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c |
722 | ---- a/storage/innobase/dict/dict0dict.c 2010-11-03 07:01:13.000000000 +0900 |
723 | -+++ b/storage/innobase/dict/dict0dict.c 2010-12-03 15:45:47.525953769 +0900 |
724 | +--- a/storage/innobase/dict/dict0dict.c |
725 | ++++ b/storage/innobase/dict/dict0dict.c |
726 | @@ -626,6 +626,8 @@ |
727 | |
728 | table = dict_table_get_on_id_low(table_id); |
729 | @@ -372,9 +367,8 @@ |
730 | /* We always create search info whether or not adaptive |
731 | hash index is enabled or not. */ |
732 | info = index->search_info; |
733 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
734 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:43:57.294986852 +0900 |
735 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:45:47.534959966 +0900 |
736 | +--- a/storage/innobase/handler/ha_innodb.cc |
737 | ++++ b/storage/innobase/handler/ha_innodb.cc |
738 | @@ -674,6 +674,8 @@ |
739 | (char*) &export_vars.innodb_dblwr_pages_written, SHOW_LONG}, |
740 | {"dblwr_writes", |
741 | @@ -404,9 +398,8 @@ |
742 | MYSQL_SYSVAR(use_sys_malloc), |
743 | MYSQL_SYSVAR(use_native_aio), |
744 | MYSQL_SYSVAR(change_buffering), |
745 | -diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c |
746 | ---- a/storage/innobase/ibuf/ibuf0ibuf.c 2010-12-03 15:18:48.889024455 +0900 |
747 | -+++ b/storage/innobase/ibuf/ibuf0ibuf.c 2010-12-03 15:45:47.553025057 +0900 |
748 | +--- a/storage/innobase/ibuf/ibuf0ibuf.c |
749 | ++++ b/storage/innobase/ibuf/ibuf0ibuf.c |
750 | @@ -566,6 +566,7 @@ |
751 | |
752 | /* Use old-style record format for the insert buffer. */ |
753 | @@ -415,9 +408,8 @@ |
754 | |
755 | dict_mem_table_add_col(table, heap, "DUMMY_COLUMN", DATA_BINARY, 0, 0); |
756 | |
757 | -diff -ruN a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h |
758 | ---- a/storage/innobase/include/btr0sea.h 2010-11-03 07:01:13.000000000 +0900 |
759 | -+++ b/storage/innobase/include/btr0sea.h 2010-12-03 15:45:47.555024229 +0900 |
760 | +--- a/storage/innobase/include/btr0sea.h |
761 | ++++ b/storage/innobase/include/btr0sea.h |
762 | @@ -140,6 +140,13 @@ |
763 | s- or x-latched, or an index page |
764 | for which we know that |
765 | @@ -432,9 +424,8 @@ |
766 | /********************************************************************//** |
767 | Drops a page hash index when a page is freed from a fseg to the file system. |
768 | Drops possible hash index if the page happens to be in the buffer pool. */ |
769 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
770 | ---- a/storage/innobase/include/buf0buf.h 2011-02-01 18:00:03.000000000 +0900 |
771 | -+++ b/storage/innobase/include/buf0buf.h 2011-02-01 18:03:29.000000000 +0900 |
772 | +--- a/storage/innobase/include/buf0buf.h |
773 | ++++ b/storage/innobase/include/buf0buf.h |
774 | @@ -1555,6 +1555,15 @@ |
775 | #define BUF_POOL_ZIP_FOLD_BPAGE(b) BUF_POOL_ZIP_FOLD((buf_block_t*) (b)) |
776 | /* @} */ |
777 | @@ -451,9 +442,8 @@ |
778 | /** @brief The buffer pool statistics structure. */ |
779 | struct buf_pool_stat_struct{ |
780 | ulint n_page_gets; /*!< number of page gets performed; |
781 | -diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h |
782 | ---- a/storage/innobase/include/dict0dict.h 2010-11-03 07:01:13.000000000 +0900 |
783 | -+++ b/storage/innobase/include/dict0dict.h 2010-12-03 15:45:47.558024515 +0900 |
784 | +--- a/storage/innobase/include/dict0dict.h |
785 | ++++ b/storage/innobase/include/dict0dict.h |
786 | @@ -1170,6 +1170,12 @@ |
787 | /*====================================*/ |
788 | dict_table_t* table, /*!< in: table */ |
789 | @@ -467,9 +457,8 @@ |
790 | /* Buffers for storing detailed information about the latest foreign key |
791 | and unique key errors */ |
792 | extern FILE* dict_foreign_err_file; |
793 | -diff -ruN a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic |
794 | ---- a/storage/innobase/include/dict0dict.ic 2010-11-03 07:01:13.000000000 +0900 |
795 | -+++ b/storage/innobase/include/dict0dict.ic 2010-12-03 15:45:47.560024398 +0900 |
796 | +--- a/storage/innobase/include/dict0dict.ic |
797 | ++++ b/storage/innobase/include/dict0dict.ic |
798 | @@ -824,6 +824,13 @@ |
799 | HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold, |
800 | dict_table_t*, table, ut_ad(table->cached), |
801 | @@ -497,9 +486,8 @@ |
802 | ut_ad(!table || table->cached); |
803 | |
804 | /* TODO: should get the type information from MySQL */ |
805 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
806 | ---- a/storage/innobase/include/srv0srv.h 2010-12-03 15:43:57.297067100 +0900 |
807 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-03 15:45:47.562024404 +0900 |
808 | +--- a/storage/innobase/include/srv0srv.h |
809 | ++++ b/storage/innobase/include/srv0srv.h |
810 | @@ -229,6 +229,7 @@ |
811 | extern ulint srv_read_ahead; |
812 | extern ulint srv_adaptive_flushing_method; |
813 | @@ -516,9 +504,8 @@ |
814 | ulint innodb_buffer_pool_pages_total; /*!< Buffer pool size */ |
815 | ulint innodb_buffer_pool_pages_data; /*!< Data pages */ |
816 | ulint innodb_buffer_pool_pages_dirty; /*!< Dirty data pages */ |
817 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
818 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-03 15:43:57.301024390 +0900 |
819 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 15:45:47.565023830 +0900 |
820 | +--- a/storage/innobase/srv/srv0srv.c |
821 | ++++ b/storage/innobase/srv/srv0srv.c |
822 | @@ -415,6 +415,8 @@ |
823 | UNIV_INTERN ulint srv_enable_unsafe_group_commit = 0; /* 0:disable 1:enable */ |
824 | UNIV_INTERN ulint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */ |
825 | |
826 | === modified file 'patches/innodb_expand_fast_index_creation.patch' |
827 | --- patches/innodb_expand_fast_index_creation.patch 2011-07-22 16:56:42 +0000 |
828 | +++ patches/innodb_expand_fast_index_creation.patch 2011-07-27 11:32:35 +0000 |
829 | @@ -5,9 +5,8 @@ |
830 | # ALTER TABLE and OPTIMIZE TABLE. |
831 | # |
832 | # |
833 | -diff -ruN a/client/client_priv.h b/client/client_priv.h |
834 | ---- a/client/client_priv.h 2011-04-11 08:57:20.000000000 +0400 |
835 | -+++ b/client/client_priv.h 2011-04-11 08:57:21.000000000 +0400 |
836 | +--- a/client/client_priv.h |
837 | ++++ b/client/client_priv.h |
838 | @@ -90,6 +90,7 @@ |
839 | OPT_NO_REMOVE_EOL_CARRET, |
840 | OPT_DEFAULT_AUTH, |
841 | @@ -16,9 +15,8 @@ |
842 | OPT_MAX_CLIENT_OPTION |
843 | }; |
844 | |
845 | -diff -ruN a/client/mysqldump.c b/client/mysqldump.c |
846 | ---- a/client/mysqldump.c 2011-04-11 08:57:17.000000000 +0400 |
847 | -+++ b/client/mysqldump.c 2011-04-11 08:57:21.000000000 +0400 |
848 | +--- a/client/mysqldump.c |
849 | ++++ b/client/mysqldump.c |
850 | @@ -45,6 +45,7 @@ |
851 | #include <m_ctype.h> |
852 | #include <hash.h> |
853 | @@ -173,9 +171,8 @@ |
854 | /* Moved enable keys to before unlock per bug 15977 */ |
855 | if (opt_disable_keys) |
856 | { |
857 | -diff -ruN /dev/null b/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result |
858 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
859 | -+++ b/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result 2011-04-11 08:57:21.000000000 +0400 |
860 | +--- /dev/null |
861 | ++++ b/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result |
862 | @@ -0,0 +1,109 @@ |
863 | +# |
864 | +# Test the --innodb-optimize-keys option. |
865 | @@ -286,9 +283,8 @@ |
866 | + |
867 | +###################################### |
868 | +DROP TABLE t1, t2; |
869 | -diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result |
870 | ---- a/mysql-test/suite/innodb/r/innodb.result 2011-03-31 17:36:17.000000000 +0400 |
871 | -+++ b/mysql-test/suite/innodb/r/innodb.result 2011-04-11 23:26:45.000000000 +0400 |
872 | +--- a/mysql-test/suite/innodb/r/innodb.result |
873 | ++++ b/mysql-test/suite/innodb/r/innodb.result |
874 | @@ -1673,7 +1673,7 @@ |
875 | 71 |
876 | SELECT variable_value - @innodb_rows_inserted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_inserted'; |
877 | @@ -298,9 +294,8 @@ |
878 | SELECT variable_value - @innodb_rows_updated_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_updated'; |
879 | variable_value - @innodb_rows_updated_orig |
880 | 866 |
881 | -diff -ruN a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test |
882 | ---- a/mysql-test/suite/innodb/t/innodb-index.test 2011-03-31 17:36:17.000000000 +0400 |
883 | -+++ b/mysql-test/suite/innodb/t/innodb-index.test 2011-04-11 08:57:21.000000000 +0400 |
884 | +--- a/mysql-test/suite/innodb/t/innodb-index.test |
885 | ++++ b/mysql-test/suite/innodb/t/innodb-index.test |
886 | @@ -28,6 +28,11 @@ |
887 | show create table t1; |
888 | --error ER_MULTIPLE_PRI_KEY |
889 | @@ -313,9 +308,8 @@ |
890 | --error ER_DUP_ENTRY |
891 | alter table t1 drop primary key, add primary key (b); |
892 | create unique index c on t1 (c); |
893 | -diff -ruN a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test |
894 | ---- a/mysql-test/suite/innodb/t/innodb.test 2011-03-31 17:36:17.000000000 +0400 |
895 | -+++ b/mysql-test/suite/innodb/t/innodb.test 2011-04-11 08:57:21.000000000 +0400 |
896 | +--- a/mysql-test/suite/innodb/t/innodb.test |
897 | ++++ b/mysql-test/suite/innodb/t/innodb.test |
898 | @@ -21,6 +21,12 @@ |
899 | |
900 | -- source include/have_innodb.inc |
901 | @@ -329,9 +323,8 @@ |
902 | let $MYSQLD_DATADIR= `select @@datadir`; |
903 | |
904 | # Save the original values of some variables in order to be able to |
905 | -diff -ruN /dev/null b/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test |
906 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
907 | -+++ b/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test 2011-04-11 08:57:21.000000000 +0400 |
908 | +--- /dev/null |
909 | ++++ b/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test |
910 | @@ -0,0 +1,62 @@ |
911 | +# Embedded server doesn't support external clients |
912 | +--source include/not_embedded.inc |
913 | @@ -395,9 +388,8 @@ |
914 | + |
915 | +# Wait till we reached the initial number of concurrent sessions |
916 | +--source include/wait_until_count_sessions.inc |
917 | -diff -ruN a/sql/sql_lex.cc b/sql/sql_lex.cc |
918 | ---- a/sql/sql_lex.cc 2011-04-11 08:57:17.000000000 +0400 |
919 | -+++ b/sql/sql_lex.cc 2011-04-11 08:57:21.000000000 +0400 |
920 | +--- a/sql/sql_lex.cc |
921 | ++++ b/sql/sql_lex.cc |
922 | @@ -1630,6 +1630,9 @@ |
923 | alter_list(rhs.alter_list, mem_root), |
924 | key_list(rhs.key_list, mem_root), |
925 | @@ -416,9 +408,8 @@ |
926 | /* partition_names are not deeply copied currently */ |
927 | } |
928 | |
929 | -diff -ruN a/sql/sql_lex.h b/sql/sql_lex.h |
930 | ---- a/sql/sql_lex.h 2011-04-11 08:57:19.000000000 +0400 |
931 | -+++ b/sql/sql_lex.h 2011-04-11 08:57:21.000000000 +0400 |
932 | +--- a/sql/sql_lex.h |
933 | ++++ b/sql/sql_lex.h |
934 | @@ -1003,6 +1003,9 @@ |
935 | List<Alter_column> alter_list; |
936 | List<Key> key_list; |
937 | @@ -448,9 +439,8 @@ |
938 | flags= 0; |
939 | keys_onoff= LEAVE_AS_IS; |
940 | tablespace_op= NO_TABLESPACE_OP; |
941 | -diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc |
942 | ---- a/sql/sql_table.cc 2011-04-11 08:56:57.000000000 +0400 |
943 | -+++ b/sql/sql_table.cc 2011-04-11 23:30:02.000000000 +0400 |
944 | +--- a/sql/sql_table.cc |
945 | ++++ b/sql/sql_table.cc |
946 | @@ -2773,7 +2773,7 @@ |
947 | file The handler for the new table. |
948 | key_info_buffer OUT An array of KEY structs for the indexes. |
949 | |
950 | === modified file 'patches/innodb_expand_import.patch' |
951 | --- patches/innodb_expand_import.patch 2011-07-22 16:56:42 +0000 |
952 | +++ patches/innodb_expand_import.patch 2011-07-27 11:32:35 +0000 |
953 | @@ -5,9 +5,8 @@ |
954 | #!!! notice !!! |
955 | # Any small change to this file in the main branch |
956 | # should be done or reviewed by the maintainer! |
957 | -diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c |
958 | ---- a/storage/innobase/btr/btr0btr.c 2011-04-11 19:44:03.000000000 +0900 |
959 | -+++ b/storage/innobase/btr/btr0btr.c 2011-05-24 20:30:12.455852287 +0900 |
960 | +--- a/storage/innobase/btr/btr0btr.c |
961 | ++++ b/storage/innobase/btr/btr0btr.c |
962 | @@ -837,7 +837,7 @@ |
963 | /**************************************************************//** |
964 | Creates a new index page (not the root, and also not |
965 | @@ -35,9 +34,8 @@ |
966 | void |
967 | btr_attach_half_pages( |
968 | /*==================*/ |
969 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
970 | ---- a/storage/innobase/fil/fil0fil.c 2010-12-03 15:09:51.274957577 +0900 |
971 | -+++ b/storage/innobase/fil/fil0fil.c 2010-12-03 15:52:23.553986552 +0900 |
972 | +--- a/storage/innobase/fil/fil0fil.c |
973 | ++++ b/storage/innobase/fil/fil0fil.c |
974 | @@ -40,6 +40,14 @@ |
975 | #include "dict0dict.h" |
976 | #include "page0page.h" |
977 | @@ -865,9 +863,8 @@ |
978 | return(success); |
979 | } |
980 | #endif /* !UNIV_HOTBACKUP */ |
981 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
982 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:49:59.195023983 +0900 |
983 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:52:23.555957062 +0900 |
984 | +--- a/storage/innobase/handler/ha_innodb.cc |
985 | ++++ b/storage/innobase/handler/ha_innodb.cc |
986 | @@ -7377,6 +7377,14 @@ |
987 | err = row_discard_tablespace_for_mysql(dict_table->name, trx); |
988 | } else { |
989 | @@ -903,9 +900,8 @@ |
990 | MYSQL_SYSVAR(dict_size_limit), |
991 | MYSQL_SYSVAR(use_sys_malloc), |
992 | MYSQL_SYSVAR(use_native_aio), |
993 | -diff -ruN a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h |
994 | ---- a/storage/innobase/include/btr0btr.h 2011-04-11 19:44:03.000000000 +0900 |
995 | -+++ b/storage/innobase/include/btr0btr.h 2011-05-24 20:30:12.459853343 +0900 |
996 | +--- a/storage/innobase/include/btr0btr.h |
997 | ++++ b/storage/innobase/include/btr0btr.h |
998 | @@ -219,6 +219,17 @@ |
999 | @return the uncompressed page frame */ |
1000 | # define btr_page_get(space,zip_size,page_no,mode,mtr) \ |
1001 | @@ -1018,9 +1014,8 @@ |
1002 | /****************************************************************//** |
1003 | Sets a record as the predefined minimum record. */ |
1004 | UNIV_INTERN |
1005 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
1006 | ---- a/storage/innobase/include/srv0srv.h 2010-12-03 15:48:03.077954270 +0900 |
1007 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-03 15:52:23.561986996 +0900 |
1008 | +--- a/storage/innobase/include/srv0srv.h |
1009 | ++++ b/storage/innobase/include/srv0srv.h |
1010 | @@ -229,6 +229,8 @@ |
1011 | extern ulint srv_read_ahead; |
1012 | extern ulint srv_adaptive_flushing_method; |
1013 | @@ -1030,9 +1025,8 @@ |
1014 | extern ulint srv_dict_size_limit; |
1015 | /*-------------------------------------------*/ |
1016 | |
1017 | -diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c |
1018 | ---- a/storage/innobase/row/row0mysql.c 2011-04-11 19:44:03.000000000 +0900 |
1019 | -+++ b/storage/innobase/row/row0mysql.c 2011-06-06 11:53:18.395764565 +0900 |
1020 | +--- a/storage/innobase/row/row0mysql.c |
1021 | ++++ b/storage/innobase/row/row0mysql.c |
1022 | @@ -2568,6 +2568,11 @@ |
1023 | |
1024 | current_lsn = log_get_lsn(); |
1025 | @@ -1057,9 +1051,8 @@ |
1026 | return((int) err); |
1027 | } |
1028 | |
1029 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
1030 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-03 15:49:59.230956118 +0900 |
1031 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 15:52:23.562954411 +0900 |
1032 | +--- a/storage/innobase/srv/srv0srv.c |
1033 | ++++ b/storage/innobase/srv/srv0srv.c |
1034 | @@ -416,6 +416,8 @@ |
1035 | UNIV_INTERN ulint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */ |
1036 | UNIV_INTERN ulint srv_adaptive_flushing_method = 0; /* 0: native 1: estimate 2: keep_average */ |
1037 | |
1038 | === modified file 'patches/innodb_extend_slow.patch' |
1039 | --- patches/innodb_extend_slow.patch 2011-07-22 16:56:42 +0000 |
1040 | +++ patches/innodb_extend_slow.patch 2011-07-27 11:32:35 +0000 |
1041 | @@ -5,9 +5,8 @@ |
1042 | #!!! notice !!! |
1043 | # Any small change to this file in the main branch |
1044 | # should be done or reviewed by the maintainer! |
1045 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
1046 | ---- a/storage/innobase/buf/buf0buf.c 2010-12-03 15:49:59.175955882 +0900 |
1047 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-03 17:42:42.074307123 +0900 |
1048 | +--- a/storage/innobase/buf/buf0buf.c |
1049 | ++++ b/storage/innobase/buf/buf0buf.c |
1050 | @@ -51,6 +51,40 @@ |
1051 | #include "dict0dict.h" |
1052 | #include "log0recv.h" |
1053 | @@ -237,9 +236,8 @@ |
1054 | return(TRUE); |
1055 | } |
1056 | |
1057 | -diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c |
1058 | ---- a/storage/innobase/buf/buf0rea.c 2010-12-03 17:32:15.617037263 +0900 |
1059 | -+++ b/storage/innobase/buf/buf0rea.c 2010-12-03 17:42:42.075297193 +0900 |
1060 | +--- a/storage/innobase/buf/buf0rea.c |
1061 | ++++ b/storage/innobase/buf/buf0rea.c |
1062 | @@ -77,7 +77,8 @@ |
1063 | treat the tablespace as dropped; this is a timestamp we |
1064 | use to stop dangling page reads from a tablespace |
1065 | @@ -332,9 +330,8 @@ |
1066 | } |
1067 | } |
1068 | |
1069 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
1070 | ---- a/storage/innobase/fil/fil0fil.c 2010-12-03 15:53:54.610037199 +0900 |
1071 | -+++ b/storage/innobase/fil/fil0fil.c 2010-12-03 17:42:42.079064198 +0900 |
1072 | +--- a/storage/innobase/fil/fil0fil.c |
1073 | ++++ b/storage/innobase/fil/fil0fil.c |
1074 | @@ -4747,7 +4747,7 @@ |
1075 | node->name, node->handle, buf, |
1076 | offset_low, offset_high, |
1077 | @@ -373,9 +370,8 @@ |
1078 | #endif |
1079 | ut_a(ret); |
1080 | |
1081 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
1082 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:36:44.293955189 +0900 |
1083 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:42:42.090024586 +0900 |
1084 | +--- a/storage/innobase/handler/ha_innodb.cc |
1085 | ++++ b/storage/innobase/handler/ha_innodb.cc |
1086 | @@ -1573,6 +1573,16 @@ |
1087 | trx->check_unique_secondary = !thd_test_options( |
1088 | thd, OPTION_RELAXED_UNIQUE_CHECKS); |
1089 | @@ -452,9 +448,8 @@ |
1090 | |
1091 | trx->mysql_n_tables_locked = 0; |
1092 | prebuilt->used_in_HANDLER = FALSE; |
1093 | -diff -ruN a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h |
1094 | ---- a/storage/innobase/include/buf0rea.h 2010-12-03 15:18:48.891024406 +0900 |
1095 | -+++ b/storage/innobase/include/buf0rea.h 2010-12-03 17:42:42.096026873 +0900 |
1096 | +--- a/storage/innobase/include/buf0rea.h |
1097 | ++++ b/storage/innobase/include/buf0rea.h |
1098 | @@ -27,6 +27,7 @@ |
1099 | #define buf0rea_h |
1100 | |
1101 | @@ -483,9 +478,8 @@ |
1102 | /********************************************************************//** |
1103 | Issues read requests for pages which the ibuf module wants to read in, in |
1104 | order to contract the insert buffer tree. Technically, this function is like |
1105 | -diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h |
1106 | ---- a/storage/innobase/include/fil0fil.h 2010-12-03 15:09:51.290958543 +0900 |
1107 | -+++ b/storage/innobase/include/fil0fil.h 2010-12-03 17:42:42.097027548 +0900 |
1108 | +--- a/storage/innobase/include/fil0fil.h |
1109 | ++++ b/storage/innobase/include/fil0fil.h |
1110 | @@ -611,9 +611,12 @@ |
1111 | Reads or writes data. This operation is asynchronous (aio). |
1112 | @return DB_SUCCESS, or DB_TABLESPACE_DELETED if we are trying to do |
1113 | @@ -511,9 +505,8 @@ |
1114 | /**********************************************************************//** |
1115 | Waits for an aio operation to complete. This function is used to write the |
1116 | handler for completed requests. The aio array of pending requests is divided |
1117 | -diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h |
1118 | ---- a/storage/innobase/include/os0file.h 2010-11-03 07:01:13.000000000 +0900 |
1119 | -+++ b/storage/innobase/include/os0file.h 2010-12-03 17:42:42.100023783 +0900 |
1120 | +--- a/storage/innobase/include/os0file.h |
1121 | ++++ b/storage/innobase/include/os0file.h |
1122 | @@ -36,6 +36,7 @@ |
1123 | #define os0file_h |
1124 | |
1125 | @@ -601,9 +594,8 @@ |
1126 | /************************************************************************//** |
1127 | Wakes up all async i/o threads so that they know to exit themselves in |
1128 | shutdown. */ |
1129 | -diff -ruN a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic |
1130 | ---- a/storage/innobase/include/os0file.ic 2010-11-03 07:01:13.000000000 +0900 |
1131 | -+++ b/storage/innobase/include/os0file.ic 2010-12-03 17:42:42.102024458 +0900 |
1132 | +--- a/storage/innobase/include/os0file.ic |
1133 | ++++ b/storage/innobase/include/os0file.ic |
1134 | @@ -229,6 +229,7 @@ |
1135 | (can be used to identify a completed |
1136 | aio operation); ignored if mode is |
1137 | @@ -638,9 +630,8 @@ |
1138 | |
1139 | register_pfs_file_io_end(locker, n); |
1140 | |
1141 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
1142 | ---- a/storage/innobase/include/srv0srv.h 2010-12-03 17:32:15.634987408 +0900 |
1143 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-03 17:42:42.104028644 +0900 |
1144 | +--- a/storage/innobase/include/srv0srv.h |
1145 | ++++ b/storage/innobase/include/srv0srv.h |
1146 | @@ -71,6 +71,9 @@ |
1147 | #define SRV_AUTO_EXTEND_INCREMENT \ |
1148 | (srv_auto_extend_increment * ((1024 * 1024) / UNIV_PAGE_SIZE)) |
1149 | @@ -651,9 +642,8 @@ |
1150 | /* Mutex for locking srv_monitor_file */ |
1151 | extern mutex_t srv_monitor_file_mutex; |
1152 | /* Temporary file for innodb monitor output */ |
1153 | -diff -ruN a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h |
1154 | ---- a/storage/innobase/include/trx0trx.h 2010-12-03 15:41:52.049372966 +0900 |
1155 | -+++ b/storage/innobase/include/trx0trx.h 2010-12-03 17:42:42.107024532 +0900 |
1156 | +--- a/storage/innobase/include/trx0trx.h |
1157 | ++++ b/storage/innobase/include/trx0trx.h |
1158 | @@ -743,6 +743,17 @@ |
1159 | /*------------------------------*/ |
1160 | char detailed_error[256]; /*!< detailed error message for last |
1161 | @@ -672,9 +662,8 @@ |
1162 | }; |
1163 | |
1164 | #define TRX_MAX_N_THREADS 32 /* maximum number of |
1165 | -diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c |
1166 | ---- a/storage/innobase/lock/lock0lock.c 2010-12-03 15:09:51.297986437 +0900 |
1167 | -+++ b/storage/innobase/lock/lock0lock.c 2010-12-03 17:42:42.111024587 +0900 |
1168 | +--- a/storage/innobase/lock/lock0lock.c |
1169 | ++++ b/storage/innobase/lock/lock0lock.c |
1170 | @@ -1755,6 +1755,8 @@ |
1171 | { |
1172 | lock_t* lock; |
1173 | @@ -715,9 +704,8 @@ |
1174 | trx->que_state = TRX_QUE_LOCK_WAIT; |
1175 | trx->was_chosen_as_deadlock_victim = FALSE; |
1176 | trx->wait_started = time(NULL); |
1177 | -diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c |
1178 | ---- a/storage/innobase/os/os0file.c 2010-12-03 17:32:15.644024974 +0900 |
1179 | -+++ b/storage/innobase/os/os0file.c 2010-12-03 17:42:42.117023467 +0900 |
1180 | +--- a/storage/innobase/os/os0file.c |
1181 | ++++ b/storage/innobase/os/os0file.c |
1182 | @@ -43,6 +43,8 @@ |
1183 | #include "srv0start.h" |
1184 | #include "fil0fil.h" |
1185 | @@ -727,7 +715,7 @@ |
1186 | #include "log0recv.h" |
1187 | #ifndef UNIV_HOTBACKUP |
1188 | # include "os0sync.h" |
1189 | -@@ -2212,13 +2214,18 @@ |
1190 | +@@ -2213,13 +2215,18 @@ |
1191 | ulint n, /*!< in: number of bytes to read */ |
1192 | ulint offset, /*!< in: least significant 32 bits of file |
1193 | offset from where to read */ |
1194 | @@ -747,7 +735,7 @@ |
1195 | |
1196 | ut_a((offset & 0xFFFFFFFFUL) == offset); |
1197 | |
1198 | -@@ -2239,6 +2246,15 @@ |
1199 | +@@ -2240,6 +2247,15 @@ |
1200 | |
1201 | os_n_file_reads++; |
1202 | |
1203 | @@ -763,7 +751,7 @@ |
1204 | #if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD) |
1205 | os_mutex_enter(os_file_count_mutex); |
1206 | os_file_n_pending_preads++; |
1207 | -@@ -2252,6 +2268,13 @@ |
1208 | +@@ -2253,6 +2269,13 @@ |
1209 | os_n_pending_reads--; |
1210 | os_mutex_exit(os_file_count_mutex); |
1211 | |
1212 | @@ -777,7 +765,7 @@ |
1213 | return(n_bytes); |
1214 | #else |
1215 | { |
1216 | -@@ -2288,6 +2311,13 @@ |
1217 | +@@ -2289,6 +2312,13 @@ |
1218 | os_n_pending_reads--; |
1219 | os_mutex_exit(os_file_count_mutex); |
1220 | |
1221 | @@ -791,7 +779,7 @@ |
1222 | return(ret); |
1223 | } |
1224 | #endif |
1225 | -@@ -2428,7 +2458,8 @@ |
1226 | +@@ -2429,7 +2459,8 @@ |
1227 | offset where to read */ |
1228 | ulint offset_high, /*!< in: most significant 32 bits of |
1229 | offset */ |
1230 | @@ -801,7 +789,7 @@ |
1231 | { |
1232 | #ifdef __WIN__ |
1233 | BOOL ret; |
1234 | -@@ -2503,7 +2534,7 @@ |
1235 | +@@ -2504,7 +2535,7 @@ |
1236 | os_bytes_read_since_printout += n; |
1237 | |
1238 | try_again: |
1239 | @@ -810,7 +798,7 @@ |
1240 | |
1241 | if ((ulint)ret == n) { |
1242 | |
1243 | -@@ -2632,7 +2663,7 @@ |
1244 | +@@ -2633,7 +2664,7 @@ |
1245 | os_bytes_read_since_printout += n; |
1246 | |
1247 | try_again: |
1248 | @@ -819,7 +807,7 @@ |
1249 | |
1250 | if ((ulint)ret == n) { |
1251 | |
1252 | -@@ -4026,10 +4057,11 @@ |
1253 | +@@ -4027,10 +4058,11 @@ |
1254 | (can be used to identify a completed |
1255 | aio operation); ignored if mode is |
1256 | OS_AIO_SYNC */ |
1257 | @@ -832,7 +820,7 @@ |
1258 | { |
1259 | os_aio_array_t* array; |
1260 | os_aio_slot_t* slot; |
1261 | -@@ -4070,8 +4102,8 @@ |
1262 | +@@ -4071,8 +4103,8 @@ |
1263 | wait in the Windows case. */ |
1264 | |
1265 | if (type == OS_FILE_READ) { |
1266 | @@ -843,7 +831,7 @@ |
1267 | } |
1268 | |
1269 | ut_a(type == OS_FILE_WRITE); |
1270 | -@@ -4111,6 +4143,11 @@ |
1271 | +@@ -4112,6 +4144,11 @@ |
1272 | array = NULL; /* Eliminate compiler warning */ |
1273 | } |
1274 | |
1275 | @@ -855,9 +843,8 @@ |
1276 | slot = os_aio_array_reserve_slot(type, array, message1, message2, file, |
1277 | name, buf, offset, offset_high, n); |
1278 | if (type == OS_FILE_READ) { |
1279 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
1280 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-03 17:32:15.648024399 +0900 |
1281 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 17:45:05.067023254 +0900 |
1282 | +--- a/storage/innobase/srv/srv0srv.c |
1283 | ++++ b/storage/innobase/srv/srv0srv.c |
1284 | @@ -87,6 +87,9 @@ |
1285 | #include "mysql/plugin.h" |
1286 | #include "mysql/service_thd_wait.h" |
1287 | @@ -915,9 +902,8 @@ |
1288 | os_fast_mutex_lock(&srv_conc_mutex); |
1289 | |
1290 | srv_conc_n_waiting_threads--; |
1291 | -diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c |
1292 | ---- a/storage/innobase/trx/trx0trx.c 2010-12-03 15:41:52.053955669 +0900 |
1293 | -+++ b/storage/innobase/trx/trx0trx.c 2010-12-03 17:42:42.127023410 +0900 |
1294 | +--- a/storage/innobase/trx/trx0trx.c |
1295 | ++++ b/storage/innobase/trx/trx0trx.c |
1296 | @@ -188,6 +188,15 @@ |
1297 | trx->global_read_view = NULL; |
1298 | trx->read_view = NULL; |
1299 | |
1300 | === modified file 'patches/innodb_extra_rseg.patch' |
1301 | --- patches/innodb_extra_rseg.patch 2011-07-22 16:56:42 +0000 |
1302 | +++ patches/innodb_extra_rseg.patch 2011-07-27 11:32:35 +0000 |
1303 | @@ -5,9 +5,8 @@ |
1304 | #!!! notice !!! |
1305 | # Any small change to this file in the main branch |
1306 | # should be done or reviewed by the maintainer! |
1307 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
1308 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:18:48.879955903 +0900 |
1309 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:22:53.779955671 +0900 |
1310 | +--- a/storage/innobase/handler/ha_innodb.cc |
1311 | ++++ b/storage/innobase/handler/ha_innodb.cc |
1312 | @@ -11528,6 +11528,7 @@ |
1313 | innobase_system_variables, /* system variables */ |
1314 | NULL /* reserved */ |
1315 | @@ -16,9 +15,8 @@ |
1316 | i_s_innodb_trx, |
1317 | i_s_innodb_locks, |
1318 | i_s_innodb_lock_waits, |
1319 | -diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc |
1320 | ---- a/storage/innobase/handler/i_s.cc 2010-12-03 15:06:58.742986460 +0900 |
1321 | -+++ b/storage/innobase/handler/i_s.cc 2010-12-03 15:33:08.790070078 +0900 |
1322 | +--- a/storage/innobase/handler/i_s.cc |
1323 | ++++ b/storage/innobase/handler/i_s.cc |
1324 | @@ -45,6 +45,8 @@ |
1325 | #include "srv0start.h" /* for srv_was_started */ |
1326 | #include "trx0i_s.h" |
1327 | @@ -195,9 +193,8 @@ |
1328 | + /* void* */ |
1329 | + STRUCT_FLD(__reserved1, NULL) |
1330 | +}; |
1331 | -diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h |
1332 | ---- a/storage/innobase/handler/i_s.h 2010-12-03 15:06:58.744953398 +0900 |
1333 | -+++ b/storage/innobase/handler/i_s.h 2010-12-03 15:22:53.783953418 +0900 |
1334 | +--- a/storage/innobase/handler/i_s.h |
1335 | ++++ b/storage/innobase/handler/i_s.h |
1336 | @@ -35,5 +35,6 @@ |
1337 | extern struct st_mysql_plugin i_s_innodb_cmp_reset; |
1338 | extern struct st_mysql_plugin i_s_innodb_cmpmem; |
1339 | |
1340 | === modified file 'patches/innodb_fast_checksum.patch' |
1341 | --- patches/innodb_fast_checksum.patch 2011-07-22 16:56:42 +0000 |
1342 | +++ patches/innodb_fast_checksum.patch 2011-07-27 11:32:35 +0000 |
1343 | @@ -5,9 +5,8 @@ |
1344 | #!!! notice !!! |
1345 | # Any small change to this file in the main branch |
1346 | # should be done or reviewed by the maintainer! |
1347 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
1348 | ---- a/storage/innobase/buf/buf0buf.c 2010-12-04 15:52:23.391514910 +0900 |
1349 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-04 15:53:45.013513772 +0900 |
1350 | +--- a/storage/innobase/buf/buf0buf.c |
1351 | ++++ b/storage/innobase/buf/buf0buf.c |
1352 | @@ -511,6 +511,27 @@ |
1353 | return(checksum); |
1354 | } |
1355 | @@ -92,9 +91,8 @@ |
1356 | (ulong) mach_read_from_4(read_buf + FIL_PAGE_SPACE_OR_CHKSUM), |
1357 | (ulong) mach_read_from_4(read_buf + UNIV_PAGE_SIZE |
1358 | - FIL_PAGE_END_LSN_OLD_CHKSUM), |
1359 | -diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c |
1360 | ---- a/storage/innobase/buf/buf0flu.c 2010-12-04 15:37:50.555568346 +0900 |
1361 | -+++ b/storage/innobase/buf/buf0flu.c 2010-12-04 15:53:45.015513917 +0900 |
1362 | +--- a/storage/innobase/buf/buf0flu.c |
1363 | ++++ b/storage/innobase/buf/buf0flu.c |
1364 | @@ -1055,7 +1055,9 @@ |
1365 | |
1366 | mach_write_to_4(page + FIL_PAGE_SPACE_OR_CHKSUM, |
1367 | @@ -106,9 +104,8 @@ |
1368 | : BUF_NO_CHECKSUM_MAGIC); |
1369 | |
1370 | /* We overwrite the first 4 bytes of the end lsn field to store |
1371 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
1372 | ---- a/storage/innobase/fil/fil0fil.c 2010-12-04 15:52:23.406513743 +0900 |
1373 | -+++ b/storage/innobase/fil/fil0fil.c 2010-12-04 15:53:45.020513800 +0900 |
1374 | +--- a/storage/innobase/fil/fil0fil.c |
1375 | ++++ b/storage/innobase/fil/fil0fil.c |
1376 | @@ -3094,13 +3094,24 @@ |
1377 | return(TRUE); |
1378 | } |
1379 | @@ -146,9 +143,8 @@ |
1380 | : BUF_NO_CHECKSUM_MAGIC); |
1381 | mach_write_to_4(page + UNIV_PAGE_SIZE - FIL_PAGE_END_LSN_OLD_CHKSUM, |
1382 | srv_use_checksums |
1383 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
1384 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:52:23.420480329 +0900 |
1385 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:53:45.029551892 +0900 |
1386 | +--- a/storage/innobase/handler/ha_innodb.cc |
1387 | ++++ b/storage/innobase/handler/ha_innodb.cc |
1388 | @@ -183,6 +183,7 @@ |
1389 | #endif /* UNIV_LOG_ARCHIVE */ |
1390 | static my_bool innobase_use_doublewrite = TRUE; |
1391 | @@ -189,9 +185,8 @@ |
1392 | MYSQL_SYSVAR(commit_concurrency), |
1393 | MYSQL_SYSVAR(concurrency_tickets), |
1394 | MYSQL_SYSVAR(data_file_path), |
1395 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
1396 | ---- a/storage/innobase/include/buf0buf.h 2010-12-04 15:52:23.458514045 +0900 |
1397 | -+++ b/storage/innobase/include/buf0buf.h 2010-12-04 15:53:45.044514150 +0900 |
1398 | +--- a/storage/innobase/include/buf0buf.h |
1399 | ++++ b/storage/innobase/include/buf0buf.h |
1400 | @@ -604,6 +604,11 @@ |
1401 | buf_calc_page_new_checksum( |
1402 | /*=======================*/ |
1403 | @@ -204,9 +199,8 @@ |
1404 | /********************************************************************//** |
1405 | In versions < 4.0.14 and < 4.1.1 there was a bug that the checksum only |
1406 | looked at the first few bytes of the page. This calculates that old |
1407 | -diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h |
1408 | ---- a/storage/innobase/include/fil0fil.h 2010-12-04 15:52:23.466513796 +0900 |
1409 | -+++ b/storage/innobase/include/fil0fil.h 2010-12-04 15:53:45.046513558 +0900 |
1410 | +--- a/storage/innobase/include/fil0fil.h |
1411 | ++++ b/storage/innobase/include/fil0fil.h |
1412 | @@ -118,6 +118,7 @@ |
1413 | #define FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID 34 /*!< starting from 4.1.x this |
1414 | contains the space id of the page */ |
1415 | @@ -215,9 +209,8 @@ |
1416 | /* @} */ |
1417 | /** File page trailer @{ */ |
1418 | #define FIL_PAGE_END_LSN_OLD_CHKSUM 8 /*!< the low 4 bytes of this are used |
1419 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
1420 | ---- a/storage/innobase/include/srv0srv.h 2010-12-04 15:52:23.474482590 +0900 |
1421 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-04 15:53:45.048512100 +0900 |
1422 | +--- a/storage/innobase/include/srv0srv.h |
1423 | ++++ b/storage/innobase/include/srv0srv.h |
1424 | @@ -224,6 +224,7 @@ |
1425 | |
1426 | extern ibool srv_use_doublewrite_buf; |
1427 | @@ -226,9 +219,8 @@ |
1428 | |
1429 | extern ulong srv_max_buf_pool_modified_pct; |
1430 | extern ulong srv_max_purge_lag; |
1431 | -diff -ruN a/storage/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h |
1432 | ---- a/storage/innobase/include/ut0rnd.h 2010-11-03 07:01:13.000000000 +0900 |
1433 | -+++ b/storage/innobase/include/ut0rnd.h 2010-12-04 15:53:45.049510146 +0900 |
1434 | +--- a/storage/innobase/include/ut0rnd.h |
1435 | ++++ b/storage/innobase/include/ut0rnd.h |
1436 | @@ -124,6 +124,13 @@ |
1437 | const byte* str, /*!< in: string of bytes */ |
1438 | ulint len) /*!< in: length */ |
1439 | @@ -243,9 +235,8 @@ |
1440 | /***********************************************************//** |
1441 | Looks for a prime number slightly greater than the given argument. |
1442 | The prime is chosen so that it is not near any power of 2. |
1443 | -diff -ruN a/storage/innobase/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic |
1444 | ---- a/storage/innobase/include/ut0rnd.ic 2010-11-03 07:01:13.000000000 +0900 |
1445 | -+++ b/storage/innobase/include/ut0rnd.ic 2010-12-04 15:53:45.050565975 +0900 |
1446 | +--- a/storage/innobase/include/ut0rnd.ic |
1447 | ++++ b/storage/innobase/include/ut0rnd.ic |
1448 | @@ -226,3 +226,28 @@ |
1449 | |
1450 | return(fold); |
1451 | @@ -275,9 +266,8 @@ |
1452 | + |
1453 | + return(fold); |
1454 | +} |
1455 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
1456 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-04 15:52:23.498513634 +0900 |
1457 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 15:53:45.053550283 +0900 |
1458 | +--- a/storage/innobase/srv/srv0srv.c |
1459 | ++++ b/storage/innobase/srv/srv0srv.c |
1460 | @@ -414,6 +414,7 @@ |
1461 | |
1462 | UNIV_INTERN ibool srv_use_doublewrite_buf = TRUE; |
1463 | |
1464 | === modified file 'patches/innodb_files_extend.patch' |
1465 | --- patches/innodb_files_extend.patch 2011-07-22 16:56:42 +0000 |
1466 | +++ patches/innodb_files_extend.patch 2011-07-27 11:32:35 +0000 |
1467 | @@ -5,9 +5,8 @@ |
1468 | #!!! notice !!! |
1469 | # Any small change to this file in the main branch |
1470 | # should be done or reviewed by the maintainer! |
1471 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
1472 | ---- a/storage/innobase/fil/fil0fil.c 2010-12-04 15:55:21.358513751 +0900 |
1473 | -+++ b/storage/innobase/fil/fil0fil.c 2010-12-04 15:55:58.243481131 +0900 |
1474 | +--- a/storage/innobase/fil/fil0fil.c |
1475 | ++++ b/storage/innobase/fil/fil0fil.c |
1476 | @@ -731,7 +731,7 @@ |
1477 | ut_a(space->purpose != FIL_LOG); |
1478 | ut_a(!trx_sys_sys_space(space->id)); |
1479 | @@ -48,9 +47,8 @@ |
1480 | ut_ad(fil_validate_skip()); |
1481 | #ifndef UNIV_HOTBACKUP |
1482 | # ifndef UNIV_LOG_DEBUG |
1483 | -diff -ruN a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c |
1484 | ---- a/storage/innobase/fsp/fsp0fsp.c 2010-12-04 15:52:23.411513754 +0900 |
1485 | -+++ b/storage/innobase/fsp/fsp0fsp.c 2010-12-04 15:55:58.244514273 +0900 |
1486 | +--- a/storage/innobase/fsp/fsp0fsp.c |
1487 | ++++ b/storage/innobase/fsp/fsp0fsp.c |
1488 | @@ -656,16 +656,18 @@ |
1489 | 0 for uncompressed pages */ |
1490 | ulint offset) /*!< in: page offset */ |
1491 | @@ -99,9 +97,8 @@ |
1492 | |
1493 | if (UNIV_UNLIKELY(init_xdes)) { |
1494 | |
1495 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
1496 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:55:21.367482924 +0900 |
1497 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:55:58.248549631 +0900 |
1498 | +--- a/storage/innobase/handler/ha_innodb.cc |
1499 | ++++ b/storage/innobase/handler/ha_innodb.cc |
1500 | @@ -148,6 +148,9 @@ |
1501 | static ulong innobase_write_io_threads; |
1502 | static long innobase_buffer_pool_instances = 1; |
1503 | @@ -217,9 +214,8 @@ |
1504 | MYSQL_SYSVAR(additional_mem_pool_size), |
1505 | MYSQL_SYSVAR(autoextend_increment), |
1506 | MYSQL_SYSVAR(buffer_pool_size), |
1507 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
1508 | ---- a/storage/innobase/include/buf0buf.h 2010-12-04 15:55:21.375482937 +0900 |
1509 | -+++ b/storage/innobase/include/buf0buf.h 2010-12-04 15:55:58.258469088 +0900 |
1510 | +--- a/storage/innobase/include/buf0buf.h |
1511 | ++++ b/storage/innobase/include/buf0buf.h |
1512 | @@ -1683,7 +1683,7 @@ |
1513 | time_t last_printout_time; |
1514 | /*!< when buf_print_io was last time |
1515 | @@ -251,9 +247,8 @@ |
1516 | #if BUF_BUDDY_LOW > PAGE_ZIP_MIN_SIZE |
1517 | # error "BUF_BUDDY_LOW > PAGE_ZIP_MIN_SIZE" |
1518 | #endif |
1519 | -diff -ruN a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h |
1520 | ---- a/storage/innobase/include/buf0types.h 2010-11-03 07:01:13.000000000 +0900 |
1521 | -+++ b/storage/innobase/include/buf0types.h 2010-12-04 15:55:58.259482590 +0900 |
1522 | +--- a/storage/innobase/include/buf0types.h |
1523 | ++++ b/storage/innobase/include/buf0types.h |
1524 | @@ -72,12 +72,13 @@ |
1525 | buddy system; must be at least |
1526 | sizeof(buf_page_t) */ |
1527 | @@ -269,9 +264,8 @@ |
1528 | /* @} */ |
1529 | |
1530 | #endif |
1531 | -diff -ruN a/storage/innobase/include/fsp0types.h b/storage/innobase/include/fsp0types.h |
1532 | ---- a/storage/innobase/include/fsp0types.h 2010-12-04 02:58:26.000000000 +0900 |
1533 | -+++ b/storage/innobase/include/fsp0types.h 2011-02-03 15:14:21.000000000 +0900 |
1534 | +--- a/storage/innobase/include/fsp0types.h |
1535 | ++++ b/storage/innobase/include/fsp0types.h |
1536 | @@ -42,7 +42,7 @@ |
1537 | /* @} */ |
1538 | |
1539 | @@ -281,9 +275,8 @@ |
1540 | |
1541 | /** On a page of any file segment, data may be put starting from this |
1542 | offset */ |
1543 | -diff -ruN a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h |
1544 | ---- a/storage/innobase/include/log0log.h 2010-11-03 07:01:13.000000000 +0900 |
1545 | -+++ b/storage/innobase/include/log0log.h 2010-12-09 18:16:47.737728305 +0900 |
1546 | +--- a/storage/innobase/include/log0log.h |
1547 | ++++ b/storage/innobase/include/log0log.h |
1548 | @@ -672,6 +672,9 @@ |
1549 | when mysqld is first time started |
1550 | on the restored database, it can |
1551 | @@ -294,9 +287,8 @@ |
1552 | #define LOG_FILE_ARCH_COMPLETED OS_FILE_LOG_BLOCK_SIZE |
1553 | /* this 4-byte field is TRUE when |
1554 | the writing of an archived log file |
1555 | -diff -ruN a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic |
1556 | ---- a/storage/innobase/include/mtr0log.ic 2010-12-04 15:37:50.590551517 +0900 |
1557 | -+++ b/storage/innobase/include/mtr0log.ic 2010-12-04 15:55:58.260482404 +0900 |
1558 | +--- a/storage/innobase/include/mtr0log.ic |
1559 | ++++ b/storage/innobase/include/mtr0log.ic |
1560 | @@ -203,7 +203,7 @@ |
1561 | system tablespace */ |
1562 | if ((space == TRX_SYS_SPACE |
1563 | @@ -306,9 +298,8 @@ |
1564 | if (trx_doublewrite_buf_is_being_created) { |
1565 | /* Do nothing: we only come to this branch in an |
1566 | InnoDB database creation. We do not redo log |
1567 | -diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h |
1568 | ---- a/storage/innobase/include/os0file.h 2010-12-09 18:16:02.323727427 +0900 |
1569 | -+++ b/storage/innobase/include/os0file.h 2010-12-09 18:16:47.738694194 +0900 |
1570 | +--- a/storage/innobase/include/os0file.h |
1571 | ++++ b/storage/innobase/include/os0file.h |
1572 | @@ -101,7 +101,7 @@ |
1573 | if this fails for a log block, then it is equivalent to a media failure in the |
1574 | log. */ |
1575 | @@ -327,9 +318,8 @@ |
1576 | #ifdef UNIV_PFS_IO |
1577 | /* Keys to register InnoDB I/O with performance schema */ |
1578 | extern mysql_pfs_key_t innodb_file_data_key; |
1579 | -diff -ruN a/storage/innobase/include/page0types.h b/storage/innobase/include/page0types.h |
1580 | ---- a/storage/innobase/include/page0types.h 2010-11-03 07:01:13.000000000 +0900 |
1581 | -+++ b/storage/innobase/include/page0types.h 2010-12-04 15:55:58.261483930 +0900 |
1582 | +--- a/storage/innobase/include/page0types.h |
1583 | ++++ b/storage/innobase/include/page0types.h |
1584 | @@ -56,8 +56,9 @@ |
1585 | |
1586 | /** Number of supported compressed page sizes */ |
1587 | @@ -351,9 +341,8 @@ |
1588 | |
1589 | /**********************************************************************//** |
1590 | Write the "deleted" flag of a record on a compressed page. The flag must |
1591 | -diff -ruN a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h |
1592 | ---- a/storage/innobase/include/trx0sys.h 2010-12-04 15:37:50.593480594 +0900 |
1593 | -+++ b/storage/innobase/include/trx0sys.h 2010-12-04 15:55:58.262549554 +0900 |
1594 | +--- a/storage/innobase/include/trx0sys.h |
1595 | ++++ b/storage/innobase/include/trx0sys.h |
1596 | @@ -515,9 +515,9 @@ |
1597 | /** Contents of TRX_SYS_MYSQL_LOG_MAGIC_N_FLD */ |
1598 | #define TRX_SYS_MYSQL_LOG_MAGIC_N 873422344 |
1599 | @@ -367,9 +356,8 @@ |
1600 | /** The offset of the MySQL replication info in the trx system header; |
1601 | this contains the same fields as TRX_SYS_MYSQL_LOG_INFO below */ |
1602 | #define TRX_SYS_MYSQL_MASTER_LOG_INFO (UNIV_PAGE_SIZE - 2000) |
1603 | -diff -ruN a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i |
1604 | ---- a/storage/innobase/include/univ.i 2010-11-03 07:01:13.000000000 +0900 |
1605 | -+++ b/storage/innobase/include/univ.i 2010-12-04 15:55:58.263549721 +0900 |
1606 | +--- a/storage/innobase/include/univ.i |
1607 | ++++ b/storage/innobase/include/univ.i |
1608 | @@ -311,9 +311,13 @@ |
1609 | */ |
1610 | |
1611 | @@ -402,9 +390,8 @@ |
1612 | +extern ulint srv_page_size_shift; |
1613 | +extern ulint srv_page_size; |
1614 | #endif |
1615 | -diff -ruN a/storage/innobase/log/log0log.c b/storage/innobase/log/log0log.c |
1616 | ---- a/storage/innobase/log/log0log.c 2010-12-03 15:18:48.899986203 +0900 |
1617 | -+++ b/storage/innobase/log/log0log.c 2010-12-04 15:55:58.266551567 +0900 |
1618 | +--- a/storage/innobase/log/log0log.c |
1619 | ++++ b/storage/innobase/log/log0log.c |
1620 | @@ -604,7 +604,9 @@ |
1621 | |
1622 | offset = (gr_lsn_size_offset + difference) % group_size; |
1623 | @@ -455,9 +442,8 @@ |
1624 | #endif /* UNIV_LOG_ARCHIVE */ |
1625 | |
1626 | for (i = 0; i < LOG_MAX_N_GROUPS; i++) { |
1627 | -diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c |
1628 | ---- a/storage/innobase/log/log0recv.c 2010-12-03 17:32:15.638986405 +0900 |
1629 | -+++ b/storage/innobase/log/log0recv.c 2010-12-04 15:55:58.269550689 +0900 |
1630 | +--- a/storage/innobase/log/log0recv.c |
1631 | ++++ b/storage/innobase/log/log0recv.c |
1632 | @@ -712,8 +712,22 @@ |
1633 | |
1634 | group->lsn = mach_read_from_8( |
1635 | @@ -511,9 +497,8 @@ |
1636 | #ifdef UNIV_LOG_ARCHIVE |
1637 | group = UT_LIST_GET_FIRST(log_sys->log_groups); |
1638 | |
1639 | -diff -ruN a/storage/innobase/page/page0zip.c b/storage/innobase/page/page0zip.c |
1640 | ---- a/storage/innobase/page/page0zip.c 2010-12-04 15:52:23.484482786 +0900 |
1641 | -+++ b/storage/innobase/page/page0zip.c 2010-12-04 15:55:58.274551431 +0900 |
1642 | +--- a/storage/innobase/page/page0zip.c |
1643 | ++++ b/storage/innobase/page/page0zip.c |
1644 | @@ -49,7 +49,7 @@ |
1645 | |
1646 | #ifndef UNIV_HOTBACKUP |
1647 | @@ -523,9 +508,8 @@ |
1648 | #endif /* !UNIV_HOTBACKUP */ |
1649 | |
1650 | /* Please refer to ../include/page0zip.ic for a description of the |
1651 | -diff -ruN a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c |
1652 | ---- a/storage/innobase/row/row0merge.c 2010-12-04 15:52:23.490513562 +0900 |
1653 | -+++ b/storage/innobase/row/row0merge.c 2010-12-04 15:55:58.277550562 +0900 |
1654 | +--- a/storage/innobase/row/row0merge.c |
1655 | ++++ b/storage/innobase/row/row0merge.c |
1656 | @@ -97,7 +97,7 @@ |
1657 | row_merge_block_t. Thus, it must be able to hold one merge record, |
1658 | whose maximum size is the same as the minimum size of |
1659 | @@ -535,9 +519,8 @@ |
1660 | |
1661 | /** @brief Merge record in row_merge_block_t. |
1662 | |
1663 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
1664 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-04 15:55:21.384486344 +0900 |
1665 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 15:55:58.282550845 +0900 |
1666 | +--- a/storage/innobase/srv/srv0srv.c |
1667 | ++++ b/storage/innobase/srv/srv0srv.c |
1668 | @@ -234,6 +234,13 @@ |
1669 | UNIV_INTERN ulint srv_n_read_io_threads = ULINT_MAX; |
1670 | UNIV_INTERN ulint srv_n_write_io_threads = ULINT_MAX; |
1671 | @@ -552,9 +535,8 @@ |
1672 | /* User settable value of the number of pages that must be present |
1673 | in the buffer cache and accessed sequentially for InnoDB to trigger a |
1674 | readahead request. */ |
1675 | -diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c |
1676 | ---- a/storage/innobase/srv/srv0start.c 2010-12-04 15:52:23.502513556 +0900 |
1677 | -+++ b/storage/innobase/srv/srv0start.c 2010-12-04 15:55:58.285550583 +0900 |
1678 | +--- a/storage/innobase/srv/srv0start.c |
1679 | ++++ b/storage/innobase/srv/srv0start.c |
1680 | @@ -1561,11 +1561,13 @@ |
1681 | } |
1682 | #endif /* UNIV_LOG_ARCHIVE */ |
1683 | |
1684 | === modified file 'patches/innodb_fix_misc.patch' |
1685 | --- patches/innodb_fix_misc.patch 2011-07-22 16:56:42 +0000 |
1686 | +++ patches/innodb_fix_misc.patch 2011-07-27 11:32:35 +0000 |
1687 | @@ -10,9 +10,8 @@ |
1688 | #!!! notice !!! |
1689 | # Any small change to this file in the main branch |
1690 | # should be done or reviewed by the maintainer! |
1691 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
1692 | ---- a/storage/innobase/buf/buf0buf.c 2011-02-23 19:00:48.178696354 +0900 |
1693 | -+++ b/storage/innobase/buf/buf0buf.c 2011-02-23 19:01:19.138826278 +0900 |
1694 | +--- a/storage/innobase/buf/buf0buf.c |
1695 | ++++ b/storage/innobase/buf/buf0buf.c |
1696 | @@ -4084,6 +4084,7 @@ |
1697 | bpage->state = BUF_BLOCK_ZIP_PAGE; |
1698 | bpage->space = space; |
1699 | @@ -21,9 +20,8 @@ |
1700 | |
1701 | |
1702 | #ifdef UNIV_DEBUG |
1703 | -diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c |
1704 | ---- a/storage/innobase/buf/buf0flu.c 2011-02-23 19:00:48.182659256 +0900 |
1705 | -+++ b/storage/innobase/buf/buf0flu.c 2011-02-23 19:01:19.138826278 +0900 |
1706 | +--- a/storage/innobase/buf/buf0flu.c |
1707 | ++++ b/storage/innobase/buf/buf0flu.c |
1708 | @@ -439,7 +439,7 @@ |
1709 | |
1710 | if (UNIV_LIKELY(bpage->in_LRU_list && buf_page_in_file(bpage))) { |
1711 | @@ -47,9 +45,8 @@ |
1712 | if (flush_type != BUF_FLUSH_LRU) { |
1713 | |
1714 | return(TRUE); |
1715 | -diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c |
1716 | ---- a/storage/innobase/buf/buf0lru.c 2011-02-23 19:00:47.939695791 +0900 |
1717 | -+++ b/storage/innobase/buf/buf0lru.c 2011-02-23 19:01:19.142741970 +0900 |
1718 | +--- a/storage/innobase/buf/buf0lru.c |
1719 | ++++ b/storage/innobase/buf/buf0lru.c |
1720 | @@ -574,6 +574,37 @@ |
1721 | } |
1722 | } |
1723 | @@ -99,9 +96,8 @@ |
1724 | #ifdef UNIV_IBUF_COUNT_DEBUG |
1725 | ut_a(ibuf_count_get(bpage->space, bpage->offset) == 0); |
1726 | #endif /* UNIV_IBUF_COUNT_DEBUG */ |
1727 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
1728 | ---- a/storage/innobase/fil/fil0fil.c 2011-02-23 19:00:48.223696428 +0900 |
1729 | -+++ b/storage/innobase/fil/fil0fil.c 2011-02-23 19:01:19.147655510 +0900 |
1730 | +--- a/storage/innobase/fil/fil0fil.c |
1731 | ++++ b/storage/innobase/fil/fil0fil.c |
1732 | @@ -254,6 +254,7 @@ |
1733 | struct fil_system_struct { |
1734 | #ifndef UNIV_HOTBACKUP |
1735 | @@ -300,9 +296,8 @@ |
1736 | } |
1737 | |
1738 | ut_a(ret); |
1739 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
1740 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:57:13.035513990 +0900 |
1741 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:57:53.084513775 +0900 |
1742 | +--- a/storage/innobase/handler/ha_innodb.cc |
1743 | ++++ b/storage/innobase/handler/ha_innodb.cc |
1744 | @@ -12007,6 +12007,12 @@ |
1745 | "except for the deletion.", |
1746 | NULL, NULL, 0, &corrupt_table_action_typelib); |
1747 | @@ -333,9 +328,8 @@ |
1748 | PLUGIN_LICENSE_GPL, |
1749 | innobase_init, /* Plugin Init */ |
1750 | NULL, /* Plugin Deinit */ |
1751 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
1752 | ---- a/storage/innobase/include/buf0buf.h 2011-02-23 19:00:48.252696774 +0900 |
1753 | -+++ b/storage/innobase/include/buf0buf.h 2011-02-23 19:01:19.182655902 +0900 |
1754 | +--- a/storage/innobase/include/buf0buf.h |
1755 | ++++ b/storage/innobase/include/buf0buf.h |
1756 | @@ -1438,6 +1438,7 @@ |
1757 | 0 if the block was never accessed |
1758 | in the buffer pool */ |
1759 | @@ -344,9 +338,8 @@ |
1760 | ibool is_corrupt; |
1761 | # if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG |
1762 | ibool file_page_was_freed; |
1763 | -diff -ruN a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic |
1764 | ---- a/storage/innobase/include/buf0buf.ic 2011-02-23 19:00:48.130659154 +0900 |
1765 | -+++ b/storage/innobase/include/buf0buf.ic 2011-02-23 19:01:19.185655906 +0900 |
1766 | +--- a/storage/innobase/include/buf0buf.ic |
1767 | ++++ b/storage/innobase/include/buf0buf.ic |
1768 | @@ -408,6 +408,7 @@ |
1769 | buf_block_set_state(block, BUF_BLOCK_FILE_PAGE); |
1770 | block->page.space = space; |
1771 | @@ -355,9 +348,8 @@ |
1772 | } |
1773 | |
1774 | /*********************************************************************//** |
1775 | -diff -ruN a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h |
1776 | ---- a/storage/innobase/include/buf0lru.h 2011-02-23 19:00:47.977658923 +0900 |
1777 | -+++ b/storage/innobase/include/buf0lru.h 2011-02-23 19:01:19.188625768 +0900 |
1778 | +--- a/storage/innobase/include/buf0lru.h |
1779 | ++++ b/storage/innobase/include/buf0lru.h |
1780 | @@ -85,6 +85,13 @@ |
1781 | buf_LRU_invalidate_tablespace( |
1782 | /*==========================*/ |
1783 | @@ -372,9 +364,8 @@ |
1784 | /********************************************************************//** |
1785 | Insert a compressed block into buf_pool->zip_clean in the LRU order. */ |
1786 | UNIV_INTERN |
1787 | -diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h |
1788 | ---- a/storage/innobase/include/os0file.h 2011-02-23 19:00:48.260696646 +0900 |
1789 | -+++ b/storage/innobase/include/os0file.h 2011-02-23 19:01:19.190656054 +0900 |
1790 | +--- a/storage/innobase/include/os0file.h |
1791 | ++++ b/storage/innobase/include/os0file.h |
1792 | @@ -280,9 +280,9 @@ |
1793 | pfs_os_file_close_func(file, __FILE__, __LINE__) |
1794 | |
1795 | @@ -445,9 +436,8 @@ |
1796 | #endif /* LINUX_NATIVE_AIO */ |
1797 | |
1798 | #ifndef UNIV_NONINL |
1799 | -diff -ruN a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic |
1800 | ---- a/storage/innobase/include/os0file.ic 2011-02-23 19:00:47.915696756 +0900 |
1801 | -+++ b/storage/innobase/include/os0file.ic 2011-02-23 19:01:19.191625891 +0900 |
1802 | +--- a/storage/innobase/include/os0file.ic |
1803 | ++++ b/storage/innobase/include/os0file.ic |
1804 | @@ -229,6 +229,7 @@ |
1805 | (can be used to identify a completed |
1806 | aio operation); ignored if mode is |
1807 | @@ -465,9 +455,8 @@ |
1808 | |
1809 | register_pfs_file_io_end(locker, n); |
1810 | |
1811 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
1812 | ---- a/storage/innobase/include/srv0srv.h 2011-02-23 19:00:48.212625715 +0900 |
1813 | -+++ b/storage/innobase/include/srv0srv.h 2011-02-23 19:01:19.193655990 +0900 |
1814 | +--- a/storage/innobase/include/srv0srv.h |
1815 | ++++ b/storage/innobase/include/srv0srv.h |
1816 | @@ -244,6 +244,8 @@ |
1817 | extern ulint srv_pass_corrupt_table; |
1818 | |
1819 | @@ -477,9 +466,8 @@ |
1820 | /*-------------------------------------------*/ |
1821 | |
1822 | extern ulint srv_n_rows_inserted; |
1823 | -diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h |
1824 | ---- a/storage/innobase/include/sync0sync.h 2011-02-23 19:00:47.875625940 +0900 |
1825 | -+++ b/storage/innobase/include/sync0sync.h 2011-02-23 19:01:19.195703856 +0900 |
1826 | +--- a/storage/innobase/include/sync0sync.h |
1827 | ++++ b/storage/innobase/include/sync0sync.h |
1828 | @@ -691,6 +691,7 @@ |
1829 | #define SYNC_BUF_POOL 150 /* Buffer pool mutex */ |
1830 | #define SYNC_BUF_FLUSH_LIST 145 /* Buffer flush list mutex */ |
1831 | @@ -488,9 +476,8 @@ |
1832 | #define SYNC_ANY_LATCH 135 |
1833 | #define SYNC_THR_LOCAL 133 |
1834 | #define SYNC_MEM_HASH 131 |
1835 | -diff -ruN a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i |
1836 | ---- a/storage/innobase/include/univ.i 2010-12-04 15:57:13.050485224 +0900 |
1837 | -+++ b/storage/innobase/include/univ.i 2010-12-04 15:57:53.091592933 +0900 |
1838 | +--- a/storage/innobase/include/univ.i |
1839 | ++++ b/storage/innobase/include/univ.i |
1840 | @@ -53,6 +53,11 @@ |
1841 | #define INNODB_VERSION_MINOR 1 |
1842 | #define INNODB_VERSION_BUGFIX 7 |
1843 | @@ -513,9 +500,8 @@ |
1844 | |
1845 | #define REFMAN "http://dev.mysql.com/doc/refman/" \ |
1846 | IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ |
1847 | -diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c |
1848 | ---- a/storage/innobase/os/os0file.c 2011-02-23 19:00:47.928696481 +0900 |
1849 | -+++ b/storage/innobase/os/os0file.c 2011-02-23 19:01:19.200696353 +0900 |
1850 | +--- a/storage/innobase/os/os0file.c |
1851 | ++++ b/storage/innobase/os/os0file.c |
1852 | @@ -180,6 +180,7 @@ |
1853 | made and only the slot message |
1854 | needs to be passed to the caller |
1855 | @@ -524,7 +510,7 @@ |
1856 | fil_node_t* message1; /*!< message which is given by the */ |
1857 | void* message2; /*!< the requester of an aio operation |
1858 | and which can be used to identify |
1859 | -@@ -3685,7 +3686,8 @@ |
1860 | +@@ -3686,7 +3687,8 @@ |
1861 | offset */ |
1862 | ulint offset_high, /*!< in: most significant 32 bits of |
1863 | offset */ |
1864 | @@ -534,7 +520,7 @@ |
1865 | { |
1866 | os_aio_slot_t* slot = NULL; |
1867 | #ifdef WIN_ASYNC_IO |
1868 | -@@ -3774,6 +3776,7 @@ |
1869 | +@@ -3775,6 +3777,7 @@ |
1870 | slot->offset = offset; |
1871 | slot->offset_high = offset_high; |
1872 | slot->io_already_done = FALSE; |
1873 | @@ -542,7 +528,7 @@ |
1874 | |
1875 | #ifdef WIN_ASYNC_IO |
1876 | control = &(slot->control); |
1877 | -@@ -4061,6 +4064,7 @@ |
1878 | +@@ -4062,6 +4065,7 @@ |
1879 | (can be used to identify a completed |
1880 | aio operation); ignored if mode is |
1881 | OS_AIO_SYNC */ |
1882 | @@ -550,7 +536,7 @@ |
1883 | trx_t* trx) |
1884 | { |
1885 | os_aio_array_t* array; |
1886 | -@@ -4149,7 +4153,7 @@ |
1887 | +@@ -4150,7 +4154,7 @@ |
1888 | trx->io_read += n; |
1889 | } |
1890 | slot = os_aio_array_reserve_slot(type, array, message1, message2, file, |
1891 | @@ -559,7 +545,7 @@ |
1892 | if (type == OS_FILE_READ) { |
1893 | if (srv_use_native_aio) { |
1894 | os_n_file_reads++; |
1895 | -@@ -4268,7 +4272,8 @@ |
1896 | +@@ -4269,7 +4273,8 @@ |
1897 | parameters are valid and can be used to |
1898 | restart the operation, for example */ |
1899 | void** message2, |
1900 | @@ -569,7 +555,7 @@ |
1901 | { |
1902 | ulint orig_seg = segment; |
1903 | os_aio_array_t* array; |
1904 | -@@ -4347,6 +4352,7 @@ |
1905 | +@@ -4348,6 +4353,7 @@ |
1906 | *message2 = slot->message2; |
1907 | |
1908 | *type = slot->type; |
1909 | @@ -577,7 +563,7 @@ |
1910 | |
1911 | if (ret && len == slot->len) { |
1912 | ret_val = TRUE; |
1913 | -@@ -4575,7 +4581,8 @@ |
1914 | +@@ -4576,7 +4582,8 @@ |
1915 | aio operation failed, these output |
1916 | parameters are valid and can be used to |
1917 | restart the operation. */ |
1918 | @@ -587,7 +573,7 @@ |
1919 | { |
1920 | ulint segment; |
1921 | os_aio_array_t* array; |
1922 | -@@ -4648,6 +4655,7 @@ |
1923 | +@@ -4649,6 +4656,7 @@ |
1924 | *message2 = slot->message2; |
1925 | |
1926 | *type = slot->type; |
1927 | @@ -595,7 +581,7 @@ |
1928 | |
1929 | if ((slot->ret == 0) && (slot->n_bytes == (long)slot->len)) { |
1930 | ret = TRUE; |
1931 | -@@ -4701,7 +4709,8 @@ |
1932 | +@@ -4702,7 +4710,8 @@ |
1933 | parameters are valid and can be used to |
1934 | restart the operation, for example */ |
1935 | void** message2, |
1936 | @@ -605,7 +591,7 @@ |
1937 | { |
1938 | os_aio_array_t* array; |
1939 | ulint segment; |
1940 | -@@ -4997,6 +5006,7 @@ |
1941 | +@@ -4998,6 +5007,7 @@ |
1942 | *message2 = slot->message2; |
1943 | |
1944 | *type = slot->type; |
1945 | @@ -613,9 +599,8 @@ |
1946 | |
1947 | os_mutex_exit(array->mutex); |
1948 | |
1949 | -diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c |
1950 | ---- a/storage/innobase/row/row0mysql.c 2010-12-04 15:37:50.598481116 +0900 |
1951 | -+++ b/storage/innobase/row/row0mysql.c 2010-12-04 15:57:53.092563335 +0900 |
1952 | +--- a/storage/innobase/row/row0mysql.c |
1953 | ++++ b/storage/innobase/row/row0mysql.c |
1954 | @@ -51,6 +51,7 @@ |
1955 | #include "btr0sea.h" |
1956 | #include "fil0fil.h" |
1957 | @@ -638,9 +623,8 @@ |
1958 | if (prebuilt->sql_stat_start) { |
1959 | node->state = INS_NODE_SET_IX_LOCK; |
1960 | prebuilt->sql_stat_start = FALSE; |
1961 | -diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c |
1962 | ---- a/storage/innobase/row/row0sel.c 2010-12-04 15:52:23.494514495 +0900 |
1963 | -+++ b/storage/innobase/row/row0sel.c 2010-12-04 16:01:38.320883699 +0900 |
1964 | +--- a/storage/innobase/row/row0sel.c |
1965 | ++++ b/storage/innobase/row/row0sel.c |
1966 | @@ -3366,6 +3366,7 @@ |
1967 | ulint offsets_[REC_OFFS_NORMAL_SIZE]; |
1968 | ulint* offsets = offsets_; |
1969 | @@ -686,9 +670,8 @@ |
1970 | trx_print(stderr, trx, 600); |
1971 | fputc('\n', stderr); |
1972 | ut_error; |
1973 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
1974 | ---- a/storage/innobase/srv/srv0srv.c 2011-02-23 19:00:48.283695497 +0900 |
1975 | -+++ b/storage/innobase/srv/srv0srv.c 2011-02-23 19:01:19.204696643 +0900 |
1976 | +--- a/storage/innobase/srv/srv0srv.c |
1977 | ++++ b/storage/innobase/srv/srv0srv.c |
1978 | @@ -441,6 +441,8 @@ |
1979 | UNIV_INTERN ulint srv_pass_corrupt_table = 0; /* 0:disable 1:enable */ |
1980 | |
1981 | @@ -698,9 +681,8 @@ |
1982 | /*-------------------------------------------*/ |
1983 | UNIV_INTERN ulong srv_n_spin_wait_rounds = 30; |
1984 | UNIV_INTERN ulong srv_n_free_tickets_to_enter = 500; |
1985 | -diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c |
1986 | ---- a/storage/innobase/srv/srv0start.c 2010-12-04 15:57:13.073495392 +0900 |
1987 | -+++ b/storage/innobase/srv/srv0start.c 2010-12-04 16:02:50.704884053 +0900 |
1988 | +--- a/storage/innobase/srv/srv0start.c |
1989 | ++++ b/storage/innobase/srv/srv0start.c |
1990 | @@ -2161,7 +2161,7 @@ |
1991 | if (srv_print_verbose_log) { |
1992 | ut_print_timestamp(stderr); |
1993 | @@ -710,9 +692,8 @@ |
1994 | "log sequence number %llu\n", |
1995 | INNODB_VERSION_STR, srv_start_lsn); |
1996 | } |
1997 | -diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c |
1998 | ---- a/storage/innobase/sync/sync0sync.c 2011-02-25 14:18:55.817202060 +0900 |
1999 | -+++ b/storage/innobase/sync/sync0sync.c 2011-02-25 14:19:44.596202017 +0900 |
2000 | +--- a/storage/innobase/sync/sync0sync.c |
2001 | ++++ b/storage/innobase/sync/sync0sync.c |
2002 | @@ -1220,6 +1220,7 @@ |
2003 | case SYNC_LOG_FLUSH_ORDER: |
2004 | case SYNC_THR_LOCAL: |
2005 | @@ -721,9 +702,8 @@ |
2006 | case SYNC_FILE_FORMAT_TAG: |
2007 | case SYNC_DOUBLEWRITE: |
2008 | case SYNC_SEARCH_SYS: |
2009 | -diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c |
2010 | ---- a/storage/innobase/trx/trx0purge.c 2010-11-03 07:01:13.000000000 +0900 |
2011 | -+++ b/storage/innobase/trx/trx0purge.c 2010-12-04 15:57:53.106551154 +0900 |
2012 | +--- a/storage/innobase/trx/trx0purge.c |
2013 | ++++ b/storage/innobase/trx/trx0purge.c |
2014 | @@ -1149,8 +1149,7 @@ |
2015 | /* If we cannot advance the 'purge view' because of an old |
2016 | 'consistent read view', then the DML statements cannot be delayed. |
2017 | |
2018 | === modified file 'patches/innodb_io_patches.patch' |
2019 | --- patches/innodb_io_patches.patch 2011-07-22 16:56:42 +0000 |
2020 | +++ patches/innodb_io_patches.patch 2011-07-27 11:32:35 +0000 |
2021 | @@ -5,9 +5,8 @@ |
2022 | #!!! notice !!! |
2023 | # Any small change to this file in the main branch |
2024 | # should be done or reviewed by the maintainer! |
2025 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
2026 | ---- a/storage/innobase/buf/buf0buf.c 2011-07-07 18:43:12.000000000 +0400 |
2027 | -+++ b/storage/innobase/buf/buf0buf.c 2011-07-07 19:01:24.000000000 +0400 |
2028 | +--- a/storage/innobase/buf/buf0buf.c |
2029 | ++++ b/storage/innobase/buf/buf0buf.c |
2030 | @@ -320,6 +320,7 @@ |
2031 | |
2032 | /* When we traverse all the flush lists we don't want another |
2033 | @@ -24,9 +23,8 @@ |
2034 | log_flush_order_mutex_exit(); |
2035 | |
2036 | /* The returned answer may be out of date: the flush_list can |
2037 | -diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c |
2038 | ---- a/storage/innobase/buf/buf0flu.c 2011-07-07 18:43:12.000000000 +0400 |
2039 | -+++ b/storage/innobase/buf/buf0flu.c 2011-07-07 19:01:24.000000000 +0400 |
2040 | +--- a/storage/innobase/buf/buf0flu.c |
2041 | ++++ b/storage/innobase/buf/buf0flu.c |
2042 | @@ -855,7 +855,7 @@ |
2043 | flush: |
2044 | /* Now flush the doublewrite buffer data to disk */ |
2045 | @@ -45,9 +43,8 @@ |
2046 | /* If there is little space, it is better not to flush |
2047 | any block except from the end of the LRU list */ |
2048 | |
2049 | -diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c |
2050 | ---- a/storage/innobase/buf/buf0rea.c 2011-05-11 15:54:12.000000000 +0400 |
2051 | -+++ b/storage/innobase/buf/buf0rea.c 2011-07-07 19:01:24.000000000 +0400 |
2052 | +--- a/storage/innobase/buf/buf0rea.c |
2053 | ++++ b/storage/innobase/buf/buf0rea.c |
2054 | @@ -260,6 +260,10 @@ |
2055 | = BUF_READ_AHEAD_LINEAR_AREA(buf_pool); |
2056 | ulint threshold; |
2057 | @@ -59,9 +56,8 @@ |
2058 | if (UNIV_UNLIKELY(srv_startup_is_before_trx_rollback_phase)) { |
2059 | /* No read-ahead to avoid thread deadlocks */ |
2060 | return(0); |
2061 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
2062 | ---- a/storage/innobase/fil/fil0fil.c 2011-07-07 18:43:12.000000000 +0400 |
2063 | -+++ b/storage/innobase/fil/fil0fil.c 2011-07-07 19:01:22.000000000 +0400 |
2064 | +--- a/storage/innobase/fil/fil0fil.c |
2065 | ++++ b/storage/innobase/fil/fil0fil.c |
2066 | @@ -2600,7 +2600,7 @@ |
2067 | |
2068 | os_thread_sleep(20000); |
2069 | @@ -136,9 +132,8 @@ |
2070 | } |
2071 | |
2072 | mem_free(space_ids); |
2073 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
2074 | ---- a/storage/innobase/handler/ha_innodb.cc 2011-07-07 18:43:12.000000000 +0400 |
2075 | -+++ b/storage/innobase/handler/ha_innodb.cc 2011-07-07 19:01:24.000000000 +0400 |
2076 | +--- a/storage/innobase/handler/ha_innodb.cc |
2077 | ++++ b/storage/innobase/handler/ha_innodb.cc |
2078 | @@ -444,6 +444,12 @@ |
2079 | "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.", |
2080 | NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0); |
2081 | @@ -341,9 +336,8 @@ |
2082 | MYSQL_SYSVAR(use_sys_malloc), |
2083 | MYSQL_SYSVAR(use_native_aio), |
2084 | MYSQL_SYSVAR(change_buffering), |
2085 | -diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c |
2086 | ---- a/storage/innobase/ibuf/ibuf0ibuf.c 2011-05-11 15:54:12.000000000 +0400 |
2087 | -+++ b/storage/innobase/ibuf/ibuf0ibuf.c 2011-07-07 19:01:23.000000000 +0400 |
2088 | +--- a/storage/innobase/ibuf/ibuf0ibuf.c |
2089 | ++++ b/storage/innobase/ibuf/ibuf0ibuf.c |
2090 | @@ -514,8 +514,10 @@ |
2091 | grow in size, as the references on the upper levels of the tree can |
2092 | change */ |
2093 | @@ -369,9 +363,8 @@ |
2094 | |
2095 | sync = (size >= max_size + IBUF_CONTRACT_ON_INSERT_SYNC); |
2096 | |
2097 | -diff -ruN a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h |
2098 | ---- a/storage/innobase/include/buf0rea.h 2011-05-11 15:54:12.000000000 +0400 |
2099 | -+++ b/storage/innobase/include/buf0rea.h 2011-07-07 19:01:21.000000000 +0400 |
2100 | +--- a/storage/innobase/include/buf0rea.h |
2101 | ++++ b/storage/innobase/include/buf0rea.h |
2102 | @@ -124,8 +124,7 @@ |
2103 | |
2104 | /** The size in pages of the area which the read-ahead algorithms read if |
2105 | @@ -382,9 +375,8 @@ |
2106 | |
2107 | /** @name Modes used in read-ahead @{ */ |
2108 | /** read only pages belonging to the insert buffer tree */ |
2109 | -diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h |
2110 | ---- a/storage/innobase/include/fil0fil.h 2011-07-07 18:43:12.000000000 +0400 |
2111 | -+++ b/storage/innobase/include/fil0fil.h 2011-07-07 19:01:21.000000000 +0400 |
2112 | +--- a/storage/innobase/include/fil0fil.h |
2113 | ++++ b/storage/innobase/include/fil0fil.h |
2114 | @@ -658,8 +658,9 @@ |
2115 | void |
2116 | fil_flush( |
2117 | @@ -396,9 +388,8 @@ |
2118 | /**********************************************************************//** |
2119 | Flushes to disk writes in file spaces of the given type possibly cached by |
2120 | the OS. */ |
2121 | -diff -ruN a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h |
2122 | ---- a/storage/innobase/include/ha_prototypes.h 2011-05-11 15:54:12.000000000 +0400 |
2123 | -+++ b/storage/innobase/include/ha_prototypes.h 2011-07-07 18:43:13.000000000 +0400 |
2124 | +--- a/storage/innobase/include/ha_prototypes.h |
2125 | ++++ b/storage/innobase/include/ha_prototypes.h |
2126 | @@ -284,6 +284,13 @@ |
2127 | /*===================*/ |
2128 | void* thd, /*!< in: thread handle (THD*) */ |
2129 | @@ -413,9 +404,8 @@ |
2130 | |
2131 | /**********************************************************************//** |
2132 | Get the current setting of the lower_case_table_names global parameter from |
2133 | -diff -ruN a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h |
2134 | ---- a/storage/innobase/include/os0file.h 2011-05-11 15:54:12.000000000 +0400 |
2135 | -+++ b/storage/innobase/include/os0file.h 2011-07-07 19:01:21.000000000 +0400 |
2136 | +--- a/storage/innobase/include/os0file.h |
2137 | ++++ b/storage/innobase/include/os0file.h |
2138 | @@ -296,8 +296,8 @@ |
2139 | pfs_os_file_write_func(name, file, buf, offset, offset_high, \ |
2140 | n, __FILE__, __LINE__) |
2141 | @@ -454,9 +444,8 @@ |
2142 | /***********************************************************************//** |
2143 | Retrieves the last error number if an error occurs in a file io function. |
2144 | The number should be retrieved before any other OS calls (because they may |
2145 | -diff -ruN a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic |
2146 | ---- a/storage/innobase/include/os0file.ic 2011-05-11 15:54:12.000000000 +0400 |
2147 | -+++ b/storage/innobase/include/os0file.ic 2011-07-07 19:01:21.000000000 +0400 |
2148 | +--- a/storage/innobase/include/os0file.ic |
2149 | ++++ b/storage/innobase/include/os0file.ic |
2150 | @@ -369,6 +369,7 @@ |
2151 | pfs_os_file_flush_func( |
2152 | /*===================*/ |
2153 | @@ -474,9 +463,8 @@ |
2154 | |
2155 | register_pfs_file_io_end(locker, 0); |
2156 | |
2157 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
2158 | ---- a/storage/innobase/include/srv0srv.h 2011-07-07 18:43:12.000000000 +0400 |
2159 | -+++ b/storage/innobase/include/srv0srv.h 2011-07-07 19:01:23.000000000 +0400 |
2160 | +--- a/storage/innobase/include/srv0srv.h |
2161 | ++++ b/storage/innobase/include/srv0srv.h |
2162 | @@ -138,7 +138,8 @@ |
2163 | extern ulint srv_n_log_files; |
2164 | extern ulint srv_log_file_size; |
2165 | @@ -515,9 +503,8 @@ |
2166 | }; |
2167 | |
2168 | /** Alternatives for file i/o in Windows */ |
2169 | -diff -ruN a/storage/innobase/log/log0log.c b/storage/innobase/log/log0log.c |
2170 | ---- a/storage/innobase/log/log0log.c 2011-05-11 15:54:12.000000000 +0400 |
2171 | -+++ b/storage/innobase/log/log0log.c 2011-07-07 19:01:19.000000000 +0400 |
2172 | +--- a/storage/innobase/log/log0log.c |
2173 | ++++ b/storage/innobase/log/log0log.c |
2174 | @@ -48,6 +48,7 @@ |
2175 | #include "srv0start.h" |
2176 | #include "trx0sys.h" |
2177 | @@ -674,9 +661,8 @@ |
2178 | current_time = time(NULL); |
2179 | |
2180 | time_elapsed = 0.001 + difftime(current_time, |
2181 | -diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c |
2182 | ---- a/storage/innobase/log/log0recv.c 2011-05-11 15:54:12.000000000 +0400 |
2183 | -+++ b/storage/innobase/log/log0recv.c 2011-07-07 19:01:22.000000000 +0400 |
2184 | +--- a/storage/innobase/log/log0recv.c |
2185 | ++++ b/storage/innobase/log/log0recv.c |
2186 | @@ -2906,9 +2906,12 @@ |
2187 | ib_uint64_t archived_lsn; |
2188 | #endif /* UNIV_LOG_ARCHIVE */ |
2189 | @@ -709,9 +695,8 @@ |
2190 | os_file_close(log_file); |
2191 | |
2192 | ut_free(buf); |
2193 | -diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c |
2194 | ---- a/storage/innobase/os/os0file.c 2011-05-11 15:54:12.000000000 +0400 |
2195 | -+++ b/storage/innobase/os/os0file.c 2011-07-07 19:01:37.000000000 +0400 |
2196 | +--- a/storage/innobase/os/os0file.c |
2197 | ++++ b/storage/innobase/os/os0file.c |
2198 | @@ -1424,7 +1424,7 @@ |
2199 | #endif |
2200 | #ifdef UNIV_NON_BUFFERED_IO |
2201 | @@ -855,9 +840,8 @@ |
2202 | ut_error; |
2203 | } |
2204 | #endif /* UNIV_DO_FLUSH */ |
2205 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
2206 | ---- a/storage/innobase/srv/srv0srv.c 2011-07-07 18:43:13.000000000 +0400 |
2207 | -+++ b/storage/innobase/srv/srv0srv.c 2011-07-07 19:01:23.000000000 +0400 |
2208 | +--- a/storage/innobase/srv/srv0srv.c |
2209 | ++++ b/storage/innobase/srv/srv0srv.c |
2210 | @@ -183,7 +183,8 @@ |
2211 | UNIV_INTERN ulint srv_log_file_size = ULINT_MAX; |
2212 | /* size in database pages */ |
2213 | @@ -1277,9 +1261,8 @@ |
2214 | } |
2215 | |
2216 | mutex_enter(&kernel_mutex); |
2217 | -diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c |
2218 | ---- a/storage/innobase/srv/srv0start.c 2011-05-11 15:54:12.000000000 +0400 |
2219 | -+++ b/storage/innobase/srv/srv0start.c 2011-07-07 19:01:21.000000000 +0400 |
2220 | +--- a/storage/innobase/srv/srv0start.c |
2221 | ++++ b/storage/innobase/srv/srv0start.c |
2222 | @@ -1217,6 +1217,9 @@ |
2223 | } else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DIRECT")) { |
2224 | srv_unix_file_flush_method = SRV_UNIX_O_DIRECT; |
2225 | @@ -1290,9 +1273,8 @@ |
2226 | } else if (0 == ut_strcmp(srv_file_flush_method_str, "littlesync")) { |
2227 | srv_unix_file_flush_method = SRV_UNIX_LITTLESYNC; |
2228 | |
2229 | -diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c |
2230 | ---- a/storage/innobase/trx/trx0purge.c 2011-07-07 18:43:13.000000000 +0400 |
2231 | -+++ b/storage/innobase/trx/trx0purge.c 2011-07-07 19:01:19.000000000 +0400 |
2232 | +--- a/storage/innobase/trx/trx0purge.c |
2233 | ++++ b/storage/innobase/trx/trx0purge.c |
2234 | @@ -392,10 +392,10 @@ |
2235 | trx_sys->rseg_history_len++; |
2236 | mutex_exit(&kernel_mutex); |
2237 | @@ -1306,9 +1288,8 @@ |
2238 | } |
2239 | |
2240 | /**********************************************************************//** |
2241 | -diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c |
2242 | ---- a/storage/innobase/trx/trx0trx.c 2011-05-11 15:54:12.000000000 +0400 |
2243 | -+++ b/storage/innobase/trx/trx0trx.c 2011-07-07 19:01:24.000000000 +0400 |
2244 | +--- a/storage/innobase/trx/trx0trx.c |
2245 | ++++ b/storage/innobase/trx/trx0trx.c |
2246 | @@ -984,6 +984,7 @@ |
2247 | trx->read_view = NULL; |
2248 | |
2249 | |
2250 | === modified file 'patches/innodb_lru_dump_restore.patch' |
2251 | --- patches/innodb_lru_dump_restore.patch 2011-07-22 16:56:42 +0000 |
2252 | +++ patches/innodb_lru_dump_restore.patch 2011-07-27 11:32:35 +0000 |
2253 | @@ -5,9 +5,8 @@ |
2254 | #!!! notice !!! |
2255 | # Any small change to this file in the main branch |
2256 | # should be done or reviewed by the maintainer! |
2257 | -diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c |
2258 | ---- a/storage/innobase/buf/buf0lru.c 2010-12-03 15:49:59.185023424 +0900 |
2259 | -+++ b/storage/innobase/buf/buf0lru.c 2010-12-04 15:33:37.626482350 +0900 |
2260 | +--- a/storage/innobase/buf/buf0lru.c |
2261 | ++++ b/storage/innobase/buf/buf0lru.c |
2262 | @@ -2247,6 +2247,284 @@ |
2263 | memset(&buf_LRU_stat_cur, 0, sizeof buf_LRU_stat_cur); |
2264 | } |
2265 | @@ -293,9 +292,8 @@ |
2266 | #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG |
2267 | /**********************************************************************//** |
2268 | Validates the LRU list for one buffer pool instance. */ |
2269 | -diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c |
2270 | ---- a/storage/innobase/buf/buf0rea.c 2010-12-03 17:49:11.576124814 +0900 |
2271 | -+++ b/storage/innobase/buf/buf0rea.c 2010-12-04 15:33:37.628480605 +0900 |
2272 | +--- a/storage/innobase/buf/buf0rea.c |
2273 | ++++ b/storage/innobase/buf/buf0rea.c |
2274 | @@ -58,7 +58,7 @@ |
2275 | which case it is never read into the pool, or if the tablespace does |
2276 | not exist or is being dropped |
2277 | @@ -305,9 +303,8 @@ |
2278 | ulint |
2279 | buf_read_page_low( |
2280 | /*==============*/ |
2281 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
2282 | ---- a/storage/innobase/fil/fil0fil.c 2010-12-03 17:49:11.581025127 +0900 |
2283 | -+++ b/storage/innobase/fil/fil0fil.c 2010-12-04 15:33:37.632482885 +0900 |
2284 | +--- a/storage/innobase/fil/fil0fil.c |
2285 | ++++ b/storage/innobase/fil/fil0fil.c |
2286 | @@ -5289,6 +5289,70 @@ |
2287 | return(DB_SUCCESS); |
2288 | } |
2289 | @@ -379,9 +376,8 @@ |
2290 | #ifndef UNIV_HOTBACKUP |
2291 | /**********************************************************************//** |
2292 | Waits for an aio operation to complete. This function is used to write the |
2293 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
2294 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:49:11.589956135 +0900 |
2295 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:33:37.645555490 +0900 |
2296 | +--- a/storage/innobase/handler/ha_innodb.cc |
2297 | ++++ b/storage/innobase/handler/ha_innodb.cc |
2298 | @@ -11793,6 +11793,12 @@ |
2299 | "Limit the allocated memory for dictionary cache. (0: unlimited)", |
2300 | NULL, NULL, 0, 0, LONG_MAX, 0); |
2301 | @@ -403,9 +399,8 @@ |
2302 | MYSQL_SYSVAR(purge_threads), |
2303 | MYSQL_SYSVAR(purge_batch_size), |
2304 | MYSQL_SYSVAR(rollback_segments), |
2305 | -diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc |
2306 | ---- a/storage/innobase/handler/i_s.cc 2010-12-03 17:34:35.286211349 +0900 |
2307 | -+++ b/storage/innobase/handler/i_s.cc 2010-12-04 15:33:37.677480733 +0900 |
2308 | +--- a/storage/innobase/handler/i_s.cc |
2309 | ++++ b/storage/innobase/handler/i_s.cc |
2310 | @@ -50,6 +50,7 @@ |
2311 | #include "trx0rseg.h" /* for trx_rseg_struct */ |
2312 | #include "trx0sys.h" /* for trx_sys */ |
2313 | @@ -451,9 +446,8 @@ |
2314 | |
2315 | field_store_string(i_s_table->field[0], |
2316 | "Undefined XTRA_* command."); |
2317 | -diff -ruN a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h |
2318 | ---- a/storage/innobase/include/buf0lru.h 2010-12-03 15:49:59.223956070 +0900 |
2319 | -+++ b/storage/innobase/include/buf0lru.h 2010-12-04 15:33:37.681481467 +0900 |
2320 | +--- a/storage/innobase/include/buf0lru.h |
2321 | ++++ b/storage/innobase/include/buf0lru.h |
2322 | @@ -215,6 +215,18 @@ |
2323 | void |
2324 | buf_LRU_stat_update(void); |
2325 | @@ -473,9 +467,8 @@ |
2326 | |
2327 | #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG |
2328 | /**********************************************************************//** |
2329 | -diff -ruN a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h |
2330 | ---- a/storage/innobase/include/buf0rea.h 2010-12-03 17:49:11.596953870 +0900 |
2331 | -+++ b/storage/innobase/include/buf0rea.h 2010-12-04 15:33:37.682563900 +0900 |
2332 | +--- a/storage/innobase/include/buf0rea.h |
2333 | ++++ b/storage/innobase/include/buf0rea.h |
2334 | @@ -31,6 +31,37 @@ |
2335 | #include "buf0types.h" |
2336 | |
2337 | @@ -514,9 +507,8 @@ |
2338 | High-level function which reads a page asynchronously from a file to the |
2339 | buffer buf_pool if it is not already there. Sets the io_fix flag and sets |
2340 | an exclusive lock on the buffer frame. The flag is cleared and the x-lock |
2341 | -diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h |
2342 | ---- a/storage/innobase/include/fil0fil.h 2010-12-03 17:49:11.597953501 +0900 |
2343 | -+++ b/storage/innobase/include/fil0fil.h 2010-12-04 15:33:37.684551372 +0900 |
2344 | +--- a/storage/innobase/include/fil0fil.h |
2345 | ++++ b/storage/innobase/include/fil0fil.h |
2346 | @@ -644,6 +644,14 @@ |
2347 | void* message, /*!< in: message for aio handler if non-sync |
2348 | aio used, else ignored */ |
2349 | @@ -532,9 +524,8 @@ |
2350 | /**********************************************************************//** |
2351 | Waits for an aio operation to complete. This function is used to write the |
2352 | handler for completed requests. The aio array of pending requests is divided |
2353 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
2354 | ---- a/storage/innobase/include/srv0srv.h 2010-12-03 17:49:11.603969747 +0900 |
2355 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-04 15:33:37.685550816 +0900 |
2356 | +--- a/storage/innobase/include/srv0srv.h |
2357 | ++++ b/storage/innobase/include/srv0srv.h |
2358 | @@ -356,6 +356,9 @@ |
2359 | reading of a disk page */ |
2360 | extern ulint srv_buf_pool_reads; |
2361 | @@ -562,9 +553,8 @@ |
2362 | /******************************************************************//** |
2363 | Outputs to a file the output of the InnoDB Monitor. |
2364 | @return FALSE if not all information printed |
2365 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
2366 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-03 17:49:11.620986661 +0900 |
2367 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 15:33:37.708550811 +0900 |
2368 | +--- a/storage/innobase/srv/srv0srv.c |
2369 | ++++ b/storage/innobase/srv/srv0srv.c |
2370 | @@ -330,6 +330,9 @@ |
2371 | reading of a disk page */ |
2372 | UNIV_INTERN ulint srv_buf_pool_reads = 0; |
2373 | @@ -575,15 +565,10 @@ |
2374 | /* structure to pass status variables to MySQL */ |
2375 | UNIV_INTERN export_struc export_vars; |
2376 | |
2377 | -@@ -2701,6 +2704,56 @@ |
2378 | - /* We count the number of threads in os_thread_exit(). A created |
2379 | - thread should always use that to exit and not use return() to exit. */ |
2380 | +@@ -2706,6 +2709,56 @@ |
2381 | + OS_THREAD_DUMMY_RETURN; |
2382 | + } |
2383 | |
2384 | -+ os_thread_exit(NULL); |
2385 | -+ |
2386 | -+ OS_THREAD_DUMMY_RETURN; |
2387 | -+} |
2388 | -+ |
2389 | +/*********************************************************************//** |
2390 | +A thread which restores the buffer pool from a dump file on startup and does |
2391 | +periodic buffer pool dumps. |
2392 | @@ -629,12 +614,16 @@ |
2393 | + /* We count the number of threads in os_thread_exit(). A created |
2394 | + thread should always use that to exit and not use return() to exit. */ |
2395 | + |
2396 | - os_thread_exit(NULL); |
2397 | - |
2398 | - OS_THREAD_DUMMY_RETURN; |
2399 | -diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c |
2400 | ---- a/storage/innobase/srv/srv0start.c 2010-12-03 15:18:48.916955609 +0900 |
2401 | -+++ b/storage/innobase/srv/srv0start.c 2010-12-04 15:33:37.711484798 +0900 |
2402 | ++ os_thread_exit(NULL); |
2403 | ++ |
2404 | ++ OS_THREAD_DUMMY_RETURN; |
2405 | ++} |
2406 | ++ |
2407 | + /**********************************************************************//** |
2408 | + Check whether any background thread is active. |
2409 | + @return FALSE if all are are suspended or have exited. */ |
2410 | +--- a/storage/innobase/srv/srv0start.c |
2411 | ++++ b/storage/innobase/srv/srv0start.c |
2412 | @@ -120,9 +120,9 @@ |
2413 | static os_file_t files[1000]; |
2414 | |
2415 | |
2416 | === modified file 'patches/innodb_opt_lru_count.patch' |
2417 | --- patches/innodb_opt_lru_count.patch 2011-07-22 16:56:42 +0000 |
2418 | +++ patches/innodb_opt_lru_count.patch 2011-07-27 11:32:35 +0000 |
2419 | @@ -5,9 +5,8 @@ |
2420 | #!!! notice !!! |
2421 | # Any small change to this file in the main branch |
2422 | # should be done or reviewed by the maintainer! |
2423 | -diff -ruN a/storage/innobase/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c |
2424 | ---- a/storage/innobase/buf/buf0buddy.c 2010-11-03 07:01:13.000000000 +0900 |
2425 | -+++ b/storage/innobase/buf/buf0buddy.c 2010-12-03 15:20:49.593024343 +0900 |
2426 | +--- a/storage/innobase/buf/buf0buddy.c |
2427 | ++++ b/storage/innobase/buf/buf0buddy.c |
2428 | @@ -137,7 +137,7 @@ |
2429 | ut_ad(buf_page_get_state(ut_list_node_313) |
2430 | == BUF_BLOCK_ZIP_FREE))); |
2431 | @@ -17,9 +16,8 @@ |
2432 | |
2433 | if (bpage) { |
2434 | UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i); |
2435 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
2436 | ---- a/storage/innobase/buf/buf0buf.c 2010-12-03 15:18:48.866986963 +0900 |
2437 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-03 15:20:49.595987311 +0900 |
2438 | +--- a/storage/innobase/buf/buf0buf.c |
2439 | ++++ b/storage/innobase/buf/buf0buf.c |
2440 | @@ -881,9 +881,9 @@ |
2441 | block->page.in_zip_hash = FALSE; |
2442 | block->page.in_flush_list = FALSE; |
2443 | @@ -59,9 +57,8 @@ |
2444 | |
2445 | frame = block->frame; |
2446 | |
2447 | -diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c |
2448 | ---- a/storage/innobase/buf/buf0flu.c 2010-12-03 15:18:48.868953442 +0900 |
2449 | -+++ b/storage/innobase/buf/buf0flu.c 2010-12-03 15:20:49.599986956 +0900 |
2450 | +--- a/storage/innobase/buf/buf0flu.c |
2451 | ++++ b/storage/innobase/buf/buf0flu.c |
2452 | @@ -431,19 +431,21 @@ |
2453 | buf_page_in_file(bpage) and in the LRU list */ |
2454 | { |
2455 | @@ -187,9 +184,8 @@ |
2456 | } |
2457 | } |
2458 | |
2459 | -diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c |
2460 | ---- a/storage/innobase/buf/buf0lru.c 2010-11-03 07:01:13.000000000 +0900 |
2461 | -+++ b/storage/innobase/buf/buf0lru.c 2010-12-03 15:20:49.602952786 +0900 |
2462 | +--- a/storage/innobase/buf/buf0lru.c |
2463 | ++++ b/storage/innobase/buf/buf0lru.c |
2464 | @@ -996,7 +996,7 @@ |
2465 | |
2466 | /* No free block was found: try to flush the LRU list */ |
2467 | @@ -235,9 +231,8 @@ |
2468 | buf_LRU_add_block_low(b, buf_page_is_old(b)); |
2469 | } |
2470 | |
2471 | -diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c |
2472 | ---- a/storage/innobase/buf/buf0rea.c 2010-12-03 15:18:48.870953384 +0900 |
2473 | -+++ b/storage/innobase/buf/buf0rea.c 2010-12-03 15:20:49.604956032 +0900 |
2474 | +--- a/storage/innobase/buf/buf0rea.c |
2475 | ++++ b/storage/innobase/buf/buf0rea.c |
2476 | @@ -200,7 +200,7 @@ |
2477 | } |
2478 | |
2479 | @@ -274,9 +269,8 @@ |
2480 | |
2481 | #ifdef UNIV_DEBUG |
2482 | if (buf_debug_prints) { |
2483 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
2484 | ---- a/storage/innobase/include/buf0buf.h 2010-11-03 07:01:13.000000000 +0900 |
2485 | -+++ b/storage/innobase/include/buf0buf.h 2010-12-03 15:20:49.608986590 +0900 |
2486 | +--- a/storage/innobase/include/buf0buf.h |
2487 | ++++ b/storage/innobase/include/buf0buf.h |
2488 | @@ -1387,11 +1387,11 @@ |
2489 | |
2490 | UT_LIST_NODE_T(buf_page_t) LRU; |
2491 | @@ -291,9 +285,8 @@ |
2492 | unsigned old:1; /*!< TRUE if the block is in the old |
2493 | blocks in buf_pool->LRU_old */ |
2494 | unsigned freed_page_clock:31;/*!< the value of |
2495 | -diff -ruN a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h |
2496 | ---- a/storage/innobase/include/buf0flu.h 2010-11-03 07:01:13.000000000 +0900 |
2497 | -+++ b/storage/innobase/include/buf0flu.h 2010-12-03 15:20:49.609953185 +0900 |
2498 | +--- a/storage/innobase/include/buf0flu.h |
2499 | ++++ b/storage/innobase/include/buf0flu.h |
2500 | @@ -65,13 +65,15 @@ |
2501 | void |
2502 | buf_flush_free_margin( |
2503 | |
2504 | === modified file 'patches/innodb_overwrite_relay_log_info.patch' |
2505 | --- patches/innodb_overwrite_relay_log_info.patch 2011-07-22 16:56:42 +0000 |
2506 | +++ patches/innodb_overwrite_relay_log_info.patch 2011-07-27 11:32:35 +0000 |
2507 | @@ -5,9 +5,8 @@ |
2508 | #!!! notice !!! |
2509 | # Any small change to this file in the main branch |
2510 | # should be done or reviewed by the maintainer! |
2511 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
2512 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:37:45.516105468 +0900 |
2513 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:38:20.318952987 +0900 |
2514 | +--- a/storage/innobase/handler/ha_innodb.cc |
2515 | ++++ b/storage/innobase/handler/ha_innodb.cc |
2516 | @@ -42,6 +42,8 @@ |
2517 | #pragma implementation // gcc: Class implementation |
2518 | #endif |
2519 | @@ -270,9 +269,8 @@ |
2520 | MYSQL_SYSVAR(rollback_on_timeout), |
2521 | MYSQL_SYSVAR(stats_on_metadata), |
2522 | MYSQL_SYSVAR(stats_sample_pages), |
2523 | -diff -ruN a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h |
2524 | ---- a/storage/innobase/include/trx0sys.h 2010-11-03 07:01:13.000000000 +0900 |
2525 | -+++ b/storage/innobase/include/trx0sys.h 2010-12-03 15:38:20.321953297 +0900 |
2526 | +--- a/storage/innobase/include/trx0sys.h |
2527 | ++++ b/storage/innobase/include/trx0sys.h |
2528 | @@ -53,6 +53,9 @@ |
2529 | extern ib_int64_t trx_sys_mysql_master_log_pos; |
2530 | /* @} */ |
2531 | @@ -309,9 +307,8 @@ |
2532 | |
2533 | /** The offset of the MySQL binlog offset info in the trx system header */ |
2534 | #define TRX_SYS_MYSQL_LOG_INFO (UNIV_PAGE_SIZE - 1000) |
2535 | -diff -ruN a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h |
2536 | ---- a/storage/innobase/include/trx0trx.h 2010-12-03 15:18:48.894955550 +0900 |
2537 | -+++ b/storage/innobase/include/trx0trx.h 2010-12-03 15:38:20.323953416 +0900 |
2538 | +--- a/storage/innobase/include/trx0trx.h |
2539 | ++++ b/storage/innobase/include/trx0trx.h |
2540 | @@ -580,6 +580,20 @@ |
2541 | ib_int64_t mysql_log_offset;/* if MySQL binlog is used, this field |
2542 | contains the end offset of the binlog |
2543 | @@ -333,9 +330,8 @@ |
2544 | /*------------------------------*/ |
2545 | ulint n_mysql_tables_in_use; /* number of Innobase tables |
2546 | used in the processing of the current |
2547 | -diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c |
2548 | ---- a/storage/innobase/trx/trx0sys.c 2010-11-03 07:01:13.000000000 +0900 |
2549 | -+++ b/storage/innobase/trx/trx0sys.c 2010-12-03 15:38:20.325956917 +0900 |
2550 | +--- a/storage/innobase/trx/trx0sys.c |
2551 | ++++ b/storage/innobase/trx/trx0sys.c |
2552 | @@ -76,13 +76,16 @@ |
2553 | file name and position here. */ |
2554 | /* @{ */ |
2555 | @@ -434,9 +430,8 @@ |
2556 | mtr_commit(&mtr); |
2557 | } |
2558 | |
2559 | -diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c |
2560 | ---- a/storage/innobase/trx/trx0trx.c 2010-12-03 15:37:45.549028990 +0900 |
2561 | -+++ b/storage/innobase/trx/trx0trx.c 2010-12-03 15:38:20.328957217 +0900 |
2562 | +--- a/storage/innobase/trx/trx0trx.c |
2563 | ++++ b/storage/innobase/trx/trx0trx.c |
2564 | @@ -138,6 +138,10 @@ |
2565 | |
2566 | trx->mysql_log_file_name = NULL; |
2567 | |
2568 | === modified file 'patches/innodb_pass_corrupt_table.patch' |
2569 | --- patches/innodb_pass_corrupt_table.patch 2011-07-22 16:56:42 +0000 |
2570 | +++ patches/innodb_pass_corrupt_table.patch 2011-07-27 11:32:35 +0000 |
2571 | @@ -5,9 +5,8 @@ |
2572 | #!!! notice !!! |
2573 | # Any small change to this file in the main branch |
2574 | # should be done or reviewed by the maintainer! |
2575 | -diff -ruN a/storage/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c |
2576 | ---- a/storage/innobase/btr/btr0btr.c 2010-11-03 07:01:13.000000000 +0900 |
2577 | -+++ b/storage/innobase/btr/btr0btr.c 2010-12-04 15:38:18.110513593 +0900 |
2578 | +--- a/storage/innobase/btr/btr0btr.c |
2579 | ++++ b/storage/innobase/btr/btr0btr.c |
2580 | @@ -691,6 +691,12 @@ |
2581 | root_page_no = dict_index_get_page(index); |
2582 | |
2583 | @@ -73,9 +72,8 @@ |
2584 | btr_search_drop_page_hash_index(block); |
2585 | |
2586 | header = buf_block_get_frame(block) + PAGE_HEADER + PAGE_BTR_SEG_TOP; |
2587 | -diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c |
2588 | ---- a/storage/innobase/btr/btr0cur.c 2010-12-03 17:30:16.239038936 +0900 |
2589 | -+++ b/storage/innobase/btr/btr0cur.c 2010-12-04 15:38:18.114551906 +0900 |
2590 | +--- a/storage/innobase/btr/btr0cur.c |
2591 | ++++ b/storage/innobase/btr/btr0cur.c |
2592 | @@ -250,6 +250,11 @@ |
2593 | case BTR_MODIFY_LEAF: |
2594 | mode = latch_mode == BTR_SEARCH_LEAF ? RW_S_LATCH : RW_X_LATCH; |
2595 | @@ -255,9 +253,8 @@ |
2596 | rec = page_rec_get_next(page_get_infimum_rec(page)); |
2597 | |
2598 | if (!page_rec_is_supremum(rec)) { |
2599 | -diff -ruN a/storage/innobase/btr/btr0pcur.c b/storage/innobase/btr/btr0pcur.c |
2600 | ---- a/storage/innobase/btr/btr0pcur.c 2010-11-03 07:01:13.000000000 +0900 |
2601 | -+++ b/storage/innobase/btr/btr0pcur.c 2010-12-04 15:38:18.116563877 +0900 |
2602 | +--- a/storage/innobase/btr/btr0pcur.c |
2603 | ++++ b/storage/innobase/btr/btr0pcur.c |
2604 | @@ -32,7 +32,7 @@ |
2605 | #include "ut0byte.h" |
2606 | #include "rem0cmp.h" |
2607 | @@ -296,9 +293,8 @@ |
2608 | #ifdef UNIV_BTR_DEBUG |
2609 | ut_a(page_is_comp(next_page) == page_is_comp(page)); |
2610 | ut_a(btr_page_get_prev(next_page, mtr) |
2611 | -diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c |
2612 | ---- a/storage/innobase/btr/btr0sea.c 2010-12-03 15:49:59.166193407 +0900 |
2613 | -+++ b/storage/innobase/btr/btr0sea.c 2010-12-04 15:38:18.118548961 +0900 |
2614 | +--- a/storage/innobase/btr/btr0sea.c |
2615 | ++++ b/storage/innobase/btr/btr0sea.c |
2616 | @@ -42,7 +42,7 @@ |
2617 | #include "btr0pcur.h" |
2618 | #include "btr0btr.h" |
2619 | @@ -320,9 +316,8 @@ |
2620 | /* NOTE that the following two function calls do NOT protect |
2621 | info or block->n_fields etc. with any semaphore, to save CPU time! |
2622 | We cannot assume the fields are consistent when we return from |
2623 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
2624 | ---- a/storage/innobase/buf/buf0buf.c 2010-12-04 15:37:50.554565654 +0900 |
2625 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-04 15:38:18.119548922 +0900 |
2626 | +--- a/storage/innobase/buf/buf0buf.c |
2627 | ++++ b/storage/innobase/buf/buf0buf.c |
2628 | @@ -52,6 +52,7 @@ |
2629 | #include "log0recv.h" |
2630 | #include "page0zip.h" |
2631 | @@ -431,9 +426,8 @@ |
2632 | TRUE); |
2633 | } |
2634 | } |
2635 | -diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c |
2636 | ---- a/storage/innobase/buf/buf0rea.c 2010-12-04 15:37:50.557553380 +0900 |
2637 | -+++ b/storage/innobase/buf/buf0rea.c 2010-12-04 15:41:09.784467585 +0900 |
2638 | +--- a/storage/innobase/buf/buf0rea.c |
2639 | ++++ b/storage/innobase/buf/buf0rea.c |
2640 | @@ -193,7 +193,14 @@ |
2641 | ((buf_block_t*) bpage)->frame, bpage, trx); |
2642 | } |
2643 | @@ -449,9 +443,8 @@ |
2644 | |
2645 | if (sync) { |
2646 | /* The i/o is already completed when we arrive from |
2647 | -diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c |
2648 | ---- a/storage/innobase/dict/dict0dict.c 2010-12-03 17:30:16.248987063 +0900 |
2649 | -+++ b/storage/innobase/dict/dict0dict.c 2010-12-04 15:45:23.808513973 +0900 |
2650 | +--- a/storage/innobase/dict/dict0dict.c |
2651 | ++++ b/storage/innobase/dict/dict0dict.c |
2652 | @@ -54,6 +54,7 @@ |
2653 | #include "row0merge.h" |
2654 | #include "m_ctype.h" /* my_isspace() */ |
2655 | @@ -561,9 +554,8 @@ |
2656 | + } |
2657 | +} |
2658 | #endif /* !UNIV_HOTBACKUP */ |
2659 | -diff -ruN a/storage/innobase/dict/dict0mem.c b/storage/innobase/dict/dict0mem.c |
2660 | ---- a/storage/innobase/dict/dict0mem.c 2010-11-03 07:01:13.000000000 +0900 |
2661 | -+++ b/storage/innobase/dict/dict0mem.c 2010-12-04 15:38:18.126549463 +0900 |
2662 | +--- a/storage/innobase/dict/dict0mem.c |
2663 | ++++ b/storage/innobase/dict/dict0mem.c |
2664 | @@ -96,6 +96,8 @@ |
2665 | /* The number of transactions that are either waiting on the |
2666 | AUTOINC lock or have been granted the lock. */ |
2667 | @@ -573,9 +565,8 @@ |
2668 | #endif /* !UNIV_HOTBACKUP */ |
2669 | |
2670 | ut_d(table->magic_n = DICT_TABLE_MAGIC_N); |
2671 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
2672 | ---- a/storage/innobase/fil/fil0fil.c 2010-12-04 15:37:50.564551587 +0900 |
2673 | -+++ b/storage/innobase/fil/fil0fil.c 2010-12-04 15:38:18.128549252 +0900 |
2674 | +--- a/storage/innobase/fil/fil0fil.c |
2675 | ++++ b/storage/innobase/fil/fil0fil.c |
2676 | @@ -235,6 +235,7 @@ |
2677 | file we have written to */ |
2678 | ibool is_in_unflushed_spaces; /*!< TRUE if this space is |
2679 | @@ -684,9 +675,8 @@ |
2680 | + mutex_exit(&fil_system->mutex); |
2681 | +} |
2682 | + |
2683 | -diff -ruN a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c |
2684 | ---- a/storage/innobase/fsp/fsp0fsp.c 2010-12-04 15:37:50.569480615 +0900 |
2685 | -+++ b/storage/innobase/fsp/fsp0fsp.c 2010-12-04 15:38:18.131550103 +0900 |
2686 | +--- a/storage/innobase/fsp/fsp0fsp.c |
2687 | ++++ b/storage/innobase/fsp/fsp0fsp.c |
2688 | @@ -369,6 +369,12 @@ |
2689 | ut_ad(id || !zip_size); |
2690 | |
2691 | @@ -795,9 +785,8 @@ |
2692 | descr = fseg_get_first_extent(inode, space, zip_size, mtr); |
2693 | |
2694 | if (descr != NULL) { |
2695 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
2696 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:37:50.578486593 +0900 |
2697 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:38:18.137549396 +0900 |
2698 | +--- a/storage/innobase/handler/ha_innodb.cc |
2699 | ++++ b/storage/innobase/handler/ha_innodb.cc |
2700 | @@ -3972,6 +3972,12 @@ |
2701 | DBUG_RETURN(1); |
2702 | } |
2703 | @@ -1073,9 +1062,8 @@ |
2704 | NULL |
2705 | }; |
2706 | |
2707 | -diff -ruN a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h |
2708 | ---- a/storage/innobase/handler/ha_innodb.h 2010-11-03 07:01:13.000000000 +0900 |
2709 | -+++ b/storage/innobase/handler/ha_innodb.h 2010-12-04 15:38:18.159588579 +0900 |
2710 | +--- a/storage/innobase/handler/ha_innodb.h |
2711 | ++++ b/storage/innobase/handler/ha_innodb.h |
2712 | @@ -52,6 +52,7 @@ |
2713 | innodb_idx_translate_t idx_trans_tbl; /*!< index translation |
2714 | table between MySQL and |
2715 | @@ -1092,9 +1080,8 @@ |
2716 | |
2717 | int write_row(uchar * buf); |
2718 | int update_row(const uchar * old_data, uchar * new_data); |
2719 | -diff -ruN a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic |
2720 | ---- a/storage/innobase/include/btr0btr.ic 2010-11-03 07:01:13.000000000 +0900 |
2721 | -+++ b/storage/innobase/include/btr0btr.ic 2010-12-04 15:38:18.162515035 +0900 |
2722 | +--- a/storage/innobase/include/btr0btr.ic |
2723 | ++++ b/storage/innobase/include/btr0btr.ic |
2724 | @@ -28,7 +28,7 @@ |
2725 | #include "mtr0mtr.h" |
2726 | #include "mtr0log.h" |
2727 | @@ -1115,9 +1102,8 @@ |
2728 | |
2729 | buf_block_dbg_add_level(block, SYNC_TREE_NODE); |
2730 | } |
2731 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
2732 | ---- a/storage/innobase/include/buf0buf.h 2010-12-03 15:49:59.218956083 +0900 |
2733 | -+++ b/storage/innobase/include/buf0buf.h 2010-12-04 15:38:18.164513667 +0900 |
2734 | +--- a/storage/innobase/include/buf0buf.h |
2735 | ++++ b/storage/innobase/include/buf0buf.h |
2736 | @@ -986,7 +986,7 @@ |
2737 | const buf_block_t* block) /*!< in: pointer to the control block */ |
2738 | __attribute__((pure)); |
2739 | @@ -1135,9 +1121,8 @@ |
2740 | # if defined UNIV_DEBUG_FILE_ACCESSES || defined UNIV_DEBUG |
2741 | ibool file_page_was_freed; |
2742 | /*!< this is set to TRUE when fsp |
2743 | -diff -ruN a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic |
2744 | ---- a/storage/innobase/include/buf0buf.ic 2010-12-03 15:49:59.221956024 +0900 |
2745 | -+++ b/storage/innobase/include/buf0buf.ic 2010-12-04 15:38:18.167513925 +0900 |
2746 | +--- a/storage/innobase/include/buf0buf.ic |
2747 | ++++ b/storage/innobase/include/buf0buf.ic |
2748 | @@ -34,7 +34,7 @@ |
2749 | #include "buf0flu.h" |
2750 | #include "buf0lru.h" |
2751 | @@ -1160,9 +1145,8 @@ |
2752 | ut_ad(block); |
2753 | |
2754 | switch (buf_block_get_state(block)) { |
2755 | -diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h |
2756 | ---- a/storage/innobase/include/dict0dict.h 2010-12-03 17:30:16.306955940 +0900 |
2757 | -+++ b/storage/innobase/include/dict0dict.h 2010-12-04 15:38:18.169513750 +0900 |
2758 | +--- a/storage/innobase/include/dict0dict.h |
2759 | ++++ b/storage/innobase/include/dict0dict.h |
2760 | @@ -1245,6 +1245,15 @@ |
2761 | dict_close(void); |
2762 | /*============*/ |
2763 | @@ -1179,9 +1163,8 @@ |
2764 | #ifndef UNIV_NONINL |
2765 | #include "dict0dict.ic" |
2766 | #endif |
2767 | -diff -ruN a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h |
2768 | ---- a/storage/innobase/include/dict0mem.h 2010-11-03 07:01:13.000000000 +0900 |
2769 | -+++ b/storage/innobase/include/dict0mem.h 2010-12-04 15:38:18.171513956 +0900 |
2770 | +--- a/storage/innobase/include/dict0mem.h |
2771 | ++++ b/storage/innobase/include/dict0mem.h |
2772 | @@ -640,6 +640,7 @@ |
2773 | the AUTOINC lock on this table. */ |
2774 | /* @} */ |
2775 | @@ -1190,9 +1173,8 @@ |
2776 | #endif /* !UNIV_HOTBACKUP */ |
2777 | |
2778 | #ifdef UNIV_DEBUG |
2779 | -diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h |
2780 | ---- a/storage/innobase/include/fil0fil.h 2010-12-04 15:35:29.175520016 +0900 |
2781 | -+++ b/storage/innobase/include/fil0fil.h 2010-12-04 15:38:18.172483391 +0900 |
2782 | +--- a/storage/innobase/include/fil0fil.h |
2783 | ++++ b/storage/innobase/include/fil0fil.h |
2784 | @@ -750,6 +750,19 @@ |
2785 | fil_system_hash_nodes(void); |
2786 | /*========================*/ |
2787 | @@ -1213,9 +1195,8 @@ |
2788 | typedef struct fil_space_struct fil_space_t; |
2789 | |
2790 | #endif |
2791 | -diff -ruN a/storage/innobase/include/fut0fut.ic b/storage/innobase/include/fut0fut.ic |
2792 | ---- a/storage/innobase/include/fut0fut.ic 2010-11-03 07:01:13.000000000 +0900 |
2793 | -+++ b/storage/innobase/include/fut0fut.ic 2010-12-04 15:38:18.174481728 +0900 |
2794 | +--- a/storage/innobase/include/fut0fut.ic |
2795 | ++++ b/storage/innobase/include/fut0fut.ic |
2796 | @@ -23,6 +23,7 @@ |
2797 | Created 12/13/1995 Heikki Tuuri |
2798 | ***********************************************************************/ |
2799 | @@ -1237,9 +1218,8 @@ |
2800 | ptr = buf_block_get_frame(block) + addr.boffset; |
2801 | |
2802 | buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK); |
2803 | -diff -ruN a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h |
2804 | ---- a/storage/innobase/include/page0page.h 2010-11-03 07:01:13.000000000 +0900 |
2805 | -+++ b/storage/innobase/include/page0page.h 2010-12-04 15:38:18.175514037 +0900 |
2806 | +--- a/storage/innobase/include/page0page.h |
2807 | ++++ b/storage/innobase/include/page0page.h |
2808 | @@ -500,7 +500,7 @@ |
2809 | page_is_leaf( |
2810 | /*=========*/ |
2811 | @@ -1249,9 +1229,8 @@ |
2812 | /************************************************************//** |
2813 | Gets the pointer to the next record on the page. |
2814 | @return pointer to next record */ |
2815 | -diff -ruN a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic |
2816 | ---- a/storage/innobase/include/page0page.ic 2010-11-03 07:01:13.000000000 +0900 |
2817 | -+++ b/storage/innobase/include/page0page.ic 2010-12-04 15:38:18.177482672 +0900 |
2818 | +--- a/storage/innobase/include/page0page.ic |
2819 | ++++ b/storage/innobase/include/page0page.ic |
2820 | @@ -274,6 +274,9 @@ |
2821 | /*=========*/ |
2822 | const page_t* page) /*!< in: page */ |
2823 | @@ -1262,9 +1241,8 @@ |
2824 | return(!*(const uint16*) (page + (PAGE_HEADER + PAGE_LEVEL))); |
2825 | } |
2826 | |
2827 | -diff -ruN a/storage/innobase/include/page0zip.h b/storage/innobase/include/page0zip.h |
2828 | ---- a/storage/innobase/include/page0zip.h 2010-11-03 07:01:13.000000000 +0900 |
2829 | -+++ b/storage/innobase/include/page0zip.h 2010-12-04 15:38:18.179513974 +0900 |
2830 | +--- a/storage/innobase/include/page0zip.h |
2831 | ++++ b/storage/innobase/include/page0zip.h |
2832 | @@ -114,7 +114,7 @@ |
2833 | const page_t* page, /*!< in: uncompressed page */ |
2834 | dict_index_t* index, /*!< in: index of the B-tree node */ |
2835 | @@ -1274,9 +1252,8 @@ |
2836 | |
2837 | /**********************************************************************//** |
2838 | Decompress a page. This function should tolerate errors on the compressed |
2839 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
2840 | ---- a/storage/innobase/include/srv0srv.h 2010-12-04 15:37:50.591516341 +0900 |
2841 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-04 15:38:18.180563749 +0900 |
2842 | +--- a/storage/innobase/include/srv0srv.h |
2843 | ++++ b/storage/innobase/include/srv0srv.h |
2844 | @@ -240,6 +240,7 @@ |
2845 | extern ulint srv_adaptive_flushing_method; |
2846 | |
2847 | @@ -1285,9 +1262,8 @@ |
2848 | |
2849 | extern ulint srv_dict_size_limit; |
2850 | /*-------------------------------------------*/ |
2851 | -diff -ruN a/storage/innobase/page/page0zip.c b/storage/innobase/page/page0zip.c |
2852 | ---- a/storage/innobase/page/page0zip.c 2010-11-03 07:01:13.000000000 +0900 |
2853 | -+++ b/storage/innobase/page/page0zip.c 2010-12-04 15:38:18.195515935 +0900 |
2854 | +--- a/storage/innobase/page/page0zip.c |
2855 | ++++ b/storage/innobase/page/page0zip.c |
2856 | @@ -1153,6 +1153,10 @@ |
2857 | FILE* logfile = NULL; |
2858 | #endif |
2859 | @@ -1299,9 +1275,8 @@ |
2860 | ut_a(page_is_comp(page)); |
2861 | ut_a(fil_page_get_type(page) == FIL_PAGE_INDEX); |
2862 | ut_ad(page_simple_validate_new((page_t*) page)); |
2863 | -diff -ruN a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c |
2864 | ---- a/storage/innobase/row/row0ins.c 2010-11-03 07:01:13.000000000 +0900 |
2865 | -+++ b/storage/innobase/row/row0ins.c 2010-12-04 15:38:18.198514028 +0900 |
2866 | +--- a/storage/innobase/row/row0ins.c |
2867 | ++++ b/storage/innobase/row/row0ins.c |
2868 | @@ -1335,6 +1335,12 @@ |
2869 | const rec_t* rec = btr_pcur_get_rec(&pcur); |
2870 | const buf_block_t* block = btr_pcur_get_block(&pcur); |
2871 | @@ -1315,9 +1290,8 @@ |
2872 | if (page_rec_is_infimum(rec)) { |
2873 | |
2874 | continue; |
2875 | -diff -ruN a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c |
2876 | ---- a/storage/innobase/row/row0merge.c 2010-12-03 17:30:16.330986655 +0900 |
2877 | -+++ b/storage/innobase/row/row0merge.c 2010-12-04 15:38:18.201513966 +0900 |
2878 | +--- a/storage/innobase/row/row0merge.c |
2879 | ++++ b/storage/innobase/row/row0merge.c |
2880 | @@ -1245,6 +1245,13 @@ |
2881 | |
2882 | if (UNIV_LIKELY(has_next)) { |
2883 | @@ -1332,9 +1306,8 @@ |
2884 | offsets = rec_get_offsets(rec, clust_index, NULL, |
2885 | ULINT_UNDEFINED, &row_heap); |
2886 | |
2887 | -diff -ruN a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c |
2888 | ---- a/storage/innobase/row/row0sel.c 2010-11-03 07:01:13.000000000 +0900 |
2889 | -+++ b/storage/innobase/row/row0sel.c 2010-12-04 15:38:18.205551115 +0900 |
2890 | +--- a/storage/innobase/row/row0sel.c |
2891 | ++++ b/storage/innobase/row/row0sel.c |
2892 | @@ -3853,6 +3853,13 @@ |
2893 | /* PHASE 4: Look for matching records in a loop */ |
2894 | |
2895 | @@ -1374,9 +1347,8 @@ |
2896 | if (!rec_validate(rec, offsets) |
2897 | || !btr_index_rec_validate(rec, index, FALSE)) { |
2898 | fprintf(stderr, |
2899 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
2900 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-04 15:37:50.602481253 +0900 |
2901 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 15:38:18.209513823 +0900 |
2902 | +--- a/storage/innobase/srv/srv0srv.c |
2903 | ++++ b/storage/innobase/srv/srv0srv.c |
2904 | @@ -430,6 +430,7 @@ |
2905 | UNIV_INTERN ulint srv_adaptive_flushing_method = 0; /* 0: native 1: estimate 2: keep_average */ |
2906 | |
2907 | @@ -1385,9 +1357,8 @@ |
2908 | |
2909 | UNIV_INTERN ulint srv_dict_size_limit = 0; |
2910 | /*-------------------------------------------*/ |
2911 | -diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c |
2912 | ---- a/storage/innobase/srv/srv0start.c 2010-12-04 15:37:50.605491300 +0900 |
2913 | -+++ b/storage/innobase/srv/srv0start.c 2010-12-04 15:38:18.212513722 +0900 |
2914 | +--- a/storage/innobase/srv/srv0start.c |
2915 | ++++ b/storage/innobase/srv/srv0start.c |
2916 | @@ -2149,6 +2149,13 @@ |
2917 | |
2918 | os_fast_mutex_free(&srv_os_test_mutex); |
2919 | |
2920 | === modified file 'patches/innodb_recovery_patches.patch' |
2921 | --- patches/innodb_recovery_patches.patch 2011-07-22 16:56:42 +0000 |
2922 | +++ patches/innodb_recovery_patches.patch 2011-07-27 11:32:35 +0000 |
2923 | @@ -5,9 +5,8 @@ |
2924 | #!!! notice !!! |
2925 | # Any small change to this file in the main branch |
2926 | # should be done or reviewed by the maintainer! |
2927 | -diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c |
2928 | ---- a/storage/innobase/buf/buf0rea.c 2010-12-03 15:49:59.187028943 +0900 |
2929 | -+++ b/storage/innobase/buf/buf0rea.c 2010-12-03 17:30:41.579956150 +0900 |
2930 | +--- a/storage/innobase/buf/buf0rea.c |
2931 | ++++ b/storage/innobase/buf/buf0rea.c |
2932 | @@ -122,6 +122,46 @@ |
2933 | bpage = buf_page_init_for_read(err, mode, space, zip_size, unzip, |
2934 | tablespace_version, offset); |
2935 | @@ -106,9 +105,8 @@ |
2936 | return; |
2937 | } |
2938 | |
2939 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
2940 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:30:16.261955714 +0900 |
2941 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:30:41.584971130 +0900 |
2942 | +--- a/storage/innobase/handler/ha_innodb.cc |
2943 | ++++ b/storage/innobase/handler/ha_innodb.cc |
2944 | @@ -182,6 +182,7 @@ |
2945 | #endif /* UNIV_LOG_ARCHIVE */ |
2946 | static my_bool innobase_use_doublewrite = TRUE; |
2947 | @@ -146,9 +144,8 @@ |
2948 | MYSQL_SYSVAR(fast_shutdown), |
2949 | MYSQL_SYSVAR(file_io_threads), |
2950 | MYSQL_SYSVAR(read_io_threads), |
2951 | -diff -ruN a/storage/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h |
2952 | ---- a/storage/innobase/include/log0recv.h 2010-11-03 07:01:13.000000000 +0900 |
2953 | -+++ b/storage/innobase/include/log0recv.h 2010-12-03 17:30:41.592958318 +0900 |
2954 | +--- a/storage/innobase/include/log0recv.h |
2955 | ++++ b/storage/innobase/include/log0recv.h |
2956 | @@ -438,6 +438,39 @@ |
2957 | hash_table_t* addr_hash;/*!< hash table of file addresses of pages */ |
2958 | ulint n_addrs;/*!< number of not processed hashed file |
2959 | @@ -189,9 +186,8 @@ |
2960 | }; |
2961 | |
2962 | /** The recovery system */ |
2963 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
2964 | ---- a/storage/innobase/include/srv0srv.h 2010-12-03 17:30:16.321953515 +0900 |
2965 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-03 17:30:41.593985184 +0900 |
2966 | +--- a/storage/innobase/include/srv0srv.h |
2967 | ++++ b/storage/innobase/include/srv0srv.h |
2968 | @@ -126,6 +126,8 @@ |
2969 | extern ulint* srv_data_file_sizes; |
2970 | extern ulint* srv_data_file_is_raw_partition; |
2971 | @@ -201,9 +197,8 @@ |
2972 | extern ibool srv_auto_extend_last_data_file; |
2973 | extern ulint srv_last_file_size_max; |
2974 | extern char** srv_log_group_home_dirs; |
2975 | -diff -ruN a/storage/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c |
2976 | ---- a/storage/innobase/log/log0recv.c 2010-12-03 15:18:48.903987466 +0900 |
2977 | -+++ b/storage/innobase/log/log0recv.c 2010-12-03 17:30:41.598022536 +0900 |
2978 | +--- a/storage/innobase/log/log0recv.c |
2979 | ++++ b/storage/innobase/log/log0recv.c |
2980 | @@ -187,6 +187,9 @@ |
2981 | |
2982 | recv_sys->heap = NULL; |
2983 | @@ -430,9 +425,8 @@ |
2984 | if (recv_needed_recovery) { |
2985 | trx_sys_print_mysql_master_log_pos(); |
2986 | trx_sys_print_mysql_binlog_offset(); |
2987 | -diff -ruN a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c |
2988 | ---- a/storage/innobase/os/os0file.c 2010-12-03 15:18:48.908955759 +0900 |
2989 | -+++ b/storage/innobase/os/os0file.c 2010-12-03 17:30:41.602022989 +0900 |
2990 | +--- a/storage/innobase/os/os0file.c |
2991 | ++++ b/storage/innobase/os/os0file.c |
2992 | @@ -43,6 +43,7 @@ |
2993 | #include "srv0start.h" |
2994 | #include "fil0fil.h" |
2995 | @@ -441,7 +435,7 @@ |
2996 | #ifndef UNIV_HOTBACKUP |
2997 | # include "os0sync.h" |
2998 | # include "os0thread.h" |
2999 | -@@ -4270,6 +4271,18 @@ |
3000 | +@@ -4271,6 +4272,18 @@ |
3001 | INFINITE); |
3002 | } |
3003 | |
3004 | @@ -460,9 +454,8 @@ |
3005 | os_mutex_enter(array->mutex); |
3006 | |
3007 | if (srv_shutdown_state == SRV_SHUTDOWN_EXIT_THREADS |
3008 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
3009 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-03 17:30:16.339955597 +0900 |
3010 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 17:30:41.604958138 +0900 |
3011 | +--- a/storage/innobase/srv/srv0srv.c |
3012 | ++++ b/storage/innobase/srv/srv0srv.c |
3013 | @@ -160,6 +160,8 @@ |
3014 | /* size in database pages */ |
3015 | UNIV_INTERN ulint* srv_data_file_sizes = NULL; |
3016 | @@ -472,9 +465,8 @@ |
3017 | /* if TRUE, then we auto-extend the last data file */ |
3018 | UNIV_INTERN ibool srv_auto_extend_last_data_file = FALSE; |
3019 | /* if != 0, this tells the max size auto-extending may increase the |
3020 | -diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c |
3021 | ---- a/storage/innobase/trx/trx0sys.c 2010-12-03 15:41:52.051986524 +0900 |
3022 | -+++ b/storage/innobase/trx/trx0sys.c 2010-12-03 17:30:41.607026818 +0900 |
3023 | +--- a/storage/innobase/trx/trx0sys.c |
3024 | ++++ b/storage/innobase/trx/trx0sys.c |
3025 | @@ -567,6 +567,12 @@ |
3026 | zip_size ? zip_size : UNIV_PAGE_SIZE, |
3027 | read_buf, NULL); |
3028 | |
3029 | === modified file 'patches/innodb_separate_doublewrite.patch' |
3030 | --- patches/innodb_separate_doublewrite.patch 2011-07-22 16:56:42 +0000 |
3031 | +++ patches/innodb_separate_doublewrite.patch 2011-07-27 11:32:35 +0000 |
3032 | @@ -5,9 +5,8 @@ |
3033 | #!!! notice !!! |
3034 | # Any small change to this file in the main branch |
3035 | # should be done or reviewed by the maintainer! |
3036 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
3037 | ---- a/storage/innobase/buf/buf0buf.c 2010-12-03 17:49:11.574962867 +0900 |
3038 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-04 15:35:58.624514033 +0900 |
3039 | +--- a/storage/innobase/buf/buf0buf.c |
3040 | ++++ b/storage/innobase/buf/buf0buf.c |
3041 | @@ -4291,7 +4291,8 @@ |
3042 | read_space_id = mach_read_from_4( |
3043 | frame + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID); |
3044 | @@ -18,9 +17,8 @@ |
3045 | && trx_doublewrite_page_inside(bpage->offset)) { |
3046 | |
3047 | ut_print_timestamp(stderr); |
3048 | -diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c |
3049 | ---- a/storage/innobase/buf/buf0flu.c 2010-12-03 15:49:59.179956111 +0900 |
3050 | -+++ b/storage/innobase/buf/buf0flu.c 2010-12-04 15:35:58.624514033 +0900 |
3051 | +--- a/storage/innobase/buf/buf0flu.c |
3052 | ++++ b/storage/innobase/buf/buf0flu.c |
3053 | @@ -791,7 +791,8 @@ |
3054 | write_buf = trx_doublewrite->write_buf; |
3055 | i = 0; |
3056 | @@ -50,9 +48,8 @@ |
3057 | |
3058 | /* We know that the writes have been flushed to disk now |
3059 | and in recovery we will find them in the doublewrite buffer |
3060 | -diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c |
3061 | ---- a/storage/innobase/buf/buf0rea.c 2010-12-04 15:35:29.138514157 +0900 |
3062 | -+++ b/storage/innobase/buf/buf0rea.c 2010-12-04 15:35:58.626486771 +0900 |
3063 | +--- a/storage/innobase/buf/buf0rea.c |
3064 | ++++ b/storage/innobase/buf/buf0rea.c |
3065 | @@ -88,7 +88,9 @@ |
3066 | wake_later = mode & OS_AIO_SIMULATED_WAKE_LATER; |
3067 | mode = mode & ~OS_AIO_SIMULATED_WAKE_LATER; |
3068 | @@ -64,9 +61,8 @@ |
3069 | && ( (offset >= trx_doublewrite->block1 |
3070 | && offset < trx_doublewrite->block1 |
3071 | + TRX_SYS_DOUBLEWRITE_BLOCK_SIZE) |
3072 | -diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c |
3073 | ---- a/storage/innobase/dict/dict0load.c 2010-12-03 17:30:16.252956569 +0900 |
3074 | -+++ b/storage/innobase/dict/dict0load.c 2010-12-04 15:35:58.627482825 +0900 |
3075 | +--- a/storage/innobase/dict/dict0load.c |
3076 | ++++ b/storage/innobase/dict/dict0load.c |
3077 | @@ -41,6 +41,7 @@ |
3078 | #include "srv0start.h" |
3079 | #include "srv0srv.h" |
3080 | @@ -102,9 +98,8 @@ |
3081 | /* The system tablespace is always available. */ |
3082 | } else if (!fil_space_for_table_exists_in_mem( |
3083 | table->space, name, |
3084 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
3085 | ---- a/storage/innobase/fil/fil0fil.c 2010-12-04 15:35:29.143813775 +0900 |
3086 | -+++ b/storage/innobase/fil/fil0fil.c 2010-12-04 15:35:58.628498870 +0900 |
3087 | +--- a/storage/innobase/fil/fil0fil.c |
3088 | ++++ b/storage/innobase/fil/fil0fil.c |
3089 | @@ -657,7 +657,7 @@ |
3090 | |
3091 | UT_LIST_ADD_LAST(chain, space->chain, node); |
3092 | @@ -312,9 +307,8 @@ |
3093 | |
3094 | fil_node = UT_LIST_GET_NEXT(LRU, fil_node); |
3095 | } |
3096 | -diff -ruN a/storage/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c |
3097 | ---- a/storage/innobase/fsp/fsp0fsp.c 2010-11-03 07:01:13.000000000 +0900 |
3098 | -+++ b/storage/innobase/fsp/fsp0fsp.c 2010-12-04 15:35:58.632513243 +0900 |
3099 | +--- a/storage/innobase/fsp/fsp0fsp.c |
3100 | ++++ b/storage/innobase/fsp/fsp0fsp.c |
3101 | @@ -48,7 +48,7 @@ |
3102 | # include "log0log.h" |
3103 | #endif /* UNIV_HOTBACKUP */ |
3104 | @@ -337,9 +331,8 @@ |
3105 | dict_ind_redundant, mtr); |
3106 | } else { |
3107 | fsp_fill_free_list(TRUE, space, header, mtr); |
3108 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
3109 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:35:29.153514047 +0900 |
3110 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-04 15:35:58.636549909 +0900 |
3111 | +--- a/storage/innobase/handler/ha_innodb.cc |
3112 | ++++ b/storage/innobase/handler/ha_innodb.cc |
3113 | @@ -163,6 +163,7 @@ |
3114 | static char* innobase_log_group_home_dir = NULL; |
3115 | static char* innobase_file_format_name = NULL; |
3116 | @@ -377,9 +370,8 @@ |
3117 | MYSQL_SYSVAR(data_home_dir), |
3118 | MYSQL_SYSVAR(doublewrite), |
3119 | MYSQL_SYSVAR(recovery_stats), |
3120 | -diff -ruN a/storage/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic |
3121 | ---- a/storage/innobase/include/mtr0log.ic 2010-11-03 07:01:13.000000000 +0900 |
3122 | -+++ b/storage/innobase/include/mtr0log.ic 2010-12-04 15:35:58.644607059 +0900 |
3123 | +--- a/storage/innobase/include/mtr0log.ic |
3124 | ++++ b/storage/innobase/include/mtr0log.ic |
3125 | @@ -27,8 +27,8 @@ |
3126 | #include "ut0lst.h" |
3127 | #include "buf0buf.h" |
3128 | @@ -400,9 +392,8 @@ |
3129 | && offset >= FSP_EXTENT_SIZE && offset < 3 * FSP_EXTENT_SIZE) { |
3130 | if (trx_doublewrite_buf_is_being_created) { |
3131 | /* Do nothing: we only come to this branch in an |
3132 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
3133 | ---- a/storage/innobase/include/srv0srv.h 2010-12-04 15:35:29.177480351 +0900 |
3134 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-04 15:35:58.646556250 +0900 |
3135 | +--- a/storage/innobase/include/srv0srv.h |
3136 | ++++ b/storage/innobase/include/srv0srv.h |
3137 | @@ -129,6 +129,8 @@ |
3138 | extern ulint* srv_data_file_sizes; |
3139 | extern ulint* srv_data_file_is_raw_partition; |
3140 | @@ -412,9 +403,8 @@ |
3141 | extern ibool srv_recovery_stats; |
3142 | |
3143 | extern ibool srv_auto_extend_last_data_file; |
3144 | -diff -ruN a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h |
3145 | ---- a/storage/innobase/include/srv0start.h 2010-11-03 07:01:13.000000000 +0900 |
3146 | -+++ b/storage/innobase/include/srv0start.h 2010-12-08 17:15:07.602605797 +0900 |
3147 | +--- a/storage/innobase/include/srv0start.h |
3148 | ++++ b/storage/innobase/include/srv0start.h |
3149 | @@ -127,4 +127,7 @@ |
3150 | /** Log 'spaces' have id's >= this */ |
3151 | #define SRV_LOG_SPACE_FIRST_ID 0xFFFFFFF0UL |
3152 | @@ -423,9 +413,8 @@ |
3153 | +#define SRV_EXTRA_SYS_SPACE_FIRST_ID 0xFFFFFFE0UL |
3154 | + |
3155 | #endif |
3156 | -diff -ruN a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h |
3157 | ---- a/storage/innobase/include/trx0sys.h 2010-12-03 15:41:52.047049291 +0900 |
3158 | -+++ b/storage/innobase/include/trx0sys.h 2010-12-04 15:35:58.647551222 +0900 |
3159 | +--- a/storage/innobase/include/trx0sys.h |
3160 | ++++ b/storage/innobase/include/trx0sys.h |
3161 | @@ -125,6 +125,22 @@ |
3162 | /*=============*/ |
3163 | ulint space, /*!< in: space */ |
3164 | @@ -472,9 +461,8 @@ |
3165 | #include "fsp0fsp.h" |
3166 | #define TRX_SYS_PAGE_NO FSP_TRX_SYS_PAGE_NO |
3167 | |
3168 | -diff -ruN a/storage/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic |
3169 | ---- a/storage/innobase/include/trx0sys.ic 2010-11-03 07:01:13.000000000 +0900 |
3170 | -+++ b/storage/innobase/include/trx0sys.ic 2010-12-04 15:35:58.649473284 +0900 |
3171 | +--- a/storage/innobase/include/trx0sys.ic |
3172 | ++++ b/storage/innobase/include/trx0sys.ic |
3173 | @@ -71,6 +71,40 @@ |
3174 | } |
3175 | |
3176 | @@ -516,9 +504,8 @@ |
3177 | Gets the pointer in the nth slot of the rseg array. |
3178 | @return pointer to rseg object, NULL if slot not in use */ |
3179 | UNIV_INLINE |
3180 | -diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c |
3181 | ---- a/storage/innobase/row/row0mysql.c 2010-12-03 17:30:16.334989510 +0900 |
3182 | -+++ b/storage/innobase/row/row0mysql.c 2010-12-04 15:35:58.652496484 +0900 |
3183 | +--- a/storage/innobase/row/row0mysql.c |
3184 | ++++ b/storage/innobase/row/row0mysql.c |
3185 | @@ -3447,7 +3447,7 @@ |
3186 | /* Do not drop possible .ibd tablespace if something went |
3187 | wrong: we do not want to delete valuable data of the user */ |
3188 | @@ -528,9 +515,8 @@ |
3189 | if (!fil_space_for_table_exists_in_mem(space_id, |
3190 | name_or_path, |
3191 | is_temp, FALSE, |
3192 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
3193 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-04 15:35:29.180483212 +0900 |
3194 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-04 15:35:58.656550107 +0900 |
3195 | +--- a/storage/innobase/srv/srv0srv.c |
3196 | ++++ b/storage/innobase/srv/srv0srv.c |
3197 | @@ -163,6 +163,8 @@ |
3198 | /* size in database pages */ |
3199 | UNIV_INTERN ulint* srv_data_file_sizes = NULL; |
3200 | @@ -540,9 +526,8 @@ |
3201 | UNIV_INTERN ibool srv_recovery_stats = FALSE; |
3202 | |
3203 | /* if TRUE, then we auto-extend the last data file */ |
3204 | -diff -ruN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c |
3205 | ---- a/storage/innobase/srv/srv0start.c 2010-12-04 15:35:29.183481330 +0900 |
3206 | -+++ b/storage/innobase/srv/srv0start.c 2010-12-04 15:35:58.661550545 +0900 |
3207 | +--- a/storage/innobase/srv/srv0start.c |
3208 | ++++ b/storage/innobase/srv/srv0start.c |
3209 | @@ -714,6 +714,7 @@ |
3210 | /*======================*/ |
3211 | ibool* create_new_db, /*!< out: TRUE if new database should be |
3212 | @@ -765,9 +750,8 @@ |
3213 | } |
3214 | |
3215 | if (!create_new_db && sum_of_new_sizes > 0) { |
3216 | -diff -ruN a/storage/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c |
3217 | ---- a/storage/innobase/trx/trx0sys.c 2010-12-03 17:32:15.651024019 +0900 |
3218 | -+++ b/storage/innobase/trx/trx0sys.c 2010-12-04 15:35:58.664550291 +0900 |
3219 | +--- a/storage/innobase/trx/trx0sys.c |
3220 | ++++ b/storage/innobase/trx/trx0sys.c |
3221 | @@ -415,6 +415,152 @@ |
3222 | |
3223 | goto start_again; |
3224 | |
3225 | === modified file 'patches/innodb_show_lock_name.patch' |
3226 | --- patches/innodb_show_lock_name.patch 2011-07-22 16:56:42 +0000 |
3227 | +++ patches/innodb_show_lock_name.patch 2011-07-27 11:32:35 +0000 |
3228 | @@ -5,9 +5,8 @@ |
3229 | #!!! notice !!! |
3230 | # Any small change to this file in the main branch |
3231 | # should be done or reviewed by the maintainer! |
3232 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
3233 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:34:35.285040381 +0900 |
3234 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:35:12.974975252 +0900 |
3235 | +--- a/storage/innobase/handler/ha_innodb.cc |
3236 | ++++ b/storage/innobase/handler/ha_innodb.cc |
3237 | @@ -9593,9 +9593,8 @@ |
3238 | rw_lock_wait_time += mutex->lspent_time; |
3239 | } |
3240 | @@ -58,9 +57,8 @@ |
3241 | buf2len = (uint) my_snprintf(buf2, sizeof buf2, |
3242 | "os_waits=%lu", |
3243 | (ulong) block_lock_oswait_count); |
3244 | -diff -ruN a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h |
3245 | ---- a/storage/innobase/include/sync0rw.h 2010-12-03 15:49:59.225953164 +0900 |
3246 | -+++ b/storage/innobase/include/sync0rw.h 2010-12-03 17:35:12.978024458 +0900 |
3247 | +--- a/storage/innobase/include/sync0rw.h |
3248 | ++++ b/storage/innobase/include/sync0rw.h |
3249 | @@ -138,14 +138,14 @@ |
3250 | # ifdef UNIV_DEBUG |
3251 | # ifdef UNIV_SYNC_DEBUG |
3252 | @@ -144,9 +142,8 @@ |
3253 | |
3254 | /******************************************************************//** |
3255 | Performance schema instrumented wrap function for rw_lock_x_lock_func() |
3256 | -diff -ruN a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic |
3257 | ---- a/storage/innobase/include/sync0rw.ic 2010-11-03 07:01:13.000000000 +0900 |
3258 | -+++ b/storage/innobase/include/sync0rw.ic 2010-12-03 17:35:12.980024605 +0900 |
3259 | +--- a/storage/innobase/include/sync0rw.ic |
3260 | ++++ b/storage/innobase/include/sync0rw.ic |
3261 | @@ -640,10 +640,10 @@ |
3262 | # ifdef UNIV_SYNC_DEBUG |
3263 | ulint level, /*!< in: level */ |
3264 | @@ -175,9 +172,8 @@ |
3265 | } |
3266 | /******************************************************************//** |
3267 | Performance schema instrumented wrap function for rw_lock_x_lock_func() |
3268 | -diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h |
3269 | ---- a/storage/innobase/include/sync0sync.h 2010-12-03 15:49:59.227955503 +0900 |
3270 | -+++ b/storage/innobase/include/sync0sync.h 2010-12-03 17:35:12.982023946 +0900 |
3271 | +--- a/storage/innobase/include/sync0sync.h |
3272 | ++++ b/storage/innobase/include/sync0sync.h |
3273 | @@ -158,14 +158,14 @@ |
3274 | # ifdef UNIV_DEBUG |
3275 | # ifdef UNIV_SYNC_DEBUG |
3276 | @@ -270,9 +266,8 @@ |
3277 | #ifdef UNIV_PFS_MUTEX |
3278 | struct PSI_mutex* pfs_psi; /*!< The performance schema |
3279 | instrumentation hook */ |
3280 | -diff -ruN a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic |
3281 | ---- a/storage/innobase/include/sync0sync.ic 2010-11-03 07:01:13.000000000 +0900 |
3282 | -+++ b/storage/innobase/include/sync0sync.ic 2010-12-03 17:35:12.984024599 +0900 |
3283 | +--- a/storage/innobase/include/sync0sync.ic |
3284 | ++++ b/storage/innobase/include/sync0sync.ic |
3285 | @@ -321,13 +321,13 @@ |
3286 | mysql_pfs_key_t key, /*!< in: Performance Schema key */ |
3287 | mutex_t* mutex, /*!< in: pointer to memory */ |
3288 | @@ -307,9 +302,8 @@ |
3289 | } |
3290 | /******************************************************************//** |
3291 | NOTE! Please use the corresponding macro mutex_free(), not directly |
3292 | -diff -ruN a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c |
3293 | ---- a/storage/innobase/sync/sync0arr.c 2010-12-03 15:09:51.304953409 +0900 |
3294 | -+++ b/storage/innobase/sync/sync0arr.c 2010-12-03 17:35:12.985024561 +0900 |
3295 | +--- a/storage/innobase/sync/sync0arr.c |
3296 | ++++ b/storage/innobase/sync/sync0arr.c |
3297 | @@ -489,13 +489,12 @@ |
3298 | mutex = cell->old_wait_mutex; |
3299 | |
3300 | @@ -338,9 +332,8 @@ |
3301 | writer = rw_lock_get_writer(rwlock); |
3302 | if (writer != RW_LOCK_NOT_LOCKED) { |
3303 | fprintf(file, |
3304 | -diff -ruN a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c |
3305 | ---- a/storage/innobase/sync/sync0rw.c 2010-11-03 07:01:13.000000000 +0900 |
3306 | -+++ b/storage/innobase/sync/sync0rw.c 2010-12-03 17:35:12.987029059 +0900 |
3307 | +--- a/storage/innobase/sync/sync0rw.c |
3308 | ++++ b/storage/innobase/sync/sync0rw.c |
3309 | @@ -242,10 +242,10 @@ |
3310 | # ifdef UNIV_SYNC_DEBUG |
3311 | ulint level, /*!< in: level */ |
3312 | @@ -439,9 +432,8 @@ |
3313 | } |
3314 | |
3315 | /* these stats may not be accurate */ |
3316 | -diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c |
3317 | ---- a/storage/innobase/sync/sync0sync.c 2010-12-03 15:49:59.233955565 +0900 |
3318 | -+++ b/storage/innobase/sync/sync0sync.c 2010-12-03 17:35:12.989024400 +0900 |
3319 | +--- a/storage/innobase/sync/sync0sync.c |
3320 | ++++ b/storage/innobase/sync/sync0sync.c |
3321 | @@ -270,13 +270,13 @@ |
3322 | /*==============*/ |
3323 | mutex_t* mutex, /*!< in: pointer to memory */ |
3324 | |
3325 | === modified file 'patches/innodb_show_status.patch' |
3326 | --- patches/innodb_show_status.patch 2011-07-22 16:56:42 +0000 |
3327 | +++ patches/innodb_show_status.patch 2011-07-27 11:32:35 +0000 |
3328 | @@ -5,9 +5,8 @@ |
3329 | #!!! notice !!! |
3330 | # Any small change to this file in the main branch |
3331 | # should be done or reviewed by the maintainer! |
3332 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
3333 | ---- a/storage/innobase/buf/buf0buf.c 2010-11-03 07:01:13.000000000 +0900 |
3334 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-03 15:07:31.786968193 +0900 |
3335 | +--- a/storage/innobase/buf/buf0buf.c |
3336 | ++++ b/storage/innobase/buf/buf0buf.c |
3337 | @@ -4831,6 +4831,7 @@ |
3338 | } |
3339 | |
3340 | @@ -47,9 +46,8 @@ |
3341 | pool_info->free_list_len, |
3342 | pool_info->lru_len, |
3343 | pool_info->old_lru_len, |
3344 | -diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c |
3345 | ---- a/storage/innobase/buf/buf0flu.c 2010-12-03 20:58:26.000000000 +0300 |
3346 | -+++ b/storage/innobase/buf/buf0flu.c 2011-01-07 03:37:41.000000000 +0300 |
3347 | +--- a/storage/innobase/buf/buf0flu.c |
3348 | ++++ b/storage/innobase/buf/buf0flu.c |
3349 | @@ -75,7 +75,7 @@ |
3350 | static buf_flush_stat_t buf_flush_stat_sum; |
3351 | |
3352 | @@ -59,9 +57,8 @@ |
3353 | |
3354 | /* @} */ |
3355 | |
3356 | -diff -ruN a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c |
3357 | ---- a/storage/innobase/fil/fil0fil.c 2010-11-03 07:01:13.000000000 +0900 |
3358 | -+++ b/storage/innobase/fil/fil0fil.c 2010-12-03 15:07:31.790357112 +0900 |
3359 | +--- a/storage/innobase/fil/fil0fil.c |
3360 | ++++ b/storage/innobase/fil/fil0fil.c |
3361 | @@ -4888,3 +4888,30 @@ |
3362 | |
3363 | fil_system = NULL; |
3364 | @@ -93,9 +90,8 @@ |
3365 | + return 0; |
3366 | + } |
3367 | +} |
3368 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
3369 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:06:58.727955654 +0900 |
3370 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:07:31.799376984 +0900 |
3371 | +--- a/storage/innobase/handler/ha_innodb.cc |
3372 | ++++ b/storage/innobase/handler/ha_innodb.cc |
3373 | @@ -603,6 +603,8 @@ |
3374 | (char*) &export_vars.innodb_buffer_pool_pages_dirty, SHOW_LONG}, |
3375 | {"buffer_pool_pages_flushed", |
3376 | @@ -140,9 +136,8 @@ |
3377 | MYSQL_SYSVAR(version), |
3378 | MYSQL_SYSVAR(use_sys_malloc), |
3379 | MYSQL_SYSVAR(use_native_aio), |
3380 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
3381 | ---- a/storage/innobase/include/buf0buf.h 2011-01-20 07:37:08.000000000 +0900 |
3382 | -+++ b/storage/innobase/include/buf0buf.h 2011-02-14 15:25:20.859126532 +0900 |
3383 | +--- a/storage/innobase/include/buf0buf.h |
3384 | ++++ b/storage/innobase/include/buf0buf.h |
3385 | @@ -125,6 +125,7 @@ |
3386 | /* General buffer pool info */ |
3387 | ulint pool_unique_id; /*!< Buffer Pool ID */ |
3388 | @@ -151,9 +146,8 @@ |
3389 | ulint lru_len; /*!< Length of buf_pool->LRU */ |
3390 | ulint old_lru_len; /*!< buf_pool->LRU_old_len */ |
3391 | ulint free_list_len; /*!< Length of buf_pool->free list */ |
3392 | -diff -ruN a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h |
3393 | ---- a/storage/innobase/include/fil0fil.h 2010-11-03 07:01:13.000000000 +0900 |
3394 | -+++ b/storage/innobase/include/fil0fil.h 2010-12-03 15:07:31.812028575 +0900 |
3395 | +--- a/storage/innobase/include/fil0fil.h |
3396 | ++++ b/storage/innobase/include/fil0fil.h |
3397 | @@ -726,6 +726,17 @@ |
3398 | /*============================*/ |
3399 | ulint id); /*!< in: space id */ |
3400 | @@ -172,9 +166,8 @@ |
3401 | typedef struct fil_space_struct fil_space_t; |
3402 | |
3403 | #endif |
3404 | -diff -ruN a/storage/innobase/include/read0read.h b/storage/innobase/include/read0read.h |
3405 | ---- a/storage/innobase/include/read0read.h 2010-12-04 02:58:26.000000000 +0900 |
3406 | -+++ b/storage/innobase/include/read0read.h 2011-01-21 19:35:44.127631727 +0900 |
3407 | +--- a/storage/innobase/include/read0read.h |
3408 | ++++ b/storage/innobase/include/read0read.h |
3409 | @@ -88,6 +88,7 @@ |
3410 | void |
3411 | read_view_print( |
3412 | @@ -183,9 +176,8 @@ |
3413 | const read_view_t* view); /*!< in: read view */ |
3414 | /*********************************************************************//** |
3415 | Create a consistent cursor view for mysql to be used in cursors. In this |
3416 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
3417 | ---- a/storage/innobase/include/srv0srv.h 2010-11-03 07:01:13.000000000 +0900 |
3418 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-03 15:07:31.813958103 +0900 |
3419 | +--- a/storage/innobase/include/srv0srv.h |
3420 | ++++ b/storage/innobase/include/srv0srv.h |
3421 | @@ -142,6 +142,9 @@ |
3422 | extern char srv_adaptive_flushing; |
3423 | |
3424 | @@ -213,9 +205,8 @@ |
3425 | ulint innodb_buffer_pool_write_requests;/*!< srv_buf_pool_write_requests */ |
3426 | ulint innodb_buffer_pool_read_ahead; /*!< srv_read_ahead */ |
3427 | ulint innodb_buffer_pool_read_ahead_evicted;/*!< srv_read_ahead evicted*/ |
3428 | -diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c |
3429 | ---- a/storage/innobase/lock/lock0lock.c 2010-11-03 07:01:13.000000000 +0900 |
3430 | -+++ b/storage/innobase/lock/lock0lock.c 2010-12-03 15:07:31.819023998 +0900 |
3431 | +--- a/storage/innobase/lock/lock0lock.c |
3432 | ++++ b/storage/innobase/lock/lock0lock.c |
3433 | @@ -4374,6 +4374,7 @@ |
3434 | |
3435 | putc('\n', file); |
3436 | @@ -252,9 +243,8 @@ |
3437 | " SUPPRESSING FURTHER PRINTS\n", |
3438 | file); |
3439 | |
3440 | -diff -ruN a/storage/innobase/read/read0read.c b/storage/innobase/read/read0read.c |
3441 | ---- a/storage/innobase/read/read0read.c 2010-12-04 02:58:26.000000000 +0900 |
3442 | -+++ b/storage/innobase/read/read0read.c 2011-01-21 19:37:08.292650181 +0900 |
3443 | +--- a/storage/innobase/read/read0read.c |
3444 | ++++ b/storage/innobase/read/read0read.c |
3445 | @@ -357,34 +357,35 @@ |
3446 | void |
3447 | read_view_print( |
3448 | @@ -298,9 +288,8 @@ |
3449 | (ullint) read_view_get_nth_trx_id(view, i)); |
3450 | } |
3451 | } |
3452 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
3453 | ---- a/storage/innobase/srv/srv0srv.c 2010-11-03 07:01:13.000000000 +0900 |
3454 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 15:07:31.824022673 +0900 |
3455 | +--- a/storage/innobase/srv/srv0srv.c |
3456 | ++++ b/storage/innobase/srv/srv0srv.c |
3457 | @@ -83,6 +83,7 @@ |
3458 | #include "ha_prototypes.h" |
3459 | #include "trx0i_s.h" |
3460 | @@ -513,9 +502,8 @@ |
3461 | export_vars.innodb_buffer_pool_reads = srv_buf_pool_reads; |
3462 | export_vars.innodb_buffer_pool_read_ahead |
3463 | = stat.n_ra_pages_read; |
3464 | -diff -ruN a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c |
3465 | ---- a/storage/innobase/sync/sync0arr.c 2010-11-03 07:01:13.000000000 +0900 |
3466 | -+++ b/storage/innobase/sync/sync0arr.c 2010-12-03 15:07:31.826041368 +0900 |
3467 | +--- a/storage/innobase/sync/sync0arr.c |
3468 | ++++ b/storage/innobase/sync/sync0arr.c |
3469 | @@ -478,7 +478,7 @@ |
3470 | |
3471 | fprintf(file, |
3472 | @@ -525,9 +513,8 @@ |
3473 | (ulong) os_thread_pf(cell->thread), |
3474 | innobase_basename(cell->file), (ulong) cell->line, |
3475 | difftime(time(NULL), cell->reservation_time)); |
3476 | -diff -ruN a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c |
3477 | ---- a/storage/innobase/trx/trx0purge.c 2010-12-04 02:58:26.000000000 +0900 |
3478 | -+++ b/storage/innobase/trx/trx0purge.c 2011-01-21 19:40:42.086683671 +0900 |
3479 | +--- a/storage/innobase/trx/trx0purge.c |
3480 | ++++ b/storage/innobase/trx/trx0purge.c |
3481 | @@ -1212,7 +1212,7 @@ |
3482 | /*=====================*/ |
3483 | { |
3484 | |
3485 | === modified file 'patches/innodb_show_status_extend.patch' |
3486 | --- patches/innodb_show_status_extend.patch 2011-07-22 16:56:42 +0000 |
3487 | +++ patches/innodb_show_status_extend.patch 2011-07-27 11:32:35 +0000 |
3488 | @@ -5,9 +5,8 @@ |
3489 | #!!! notice !!! |
3490 | # Any small change to this file in the main branch |
3491 | # should be done or reviewed by the maintainer! |
3492 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
3493 | ---- a/storage/innobase/handler/ha_innodb.cc 2011-01-21 19:53:42.369599743 +0900 |
3494 | -+++ b/storage/innobase/handler/ha_innodb.cc 2011-01-21 19:54:44.659599699 +0900 |
3495 | +--- a/storage/innobase/handler/ha_innodb.cc |
3496 | ++++ b/storage/innobase/handler/ha_innodb.cc |
3497 | @@ -638,6 +638,16 @@ |
3498 | trx_t* trx); /*!< in: transaction handle */ |
3499 | |
3500 | @@ -156,9 +155,8 @@ |
3501 | {NullS, NullS, SHOW_LONG} |
3502 | }; |
3503 | |
3504 | -diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c |
3505 | ---- a/storage/innobase/ibuf/ibuf0ibuf.c 2011-02-03 15:05:04.000000000 +0900 |
3506 | -+++ b/storage/innobase/ibuf/ibuf0ibuf.c 2011-02-03 15:19:47.000000000 +0900 |
3507 | +--- a/storage/innobase/ibuf/ibuf0ibuf.c |
3508 | ++++ b/storage/innobase/ibuf/ibuf0ibuf.c |
3509 | @@ -469,6 +469,45 @@ |
3510 | } |
3511 | |
3512 | @@ -205,9 +203,8 @@ |
3513 | Updates the size information of the ibuf, assuming the segment size has not |
3514 | changed. */ |
3515 | static |
3516 | -diff -ruN a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h |
3517 | ---- a/storage/innobase/include/ibuf0ibuf.h 2010-12-04 02:58:26.000000000 +0900 |
3518 | -+++ b/storage/innobase/include/ibuf0ibuf.h 2011-02-03 15:19:47.000000000 +0900 |
3519 | +--- a/storage/innobase/include/ibuf0ibuf.h |
3520 | ++++ b/storage/innobase/include/ibuf0ibuf.h |
3521 | @@ -438,6 +438,22 @@ |
3522 | void |
3523 | ibuf_close(void); |
3524 | @@ -231,9 +228,8 @@ |
3525 | |
3526 | #define IBUF_HEADER_PAGE_NO FSP_IBUF_HEADER_PAGE_NO |
3527 | #define IBUF_TREE_ROOT_PAGE_NO FSP_IBUF_TREE_ROOT_PAGE_NO |
3528 | -diff -ruN a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h |
3529 | ---- a/storage/innobase/include/lock0lock.h 2011-01-21 19:52:38.967683738 +0900 |
3530 | -+++ b/storage/innobase/include/lock0lock.h 2011-01-21 19:54:44.660599140 +0900 |
3531 | +--- a/storage/innobase/include/lock0lock.h |
3532 | ++++ b/storage/innobase/include/lock0lock.h |
3533 | @@ -816,6 +816,7 @@ |
3534 | /** The lock system struct */ |
3535 | struct lock_sys_struct{ |
3536 | @@ -242,9 +238,8 @@ |
3537 | }; |
3538 | |
3539 | /** The lock system */ |
3540 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
3541 | ---- a/storage/innobase/include/srv0srv.h 2011-01-21 19:53:42.380638228 +0900 |
3542 | -+++ b/storage/innobase/include/srv0srv.h 2011-01-21 19:54:44.662600032 +0900 |
3543 | +--- a/storage/innobase/include/srv0srv.h |
3544 | ++++ b/storage/innobase/include/srv0srv.h |
3545 | @@ -731,6 +731,11 @@ |
3546 | |
3547 | /** Status variables to be passed to MySQL */ |
3548 | @@ -339,9 +334,8 @@ |
3549 | }; |
3550 | |
3551 | /** Thread slot in the thread table */ |
3552 | -diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h |
3553 | ---- a/storage/innobase/include/sync0sync.h 2011-01-21 19:48:45.982637372 +0900 |
3554 | -+++ b/storage/innobase/include/sync0sync.h 2011-01-21 19:54:44.664638235 +0900 |
3555 | +--- a/storage/innobase/include/sync0sync.h |
3556 | ++++ b/storage/innobase/include/sync0sync.h |
3557 | @@ -769,6 +769,10 @@ |
3558 | |
3559 | #define SYNC_SPIN_ROUNDS srv_n_spin_wait_rounds |
3560 | @@ -353,9 +347,8 @@ |
3561 | /** The number of mutex_exit calls. Intended for performance monitoring. */ |
3562 | extern ib_int64_t mutex_exit_count; |
3563 | |
3564 | -diff -ruN a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c |
3565 | ---- a/storage/innobase/lock/lock0lock.c 2011-01-21 19:52:38.998600121 +0900 |
3566 | -+++ b/storage/innobase/lock/lock0lock.c 2011-01-21 19:54:44.668637536 +0900 |
3567 | +--- a/storage/innobase/lock/lock0lock.c |
3568 | ++++ b/storage/innobase/lock/lock0lock.c |
3569 | @@ -571,6 +571,7 @@ |
3570 | lock_sys = mem_alloc(sizeof(lock_sys_t)); |
3571 | |
3572 | @@ -388,9 +381,8 @@ |
3573 | |
3574 | UT_LIST_REMOVE(trx_locks, trx->trx_locks, in_lock); |
3575 | } |
3576 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
3577 | ---- a/storage/innobase/srv/srv0srv.c 2011-01-21 19:53:42.390637840 +0900 |
3578 | -+++ b/storage/innobase/srv/srv0srv.c 2011-01-21 19:54:44.673637084 +0900 |
3579 | +--- a/storage/innobase/srv/srv0srv.c |
3580 | ++++ b/storage/innobase/srv/srv0srv.c |
3581 | @@ -2253,12 +2253,49 @@ |
3582 | ulint LRU_len; |
3583 | ulint free_len; |
3584 | @@ -534,9 +526,8 @@ |
3585 | #ifdef HAVE_ATOMIC_BUILTINS |
3586 | export_vars.innodb_have_atomic_builtins = 1; |
3587 | #else |
3588 | -diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c |
3589 | ---- a/storage/innobase/sync/sync0sync.c 2011-01-21 19:53:03.458637954 +0900 |
3590 | -+++ b/storage/innobase/sync/sync0sync.c 2011-01-21 19:54:44.676637686 +0900 |
3591 | +--- a/storage/innobase/sync/sync0sync.c |
3592 | ++++ b/storage/innobase/sync/sync0sync.c |
3593 | @@ -171,13 +171,13 @@ |
3594 | |
3595 | /** The number of iterations in the mutex_spin_wait() spin loop. |
3596 | |
3597 | === modified file 'patches/innodb_show_sys_tables.patch' |
3598 | --- patches/innodb_show_sys_tables.patch 2011-07-22 16:56:42 +0000 |
3599 | +++ patches/innodb_show_sys_tables.patch 2011-07-27 11:32:35 +0000 |
3600 | @@ -5,9 +5,8 @@ |
3601 | #!!! notice !!! |
3602 | # Any small change to this file in the main branch |
3603 | # should be done or reviewed by the maintainer! |
3604 | -diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c |
3605 | ---- a/storage/innobase/dict/dict0load.c 2011-01-20 07:37:08.000000000 +0900 |
3606 | -+++ b/storage/innobase/dict/dict0load.c 2011-02-14 18:59:40.774162959 +0900 |
3607 | +--- a/storage/innobase/dict/dict0load.c |
3608 | ++++ b/storage/innobase/dict/dict0load.c |
3609 | @@ -437,7 +437,7 @@ |
3610 | |
3611 | } |
3612 | @@ -38,9 +37,8 @@ |
3613 | |
3614 | /********************************************************************//** |
3615 | Determine the flags of a table described in SYS_TABLES. |
3616 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
3617 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:53:54.615040167 +0900 |
3618 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 16:07:26.851357007 +0900 |
3619 | +--- a/storage/innobase/handler/ha_innodb.cc |
3620 | ++++ b/storage/innobase/handler/ha_innodb.cc |
3621 | @@ -11772,7 +11772,14 @@ |
3622 | i_s_innodb_cmp, |
3623 | i_s_innodb_cmp_reset, |
3624 | @@ -57,9 +55,8 @@ |
3625 | mysql_declare_plugin_end; |
3626 | |
3627 | /** @brief Initialize the default value of innodb_commit_concurrency. |
3628 | -diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc |
3629 | ---- a/storage/innobase/handler/i_s.cc 2010-12-03 15:49:59.207956807 +0900 |
3630 | -+++ b/storage/innobase/handler/i_s.cc 2010-12-03 17:10:02.719210529 +0900 |
3631 | +--- a/storage/innobase/handler/i_s.cc |
3632 | ++++ b/storage/innobase/handler/i_s.cc |
3633 | @@ -36,9 +36,11 @@ |
3634 | #include <mysql/innodb_priv.h> |
3635 | |
3636 | @@ -1748,9 +1745,8 @@ |
3637 | /*********************************************************************** |
3638 | */ |
3639 | static ST_FIELD_INFO i_s_innodb_rseg_fields_info[] = |
3640 | -diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h |
3641 | ---- a/storage/innobase/handler/i_s.h 2010-12-03 15:37:45.540456499 +0900 |
3642 | -+++ b/storage/innobase/handler/i_s.h 2010-12-03 16:08:57.596941207 +0900 |
3643 | +--- a/storage/innobase/handler/i_s.h |
3644 | ++++ b/storage/innobase/handler/i_s.h |
3645 | @@ -35,6 +35,13 @@ |
3646 | extern struct st_mysql_plugin i_s_innodb_cmp_reset; |
3647 | extern struct st_mysql_plugin i_s_innodb_cmpmem; |
3648 | |
3649 | === modified file 'patches/innodb_split_buf_pool_mutex.patch' |
3650 | --- patches/innodb_split_buf_pool_mutex.patch 2011-07-22 16:56:42 +0000 |
3651 | +++ patches/innodb_split_buf_pool_mutex.patch 2011-07-27 11:32:35 +0000 |
3652 | @@ -5,9 +5,8 @@ |
3653 | #!!! notice !!! |
3654 | # Any small change to this file in the main branch |
3655 | # should be done or reviewed by the maintainer! |
3656 | -diff -ruN a/storage/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c |
3657 | ---- a/storage/innobase/btr/btr0cur.c 2010-11-03 07:01:13.000000000 +0900 |
3658 | -+++ b/storage/innobase/btr/btr0cur.c 2010-12-03 15:48:29.268957148 +0900 |
3659 | +--- a/storage/innobase/btr/btr0cur.c |
3660 | ++++ b/storage/innobase/btr/btr0cur.c |
3661 | @@ -4069,7 +4069,8 @@ |
3662 | |
3663 | mtr_commit(mtr); |
3664 | @@ -44,9 +43,8 @@ |
3665 | mutex_exit(&block->mutex); |
3666 | } |
3667 | |
3668 | -diff -ruN a/storage/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c |
3669 | ---- a/storage/innobase/btr/btr0sea.c 2010-12-03 15:48:03.033037049 +0900 |
3670 | -+++ b/storage/innobase/btr/btr0sea.c 2010-12-03 15:48:29.271024260 +0900 |
3671 | +--- a/storage/innobase/btr/btr0sea.c |
3672 | ++++ b/storage/innobase/btr/btr0sea.c |
3673 | @@ -1943,7 +1943,7 @@ |
3674 | rec_offs_init(offsets_); |
3675 | |
3676 | @@ -93,9 +91,8 @@ |
3677 | rw_lock_x_unlock(&btr_search_latch); |
3678 | if (UNIV_LIKELY_NULL(heap)) { |
3679 | mem_heap_free(heap); |
3680 | -diff -ruN a/storage/innobase/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c |
3681 | ---- a/storage/innobase/buf/buf0buddy.c 2010-12-03 15:22:36.307986907 +0900 |
3682 | -+++ b/storage/innobase/buf/buf0buddy.c 2010-12-03 15:48:29.275025723 +0900 |
3683 | +--- a/storage/innobase/buf/buf0buddy.c |
3684 | ++++ b/storage/innobase/buf/buf0buddy.c |
3685 | @@ -73,10 +73,11 @@ |
3686 | if (b) UNIV_MEM_VALID(b, BUF_BUDDY_LOW << i); |
3687 | #endif /* UNIV_DEBUG_VALGRIND */ |
3688 | @@ -570,9 +567,8 @@ |
3689 | |
3690 | buf = bpage; |
3691 | UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i); |
3692 | -diff -ruN a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c |
3693 | ---- a/storage/innobase/buf/buf0buf.c 2010-12-03 15:22:36.314943336 +0900 |
3694 | -+++ b/storage/innobase/buf/buf0buf.c 2010-12-03 15:48:29.282947357 +0900 |
3695 | +--- a/storage/innobase/buf/buf0buf.c |
3696 | ++++ b/storage/innobase/buf/buf0buf.c |
3697 | @@ -263,6 +263,7 @@ |
3698 | #ifdef UNIV_PFS_RWLOCK |
3699 | /* Keys to register buffer block related rwlocks and mutexes with |
3700 | @@ -1965,9 +1961,8 @@ |
3701 | |
3702 | return(len); |
3703 | } |
3704 | -diff -ruN a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c |
3705 | ---- a/storage/innobase/buf/buf0flu.c 2010-12-03 15:22:36.318955693 +0900 |
3706 | -+++ b/storage/innobase/buf/buf0flu.c 2010-12-03 15:48:29.289024083 +0900 |
3707 | +--- a/storage/innobase/buf/buf0flu.c |
3708 | ++++ b/storage/innobase/buf/buf0flu.c |
3709 | @@ -307,7 +307,7 @@ |
3710 | |
3711 | ut_d(block->page.in_flush_list = TRUE); |
3712 | @@ -2392,9 +2387,8 @@ |
3713 | |
3714 | ut_a(!bpage || om >= bpage->oldest_modification); |
3715 | } |
3716 | -diff -ruN a/storage/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c |
3717 | ---- a/storage/innobase/buf/buf0lru.c 2010-12-03 15:22:36.321987250 +0900 |
3718 | -+++ b/storage/innobase/buf/buf0lru.c 2010-12-03 15:48:29.293023197 +0900 |
3719 | +--- a/storage/innobase/buf/buf0lru.c |
3720 | ++++ b/storage/innobase/buf/buf0lru.c |
3721 | @@ -143,8 +143,9 @@ |
3722 | void |
3723 | buf_LRU_block_free_hashed_page( |
3724 | @@ -2766,12 +2760,12 @@ |
3725 | - buf_pool_mutex_enter(buf_pool); |
3726 | + if (UT_LIST_GET_LEN(buf_pool->unzip_LRU)) |
3727 | + have_LRU_mutex = TRUE; |
3728 | -+ |
3729 | -+ //buf_pool_mutex_enter(buf_pool); |
3730 | -+ if (have_LRU_mutex) |
3731 | -+ mutex_enter(&buf_pool->LRU_list_mutex); |
3732 | |
3733 | - freed = buf_LRU_free_from_unzip_LRU_list(buf_pool, n_iterations); |
3734 | ++ //buf_pool_mutex_enter(buf_pool); |
3735 | ++ if (have_LRU_mutex) |
3736 | ++ mutex_enter(&buf_pool->LRU_list_mutex); |
3737 | ++ |
3738 | + freed = buf_LRU_free_from_unzip_LRU_list(buf_pool, n_iterations, have_LRU_mutex); |
3739 | |
3740 | if (!freed) { |
3741 | @@ -3330,9 +3324,8 @@ |
3742 | } |
3743 | |
3744 | /**********************************************************************//** |
3745 | -diff -ruN a/storage/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c |
3746 | ---- a/storage/innobase/buf/buf0rea.c 2010-12-03 15:22:36.323977308 +0900 |
3747 | -+++ b/storage/innobase/buf/buf0rea.c 2010-12-03 15:48:29.296024468 +0900 |
3748 | +--- a/storage/innobase/buf/buf0rea.c |
3749 | ++++ b/storage/innobase/buf/buf0rea.c |
3750 | @@ -311,6 +311,7 @@ |
3751 | |
3752 | return(0); |
3753 | @@ -3379,9 +3372,8 @@ |
3754 | |
3755 | if ((offset == low) && (succ_offset == offset + 1)) { |
3756 | |
3757 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
3758 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:48:03.048955897 +0900 |
3759 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:48:29.304024564 +0900 |
3760 | +--- a/storage/innobase/handler/ha_innodb.cc |
3761 | ++++ b/storage/innobase/handler/ha_innodb.cc |
3762 | @@ -264,6 +264,10 @@ |
3763 | # endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */ |
3764 | {&buf_pool_mutex_key, "buf_pool_mutex", 0}, |
3765 | @@ -3401,9 +3393,8 @@ |
3766 | # ifndef PFS_SKIP_BUFFER_MUTEX_RWLOCK |
3767 | {&buf_block_lock_key, "buf_block_lock", 0}, |
3768 | # endif /* !PFS_SKIP_BUFFER_MUTEX_RWLOCK */ |
3769 | -diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc |
3770 | ---- a/storage/innobase/handler/i_s.cc 2010-12-03 15:37:45.517105700 +0900 |
3771 | -+++ b/storage/innobase/handler/i_s.cc 2010-12-03 15:48:29.331024462 +0900 |
3772 | +--- a/storage/innobase/handler/i_s.cc |
3773 | ++++ b/storage/innobase/handler/i_s.cc |
3774 | @@ -1563,7 +1563,8 @@ |
3775 | |
3776 | buf_pool = buf_pool_from_array(i); |
3777 | @@ -3424,9 +3415,8 @@ |
3778 | |
3779 | if (status) { |
3780 | break; |
3781 | -diff -ruN a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c |
3782 | ---- a/storage/innobase/ibuf/ibuf0ibuf.c 2010-12-03 15:48:03.068954202 +0900 |
3783 | -+++ b/storage/innobase/ibuf/ibuf0ibuf.c 2010-12-03 15:48:29.335988682 +0900 |
3784 | +--- a/storage/innobase/ibuf/ibuf0ibuf.c |
3785 | ++++ b/storage/innobase/ibuf/ibuf0ibuf.c |
3786 | @@ -3821,9 +3821,11 @@ |
3787 | ulint fold = buf_page_address_fold(space, page_no); |
3788 | buf_pool_t* buf_pool = buf_pool_get(space, page_no); |
3789 | @@ -3441,9 +3431,8 @@ |
3790 | |
3791 | if (UNIV_LIKELY_NULL(bpage)) { |
3792 | /* A buffer pool watch has been set or the |
3793 | -diff -ruN a/storage/innobase/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h |
3794 | ---- a/storage/innobase/include/buf0buddy.h 2010-11-03 07:01:13.000000000 +0900 |
3795 | -+++ b/storage/innobase/include/buf0buddy.h 2010-12-03 15:48:29.338023826 +0900 |
3796 | +--- a/storage/innobase/include/buf0buddy.h |
3797 | ++++ b/storage/innobase/include/buf0buddy.h |
3798 | @@ -51,10 +51,11 @@ |
3799 | buf_pool_t* buf_pool, |
3800 | /*!< buffer pool in which the block resides */ |
3801 | @@ -3467,9 +3456,8 @@ |
3802 | __attribute__((nonnull)); |
3803 | |
3804 | #ifndef UNIV_NONINL |
3805 | -diff -ruN a/storage/innobase/include/buf0buddy.ic b/storage/innobase/include/buf0buddy.ic |
3806 | ---- a/storage/innobase/include/buf0buddy.ic 2010-11-03 07:01:13.000000000 +0900 |
3807 | -+++ b/storage/innobase/include/buf0buddy.ic 2010-12-03 15:48:29.339040413 +0900 |
3808 | +--- a/storage/innobase/include/buf0buddy.ic |
3809 | ++++ b/storage/innobase/include/buf0buddy.ic |
3810 | @@ -46,10 +46,11 @@ |
3811 | /*!< in: buffer pool in which the page resides */ |
3812 | ulint i, /*!< in: index of buf_pool->zip_free[], |
3813 | @@ -3544,9 +3532,8 @@ |
3814 | } |
3815 | |
3816 | #ifdef UNIV_MATERIALIZE |
3817 | -diff -ruN a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h |
3818 | ---- a/storage/innobase/include/buf0buf.h 2010-12-03 15:22:36.327954660 +0900 |
3819 | -+++ b/storage/innobase/include/buf0buf.h 2010-12-03 15:48:29.343024683 +0900 |
3820 | +--- a/storage/innobase/include/buf0buf.h |
3821 | ++++ b/storage/innobase/include/buf0buf.h |
3822 | @@ -205,6 +205,20 @@ |
3823 | /*==========================*/ |
3824 | |
3825 | @@ -3640,9 +3627,8 @@ |
3826 | mutex_enter(&b->mutex); \ |
3827 | } while (0) |
3828 | |
3829 | -diff -ruN a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic |
3830 | ---- a/storage/innobase/include/buf0buf.ic 2010-11-03 07:01:13.000000000 +0900 |
3831 | -+++ b/storage/innobase/include/buf0buf.ic 2010-12-03 15:48:29.345024524 +0900 |
3832 | +--- a/storage/innobase/include/buf0buf.ic |
3833 | ++++ b/storage/innobase/include/buf0buf.ic |
3834 | @@ -274,7 +274,7 @@ |
3835 | case BUF_BLOCK_ZIP_FREE: |
3836 | /* This is a free page in buf_pool->zip_free[]. |
3837 | @@ -3887,9 +3873,8 @@ |
3838 | + } |
3839 | +} |
3840 | #endif /* !UNIV_HOTBACKUP */ |
3841 | -diff -ruN a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h |
3842 | ---- a/storage/innobase/include/buf0lru.h 2010-11-03 07:01:13.000000000 +0900 |
3843 | -+++ b/storage/innobase/include/buf0lru.h 2010-12-03 15:48:29.349024701 +0900 |
3844 | +--- a/storage/innobase/include/buf0lru.h |
3845 | ++++ b/storage/innobase/include/buf0lru.h |
3846 | @@ -111,8 +111,9 @@ |
3847 | buf_LRU_free_block( |
3848 | /*===============*/ |
3849 | @@ -3911,9 +3896,8 @@ |
3850 | /******************************************************************//** |
3851 | Adds a block to the LRU list. */ |
3852 | UNIV_INTERN |
3853 | -diff -ruN a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h |
3854 | ---- a/storage/innobase/include/sync0rw.h 2010-11-03 07:01:13.000000000 +0900 |
3855 | -+++ b/storage/innobase/include/sync0rw.h 2010-12-03 15:48:29.349942993 +0900 |
3856 | +--- a/storage/innobase/include/sync0rw.h |
3857 | ++++ b/storage/innobase/include/sync0rw.h |
3858 | @@ -112,6 +112,7 @@ |
3859 | extern mysql_pfs_key_t archive_lock_key; |
3860 | # endif /* UNIV_LOG_ARCHIVE */ |
3861 | @@ -3922,9 +3906,8 @@ |
3862 | extern mysql_pfs_key_t buf_block_lock_key; |
3863 | # ifdef UNIV_SYNC_DEBUG |
3864 | extern mysql_pfs_key_t buf_block_debug_latch_key; |
3865 | -diff -ruN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h |
3866 | ---- a/storage/innobase/include/sync0sync.h 2010-11-03 07:01:13.000000000 +0900 |
3867 | -+++ b/storage/innobase/include/sync0sync.h 2010-12-03 15:48:29.352024614 +0900 |
3868 | +--- a/storage/innobase/include/sync0sync.h |
3869 | ++++ b/storage/innobase/include/sync0sync.h |
3870 | @@ -75,6 +75,10 @@ |
3871 | extern mysql_pfs_key_t buffer_block_mutex_key; |
3872 | extern mysql_pfs_key_t buf_pool_mutex_key; |
3873 | @@ -3969,9 +3952,8 @@ |
3874 | may be) threads waiting in the global wait |
3875 | array for this mutex to be released. |
3876 | Otherwise, this is 0. */ |
3877 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
3878 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-03 15:48:03.080956216 +0900 |
3879 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 15:48:29.355023766 +0900 |
3880 | +--- a/storage/innobase/srv/srv0srv.c |
3881 | ++++ b/storage/innobase/srv/srv0srv.c |
3882 | @@ -3098,7 +3098,7 @@ |
3883 | level += log_sys->max_checkpoint_age |
3884 | - (lsn - oldest_modification); |
3885 | @@ -3990,9 +3972,8 @@ |
3886 | new_blocks_num++; |
3887 | } |
3888 | if (!found) { |
3889 | -diff -ruN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c |
3890 | ---- a/storage/innobase/sync/sync0sync.c 2010-11-03 07:01:13.000000000 +0900 |
3891 | -+++ b/storage/innobase/sync/sync0sync.c 2010-12-03 15:48:29.358023890 +0900 |
3892 | +--- a/storage/innobase/sync/sync0sync.c |
3893 | ++++ b/storage/innobase/sync/sync0sync.c |
3894 | @@ -285,7 +285,7 @@ |
3895 | mutex->lock_word = 0; |
3896 | #endif |
3897 | |
3898 | === modified file 'patches/innodb_stats.patch' |
3899 | --- patches/innodb_stats.patch 2011-07-22 16:56:42 +0000 |
3900 | +++ patches/innodb_stats.patch 2011-07-27 11:32:35 +0000 |
3901 | @@ -5,9 +5,8 @@ |
3902 | #!!! notice !!! |
3903 | # Any small change to this file in the main branch |
3904 | # should be done or reviewed by the maintainer! |
3905 | -diff -ruN a/storage/innobase/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c |
3906 | ---- a/storage/innobase/dict/dict0boot.c 2010-12-03 15:48:03.034036843 +0900 |
3907 | -+++ b/storage/innobase/dict/dict0boot.c 2010-12-03 17:19:24.835112632 +0900 |
3908 | +--- a/storage/innobase/dict/dict0boot.c |
3909 | ++++ b/storage/innobase/dict/dict0boot.c |
3910 | @@ -266,6 +266,29 @@ |
3911 | /* Get the dictionary header */ |
3912 | dict_hdr = dict_hdr_get(&mtr); |
3913 | @@ -101,9 +100,8 @@ |
3914 | |
3915 | mutex_exit(&(dict_sys->mutex)); |
3916 | } |
3917 | -diff -ruN a/storage/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c |
3918 | ---- a/storage/innobase/dict/dict0crea.c 2010-12-03 15:48:03.036081059 +0900 |
3919 | -+++ b/storage/innobase/dict/dict0crea.c 2010-12-03 17:19:24.836964976 +0900 |
3920 | +--- a/storage/innobase/dict/dict0crea.c |
3921 | ++++ b/storage/innobase/dict/dict0crea.c |
3922 | @@ -508,6 +508,56 @@ |
3923 | } |
3924 | |
3925 | @@ -280,16 +278,10 @@ |
3926 | } |
3927 | |
3928 | if (node->state == INDEX_CREATE_INDEX_TREE) { |
3929 | -@@ -1178,6 +1317,66 @@ |
3930 | - return(NULL); |
3931 | - } |
3932 | +@@ -1184,6 +1323,66 @@ |
3933 | + } |
3934 | |
3935 | -+ thr->run_node = que_node_get_parent(node); |
3936 | -+ |
3937 | -+ return(thr); |
3938 | -+} |
3939 | -+ |
3940 | -+/****************************************************************//** |
3941 | + /****************************************************************//** |
3942 | +*/ |
3943 | +UNIV_INTERN |
3944 | +que_thr_t* |
3945 | @@ -344,12 +336,17 @@ |
3946 | + return(NULL); |
3947 | + } |
3948 | + |
3949 | - thr->run_node = que_node_get_parent(node); |
3950 | - |
3951 | - return(thr); |
3952 | -diff -ruN a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c |
3953 | ---- a/storage/innobase/dict/dict0dict.c 2010-12-03 15:48:03.040222428 +0900 |
3954 | -+++ b/storage/innobase/dict/dict0dict.c 2010-12-03 17:19:24.841947690 +0900 |
3955 | ++ thr->run_node = que_node_get_parent(node); |
3956 | ++ |
3957 | ++ return(thr); |
3958 | ++} |
3959 | ++ |
3960 | ++/****************************************************************//** |
3961 | + Creates the foreign key constraints system tables inside InnoDB |
3962 | + at database creation or database start if they are not found or are |
3963 | + not of the right form. |
3964 | +--- a/storage/innobase/dict/dict0dict.c |
3965 | ++++ b/storage/innobase/dict/dict0dict.c |
3966 | @@ -755,7 +755,7 @@ |
3967 | print an error message and return without doing |
3968 | anything. */ |
3969 | @@ -797,9 +794,8 @@ |
3970 | |
3971 | dict_table_stats_lock(table, RW_S_LATCH); |
3972 | |
3973 | -diff -ruN a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c |
3974 | ---- a/storage/innobase/dict/dict0load.c 2010-11-03 07:01:13.000000000 +0900 |
3975 | -+++ b/storage/innobase/dict/dict0load.c 2010-12-03 17:19:24.845947460 +0900 |
3976 | +--- a/storage/innobase/dict/dict0load.c |
3977 | ++++ b/storage/innobase/dict/dict0load.c |
3978 | @@ -50,7 +50,8 @@ |
3979 | "SYS_COLUMNS", |
3980 | "SYS_FIELDS", |
3981 | @@ -901,9 +897,8 @@ |
3982 | Determine the flags of a table described in SYS_TABLES. |
3983 | @return compressed page size in kilobytes; or 0 if the tablespace is |
3984 | uncompressed, ULINT_UNDEFINED on error */ |
3985 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
3986 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:17:03.665960357 +0900 |
3987 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 17:22:21.586939783 +0900 |
3988 | +--- a/storage/innobase/handler/ha_innodb.cc |
3989 | ++++ b/storage/innobase/handler/ha_innodb.cc |
3990 | @@ -187,6 +187,7 @@ |
3991 | static my_bool innobase_rollback_on_timeout = FALSE; |
3992 | static my_bool innobase_create_status_file = FALSE; |
3993 | @@ -1073,9 +1068,8 @@ |
3994 | mysql_declare_plugin_end; |
3995 | |
3996 | /** @brief Initialize the default value of innodb_commit_concurrency. |
3997 | -diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc |
3998 | ---- a/storage/innobase/handler/i_s.cc 2010-12-03 17:17:03.666956117 +0900 |
3999 | -+++ b/storage/innobase/handler/i_s.cc 2010-12-03 17:19:24.880964526 +0900 |
4000 | +--- a/storage/innobase/handler/i_s.cc |
4001 | ++++ b/storage/innobase/handler/i_s.cc |
4002 | @@ -49,6 +49,7 @@ |
4003 | #include "trx0trx.h" /* for TRX_QUE_STATE_STR_MAX_LEN */ |
4004 | #include "trx0rseg.h" /* for trx_rseg_struct */ |
4005 | @@ -1654,9 +1648,8 @@ |
4006 | + STRUCT_FLD(system_vars, NULL), |
4007 | + STRUCT_FLD(__reserved1, NULL) |
4008 | +}; |
4009 | -diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h |
4010 | ---- a/storage/innobase/handler/i_s.h 2010-12-03 17:17:03.668953884 +0900 |
4011 | -+++ b/storage/innobase/handler/i_s.h 2010-12-03 17:19:24.882947826 +0900 |
4012 | +--- a/storage/innobase/handler/i_s.h |
4013 | ++++ b/storage/innobase/handler/i_s.h |
4014 | @@ -43,5 +43,8 @@ |
4015 | extern struct st_mysql_plugin i_s_innodb_sys_foreign; |
4016 | extern struct st_mysql_plugin i_s_innodb_sys_foreign_cols; |
4017 | @@ -1666,9 +1659,8 @@ |
4018 | +extern struct st_mysql_plugin i_s_innodb_index_stats; |
4019 | |
4020 | #endif /* i_s_h */ |
4021 | -diff -ruN a/storage/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h |
4022 | ---- a/storage/innobase/include/dict0boot.h 2010-11-03 07:01:13.000000000 +0900 |
4023 | -+++ b/storage/innobase/include/dict0boot.h 2010-12-03 17:19:24.885947372 +0900 |
4024 | +--- a/storage/innobase/include/dict0boot.h |
4025 | ++++ b/storage/innobase/include/dict0boot.h |
4026 | @@ -104,6 +104,7 @@ |
4027 | #define DICT_COLUMNS_ID 2 |
4028 | #define DICT_INDEXES_ID 3 |
4029 | @@ -1708,9 +1700,8 @@ |
4030 | #ifndef UNIV_NONINL |
4031 | #include "dict0boot.ic" |
4032 | #endif |
4033 | -diff -ruN a/storage/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h |
4034 | ---- a/storage/innobase/include/dict0crea.h 2010-11-03 07:01:13.000000000 +0900 |
4035 | -+++ b/storage/innobase/include/dict0crea.h 2010-12-03 17:19:24.886949643 +0900 |
4036 | +--- a/storage/innobase/include/dict0crea.h |
4037 | ++++ b/storage/innobase/include/dict0crea.h |
4038 | @@ -53,6 +53,14 @@ |
4039 | dict_index_t* index, /*!< in: index to create, built as a memory data |
4040 | structure */ |
4041 | @@ -1764,9 +1755,8 @@ |
4042 | |
4043 | #ifndef UNIV_NONINL |
4044 | #include "dict0crea.ic" |
4045 | -diff -ruN a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h |
4046 | ---- a/storage/innobase/include/dict0dict.h 2010-12-03 15:48:03.073024387 +0900 |
4047 | -+++ b/storage/innobase/include/dict0dict.h 2010-12-03 17:19:24.888965622 +0900 |
4048 | +--- a/storage/innobase/include/dict0dict.h |
4049 | ++++ b/storage/innobase/include/dict0dict.h |
4050 | @@ -1096,10 +1096,18 @@ |
4051 | dict_update_statistics( |
4052 | /*===================*/ |
4053 | @@ -1795,9 +1785,8 @@ |
4054 | }; |
4055 | #endif /* !UNIV_HOTBACKUP */ |
4056 | |
4057 | -diff -ruN a/storage/innobase/include/dict0load.h b/storage/innobase/include/dict0load.h |
4058 | ---- a/storage/innobase/include/dict0load.h 2010-11-03 07:01:13.000000000 +0900 |
4059 | -+++ b/storage/innobase/include/dict0load.h 2010-12-03 17:19:24.889947481 +0900 |
4060 | +--- a/storage/innobase/include/dict0load.h |
4061 | ++++ b/storage/innobase/include/dict0load.h |
4062 | @@ -41,6 +41,7 @@ |
4063 | SYS_FIELDS, |
4064 | SYS_FOREIGN, |
4065 | @@ -1827,9 +1816,8 @@ |
4066 | #ifndef UNIV_NONINL |
4067 | #include "dict0load.ic" |
4068 | #endif |
4069 | -diff -ruN a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h |
4070 | ---- a/storage/innobase/include/que0que.h 2010-11-03 07:01:13.000000000 +0900 |
4071 | -+++ b/storage/innobase/include/que0que.h 2010-12-03 17:19:24.892947946 +0900 |
4072 | +--- a/storage/innobase/include/que0que.h |
4073 | ++++ b/storage/innobase/include/que0que.h |
4074 | @@ -492,6 +492,8 @@ |
4075 | #define QUE_NODE_CALL 31 |
4076 | #define QUE_NODE_EXIT 32 |
4077 | @@ -1839,9 +1827,8 @@ |
4078 | /* Query thread states */ |
4079 | #define QUE_THR_RUNNING 1 |
4080 | #define QUE_THR_PROCEDURE_WAIT 2 |
4081 | -diff -ruN a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h |
4082 | ---- a/storage/innobase/include/row0mysql.h 2010-11-03 07:01:13.000000000 +0900 |
4083 | -+++ b/storage/innobase/include/row0mysql.h 2010-12-03 17:19:24.904973020 +0900 |
4084 | +--- a/storage/innobase/include/row0mysql.h |
4085 | ++++ b/storage/innobase/include/row0mysql.h |
4086 | @@ -387,6 +387,22 @@ |
4087 | then checked for not being too |
4088 | large. */ |
4089 | @@ -1865,9 +1852,8 @@ |
4090 | Scans a table create SQL string and adds to the data dictionary |
4091 | the foreign key constraints declared in the string. This function |
4092 | should be called after the indexes for a table have been created. |
4093 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
4094 | ---- a/storage/innobase/include/srv0srv.h 2010-12-03 15:53:54.622036720 +0900 |
4095 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-03 17:19:24.906953188 +0900 |
4096 | +--- a/storage/innobase/include/srv0srv.h |
4097 | ++++ b/storage/innobase/include/srv0srv.h |
4098 | @@ -211,6 +211,9 @@ |
4099 | extern ibool srv_innodb_status; |
4100 | |
4101 | @@ -1878,9 +1864,8 @@ |
4102 | |
4103 | extern ibool srv_use_doublewrite_buf; |
4104 | extern ibool srv_use_checksums; |
4105 | -diff -ruN a/storage/innobase/que/que0que.c b/storage/innobase/que/que0que.c |
4106 | ---- a/storage/innobase/que/que0que.c 2010-11-03 07:01:13.000000000 +0900 |
4107 | -+++ b/storage/innobase/que/que0que.c 2010-12-03 17:19:24.910953422 +0900 |
4108 | +--- a/storage/innobase/que/que0que.c |
4109 | ++++ b/storage/innobase/que/que0que.c |
4110 | @@ -621,11 +621,21 @@ |
4111 | |
4112 | que_graph_free_recursive(cre_ind->ind_def); |
4113 | @@ -1921,9 +1906,8 @@ |
4114 | } else if (type == QUE_NODE_ROW_PRINTF) { |
4115 | thr = row_printf_step(thr); |
4116 | } else { |
4117 | -diff -ruN a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c |
4118 | ---- a/storage/innobase/row/row0ins.c 2011-03-10 00:11:38.000000000 +0900 |
4119 | -+++ b/storage/innobase/row/row0ins.c 2011-03-30 11:44:58.000000000 +0900 |
4120 | +--- a/storage/innobase/row/row0ins.c |
4121 | ++++ b/storage/innobase/row/row0ins.c |
4122 | @@ -2012,6 +2012,8 @@ |
4123 | } |
4124 | |
4125 | @@ -1933,9 +1917,8 @@ |
4126 | { |
4127 | page_t* page = btr_cur_get_page(&cursor); |
4128 | rec_t* first_rec = page_rec_get_next( |
4129 | -diff -ruN a/storage/innobase/row/row0merge.c b/storage/innobase/row/row0merge.c |
4130 | ---- a/storage/innobase/row/row0merge.c 2010-11-03 07:01:13.000000000 +0900 |
4131 | -+++ b/storage/innobase/row/row0merge.c 2010-12-03 17:19:24.914955391 +0900 |
4132 | +--- a/storage/innobase/row/row0merge.c |
4133 | ++++ b/storage/innobase/row/row0merge.c |
4134 | @@ -2019,6 +2019,8 @@ |
4135 | "UPDATE SYS_INDEXES SET NAME=CONCAT('" |
4136 | TEMP_INDEX_PREFIX_STR "', NAME) WHERE ID = :indexid;\n" |
4137 | @@ -1945,9 +1928,8 @@ |
4138 | /* Drop the field definitions of the index. */ |
4139 | "DELETE FROM SYS_FIELDS WHERE INDEX_ID = :indexid;\n" |
4140 | /* Drop the index definition and the B-tree. */ |
4141 | -diff -ruN a/storage/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c |
4142 | ---- a/storage/innobase/row/row0mysql.c 2010-11-03 07:01:13.000000000 +0900 |
4143 | -+++ b/storage/innobase/row/row0mysql.c 2010-12-03 17:19:24.918953476 +0900 |
4144 | +--- a/storage/innobase/row/row0mysql.c |
4145 | ++++ b/storage/innobase/row/row0mysql.c |
4146 | @@ -921,6 +921,9 @@ |
4147 | |
4148 | table->stat_modified_counter = counter + 1; |
4149 | @@ -2057,9 +2039,8 @@ |
4150 | " DELETE FROM SYS_FIELDS\n" |
4151 | " WHERE INDEX_ID = index_id;\n" |
4152 | " DELETE FROM SYS_INDEXES\n" |
4153 | -diff -ruN a/storage/innobase/row/row0row.c b/storage/innobase/row/row0row.c |
4154 | ---- a/storage/innobase/row/row0row.c 2011-03-10 00:11:38.000000000 +0900 |
4155 | -+++ b/storage/innobase/row/row0row.c 2011-03-30 11:44:58.000000000 +0900 |
4156 | +--- a/storage/innobase/row/row0row.c |
4157 | ++++ b/storage/innobase/row/row0row.c |
4158 | @@ -347,6 +347,14 @@ |
4159 | |
4160 | rec_len = rec_offs_n_fields(offsets); |
4161 | @@ -2090,9 +2071,8 @@ |
4162 | field = rec_get_nth_field(rec, offsets, i, &len); |
4163 | |
4164 | dfield_set_data(dfield, field, len); |
4165 | -diff -ruN a/storage/innobase/row/row0upd.c b/storage/innobase/row/row0upd.c |
4166 | ---- a/storage/innobase/row/row0upd.c 2011-03-10 00:11:38.000000000 +0900 |
4167 | -+++ b/storage/innobase/row/row0upd.c 2011-03-30 11:44:58.000000000 +0900 |
4168 | +--- a/storage/innobase/row/row0upd.c |
4169 | ++++ b/storage/innobase/row/row0upd.c |
4170 | @@ -439,6 +439,12 @@ |
4171 | 0); |
4172 | } |
4173 | @@ -2125,9 +2105,8 @@ |
4174 | data = rec_get_nth_field(rec, offsets, i, &len); |
4175 | |
4176 | dfield = dtuple_get_nth_field(entry, i); |
4177 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
4178 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-03 15:53:54.625288512 +0900 |
4179 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 17:19:24.922953561 +0900 |
4180 | +--- a/storage/innobase/srv/srv0srv.c |
4181 | ++++ b/storage/innobase/srv/srv0srv.c |
4182 | @@ -398,6 +398,9 @@ |
4183 | /* When estimating number of different key values in an index, sample |
4184 | this many index pages */ |
4185 | @@ -2138,9 +2117,8 @@ |
4186 | |
4187 | UNIV_INTERN ibool srv_use_doublewrite_buf = TRUE; |
4188 | UNIV_INTERN ibool srv_use_checksums = TRUE; |
4189 | -diff -ruN a/storage/innobase/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c |
4190 | ---- a/storage/innobase/trx/trx0rec.c 2011-03-10 00:11:38.000000000 +0900 |
4191 | -+++ b/storage/innobase/trx/trx0rec.c 2011-03-30 11:44:58.000000000 +0900 |
4192 | +--- a/storage/innobase/trx/trx0rec.c |
4193 | ++++ b/storage/innobase/trx/trx0rec.c |
4194 | @@ -665,14 +665,27 @@ |
4195 | /* Save to the undo log the old values of the columns to be updated. */ |
4196 | |
4197 | |
4198 | === modified file 'patches/innodb_thread_concurrency_timer_based.patch' |
4199 | --- patches/innodb_thread_concurrency_timer_based.patch 2011-07-22 16:56:42 +0000 |
4200 | +++ patches/innodb_thread_concurrency_timer_based.patch 2011-07-27 11:32:35 +0000 |
4201 | @@ -5,9 +5,8 @@ |
4202 | #!!! notice !!! |
4203 | # Any small change to this file in the main branch |
4204 | # should be done or reviewed by the maintainer! |
4205 | -diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc |
4206 | ---- a/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:41:52.045404706 +0900 |
4207 | -+++ b/storage/innobase/handler/ha_innodb.cc 2010-12-03 15:42:11.568959457 +0900 |
4208 | +--- a/storage/innobase/handler/ha_innodb.cc |
4209 | ++++ b/storage/innobase/handler/ha_innodb.cc |
4210 | @@ -148,6 +148,7 @@ |
4211 | static ulong innobase_write_io_threads; |
4212 | static long innobase_buffer_pool_instances = 1; |
4213 | @@ -47,9 +46,8 @@ |
4214 | MYSQL_SYSVAR(thread_sleep_delay), |
4215 | MYSQL_SYSVAR(autoinc_lock_mode), |
4216 | MYSQL_SYSVAR(show_verbose_locks), |
4217 | -diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h |
4218 | ---- a/storage/innobase/include/srv0srv.h 2010-12-03 15:37:45.543027751 +0900 |
4219 | -+++ b/storage/innobase/include/srv0srv.h 2010-12-03 15:42:11.571024631 +0900 |
4220 | +--- a/storage/innobase/include/srv0srv.h |
4221 | ++++ b/storage/innobase/include/srv0srv.h |
4222 | @@ -161,6 +161,8 @@ |
4223 | extern ulint srv_mem_pool_size; |
4224 | extern ulint srv_lock_table_size; |
4225 | @@ -59,9 +57,8 @@ |
4226 | extern ulint srv_n_file_io_threads; |
4227 | extern ulong srv_read_ahead_threshold; |
4228 | extern ulint srv_n_read_io_threads; |
4229 | -diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c |
4230 | ---- a/storage/innobase/srv/srv0srv.c 2010-12-03 15:37:45.546023493 +0900 |
4231 | -+++ b/storage/innobase/srv/srv0srv.c 2010-12-03 15:42:11.574955879 +0900 |
4232 | +--- a/storage/innobase/srv/srv0srv.c |
4233 | ++++ b/storage/innobase/srv/srv0srv.c |
4234 | @@ -347,6 +347,7 @@ |
4235 | computer. Bigger computers need bigger values. Value 0 will disable the |
4236 | concurrency check. */ |
4237 | |
4238 | === modified file 'patches/log_connection_error.patch' |
4239 | --- patches/log_connection_error.patch 2011-07-22 16:56:42 +0000 |
4240 | +++ patches/log_connection_error.patch 2011-07-27 11:32:35 +0000 |
4241 | @@ -5,9 +5,8 @@ |
4242 | #!!! notice !!! |
4243 | # Any small change to this file in the main branch |
4244 | # should be done or reviewed by the maintainer! |
4245 | -diff -ruN /dev/null b/patch_info/log_connection_error.patch |
4246 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4247 | -+++ b/patch_info/log_connection_error.patch 2011-04-09 18:48:54.000000000 +0400 |
4248 | +--- /dev/null |
4249 | ++++ b/patch_info/log_connection_error.patch |
4250 | @@ -0,0 +1,6 @@ |
4251 | +File=log_connection_error.patch |
4252 | +Name=logging abandoned connections |
4253 | @@ -15,9 +14,8 @@ |
4254 | +Author=Percona <info@percona.com> |
4255 | +License=GPL |
4256 | +Comment= |
4257 | -diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc |
4258 | ---- a/sql/mysqld.cc 2011-04-09 18:48:53.000000000 +0400 |
4259 | -+++ b/sql/mysqld.cc 2011-04-09 18:48:54.000000000 +0400 |
4260 | +--- a/sql/mysqld.cc |
4261 | ++++ b/sql/mysqld.cc |
4262 | @@ -5040,6 +5040,10 @@ |
4263 | |
4264 | DBUG_PRINT("error",("Too many connections")); |
4265 | |
4266 | === modified file 'patches/log_warnings_suppress.patch' |
4267 | --- patches/log_warnings_suppress.patch 2011-07-22 16:56:42 +0000 |
4268 | +++ patches/log_warnings_suppress.patch 2011-07-27 11:32:35 +0000 |
4269 | @@ -5,9 +5,8 @@ |
4270 | #!!! notice !!! |
4271 | # Any small change to this file in the main branch |
4272 | # should be done or reviewed by the maintainer! |
4273 | -diff -ruN /dev/null b/patch_info/log_warnings_suppress.patch |
4274 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4275 | -+++ b/patch_info/log_warnings_suppress.patch 2011-04-09 18:48:59.000000000 +0400 |
4276 | +--- /dev/null |
4277 | ++++ b/patch_info/log_warnings_suppress.patch |
4278 | @@ -0,0 +1,9 @@ |
4279 | +File=log_warnings_suppress.patch |
4280 | +Name=Disable log warnings for enumerated warnings (old name:suppress_log_warning_1592.patch) |
4281 | @@ -18,9 +17,8 @@ |
4282 | +Changelog |
4283 | +2011-01-05 rename patch suppress_log_warning_1592.patch to log_warnings_silence.patch. Also remove boolean system variable "suppress_log_warning_1592" and add set varbile "log_warnings_silence" (possible values: 1592) |
4284 | +2011-02-21 rename patch log_warning_silence.patch to log_warnings_suppress.patch. Also rename variable "log_warning_silence" to "log_warning_suppress". |
4285 | -diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc |
4286 | ---- a/sql/mysqld.cc 2011-04-09 18:48:59.000000000 +0400 |
4287 | -+++ b/sql/mysqld.cc 2011-04-09 18:48:59.000000000 +0400 |
4288 | +--- a/sql/mysqld.cc |
4289 | ++++ b/sql/mysqld.cc |
4290 | @@ -623,6 +623,8 @@ |
4291 | SHOW_COMP_OPTION have_crypt, have_compress; |
4292 | SHOW_COMP_OPTION have_profiling; |
4293 | @@ -30,9 +28,8 @@ |
4294 | /* Thread specific variables */ |
4295 | |
4296 | pthread_key(MEM_ROOT**,THR_MALLOC); |
4297 | -diff -ruN a/sql/mysqld.h b/sql/mysqld.h |
4298 | ---- a/sql/mysqld.h 2011-04-09 18:48:58.000000000 +0400 |
4299 | -+++ b/sql/mysqld.h 2011-04-09 18:48:59.000000000 +0400 |
4300 | +--- a/sql/mysqld.h |
4301 | ++++ b/sql/mysqld.h |
4302 | @@ -228,6 +228,8 @@ |
4303 | extern TYPELIB thread_handling_typelib; |
4304 | extern my_decimal decimal_zero; |
4305 | @@ -42,10 +39,9 @@ |
4306 | extern pthread_key(MEM_ROOT**,THR_MALLOC); |
4307 | |
4308 | #ifdef HAVE_PSI_INTERFACE |
4309 | -diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc |
4310 | ---- a/sql/sql_class.cc 2011-04-09 18:48:50.000000000 +0400 |
4311 | -+++ b/sql/sql_class.cc 2011-04-09 18:48:59.000000000 +0400 |
4312 | -@@ -4575,7 +4575,7 @@ |
4313 | +--- a/sql/sql_class.cc |
4314 | ++++ b/sql/sql_class.cc |
4315 | +@@ -4578,7 +4578,7 @@ |
4316 | ER_BINLOG_UNSAFE_STATEMENT, |
4317 | ER(ER_BINLOG_UNSAFE_STATEMENT), |
4318 | ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type])); |
4319 | @@ -54,9 +50,8 @@ |
4320 | { |
4321 | char buf[MYSQL_ERRMSG_SIZE * 2]; |
4322 | sprintf(buf, ER(ER_BINLOG_UNSAFE_STATEMENT), |
4323 | -diff -ruN a/sql/sql_class.h b/sql/sql_class.h |
4324 | ---- a/sql/sql_class.h 2011-04-09 18:48:53.000000000 +0400 |
4325 | -+++ b/sql/sql_class.h 2011-04-09 18:48:59.000000000 +0400 |
4326 | +--- a/sql/sql_class.h |
4327 | ++++ b/sql/sql_class.h |
4328 | @@ -90,6 +90,7 @@ |
4329 | SLOG_F_TMP_TABLE, SLOG_F_TMP_DISK, SLOG_F_FILESORT, |
4330 | SLOG_F_FILESORT_DISK |
4331 | @@ -65,9 +60,8 @@ |
4332 | enum enum_slave_exec_mode { SLAVE_EXEC_MODE_STRICT, |
4333 | SLAVE_EXEC_MODE_IDEMPOTENT, |
4334 | SLAVE_EXEC_MODE_LAST_BIT}; |
4335 | -diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc |
4336 | ---- a/sql/sys_vars.cc 2011-04-09 18:48:55.000000000 +0400 |
4337 | -+++ b/sql/sys_vars.cc 2011-04-09 18:48:59.000000000 +0400 |
4338 | +--- a/sql/sys_vars.cc |
4339 | ++++ b/sql/sys_vars.cc |
4340 | @@ -1470,6 +1470,15 @@ |
4341 | READ_ONLY GLOBAL_VAR(mysqld_port), CMD_LINE(REQUIRED_ARG, 'P'), |
4342 | VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1)); |
4343 | |
4344 | === modified file 'patches/microsec_process.patch' |
4345 | --- patches/microsec_process.patch 2011-07-22 16:56:42 +0000 |
4346 | +++ patches/microsec_process.patch 2011-07-27 11:32:35 +0000 |
4347 | @@ -5,9 +5,8 @@ |
4348 | #!!! notice !!! |
4349 | # Any small change to this file in the main branch |
4350 | # should be done or reviewed by the maintainer! |
4351 | -diff -ruN /dev/null b/patch_info/microsec_process.info |
4352 | ---- /dev/null 1970-01-01 09:00:00.000000000 +0900 |
4353 | -+++ b/patch_info/microsec_process.info 2010-12-02 20:41:41.616069579 +0900 |
4354 | +--- /dev/null |
4355 | ++++ b/patch_info/microsec_process.info |
4356 | @@ -0,0 +1,8 @@ |
4357 | +File=microsec_process.patch |
4358 | +Name=Adds INFOMATION_SCHEMA.PROCESSLIST with TIME_MS column |
4359 | @@ -17,9 +16,8 @@ |
4360 | +Comment= |
4361 | +2010-01 |
4362 | +Ported to 5.1.42 |
4363 | -diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc |
4364 | ---- a/sql/sql_show.cc 2010-12-02 19:22:40.054024541 +0900 |
4365 | -+++ b/sql/sql_show.cc 2010-12-02 20:41:41.622941425 +0900 |
4366 | +--- a/sql/sql_show.cc |
4367 | ++++ b/sql/sql_show.cc |
4368 | @@ -1890,7 +1890,8 @@ |
4369 | TABLE *table= tables->table; |
4370 | CHARSET_INFO *cs= system_charset_info; |
4371 | |
4372 | === modified file 'patches/mysql-test.diff' |
4373 | --- patches/mysql-test.diff 2011-07-22 16:56:42 +0000 |
4374 | +++ patches/mysql-test.diff 2011-07-27 11:32:35 +0000 |
4375 | @@ -1,6 +1,5 @@ |
4376 | -diff -ruN a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf |
4377 | ---- a/mysql-test/include/default_mysqld.cnf 2011-04-09 18:48:03.000000000 +0400 |
4378 | -+++ b/mysql-test/include/default_mysqld.cnf 2011-04-09 18:49:05.000000000 +0400 |
4379 | +--- a/mysql-test/include/default_mysqld.cnf |
4380 | ++++ b/mysql-test/include/default_mysqld.cnf |
4381 | @@ -29,7 +29,7 @@ |
4382 | max_heap_table_size= 1M |
4383 | |
4384 | @@ -10,9 +9,8 @@ |
4385 | loose-innodb_write_io_threads= 2 |
4386 | loose-innodb_read_io_threads= 2 |
4387 | loose-innodb_log_buffer_size= 1M |
4388 | -diff -ruN a/mysql-test/r/connect.result b/mysql-test/r/connect.result |
4389 | ---- a/mysql-test/r/connect.result 2011-04-09 18:48:03.000000000 +0400 |
4390 | -+++ b/mysql-test/r/connect.result 2011-04-09 18:49:05.000000000 +0400 |
4391 | +--- a/mysql-test/r/connect.result |
4392 | ++++ b/mysql-test/r/connect.result |
4393 | @@ -1,3 +1,4 @@ |
4394 | +set global log_warnings=0; |
4395 | drop table if exists t1,t2; |
4396 | @@ -23,9 +21,8 @@ |
4397 | # -- End of 5.1 tests |
4398 | # ------------------------------------------------------------------ |
4399 | +set global log_warnings=1; |
4400 | -diff -ruN a/mysql-test/r/create.result b/mysql-test/r/create.result |
4401 | ---- a/mysql-test/r/create.result 2011-04-09 18:48:03.000000000 +0400 |
4402 | -+++ b/mysql-test/r/create.result 2011-04-09 18:49:05.000000000 +0400 |
4403 | +--- a/mysql-test/r/create.result |
4404 | ++++ b/mysql-test/r/create.result |
4405 | @@ -1741,7 +1741,11 @@ |
4406 | `COMMAND` varchar(16) NOT NULL DEFAULT '', |
4407 | `TIME` int(7) NOT NULL DEFAULT '0', |
4408 | @@ -52,9 +49,8 @@ |
4409 | ) ENGINE=MyISAM DEFAULT CHARSET=utf8 |
4410 | drop table t1; |
4411 | create table t1 like information_schema.character_sets; |
4412 | -diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result |
4413 | ---- a/mysql-test/r/information_schema.result 2011-04-09 18:48:03.000000000 +0400 |
4414 | -+++ b/mysql-test/r/information_schema.result 2011-04-09 18:49:05.000000000 +0400 |
4415 | +--- a/mysql-test/r/information_schema.result |
4416 | ++++ b/mysql-test/r/information_schema.result |
4417 | @@ -46,14 +46,17 @@ |
4418 | select * from v1; |
4419 | c |
4420 | @@ -266,9 +262,8 @@ |
4421 | VIEWS information_schema.VIEWS 1 |
4422 | create table t1(f1 int); |
4423 | create view v1 as select f1+1 as a from t1; |
4424 | -diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result |
4425 | ---- a/mysql-test/r/information_schema_db.result 2011-04-09 18:48:03.000000000 +0400 |
4426 | -+++ b/mysql-test/r/information_schema_db.result 2011-04-09 18:49:05.000000000 +0400 |
4427 | +--- a/mysql-test/r/information_schema_db.result |
4428 | ++++ b/mysql-test/r/information_schema_db.result |
4429 | @@ -6,14 +6,17 @@ |
4430 | show tables where Tables_in_information_schema NOT LIKE 'Innodb%'; |
4431 | Tables_in_information_schema |
4432 | @@ -319,9 +314,8 @@ |
4433 | TRIGGERS |
4434 | create database `inf%`; |
4435 | create database mbase; |
4436 | -diff -ruN a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result |
4437 | ---- a/mysql-test/r/mysqld--help-notwin.result 2011-04-09 18:48:03.000000000 +0400 |
4438 | -+++ b/mysql-test/r/mysqld--help-notwin.result 2011-04-09 18:49:05.000000000 +0400 |
4439 | +--- a/mysql-test/r/mysqld--help-notwin.result |
4440 | ++++ b/mysql-test/r/mysqld--help-notwin.result |
4441 | @@ -250,21 +250,40 @@ |
4442 | --log-slow-admin-statements |
4443 | Log slow OPTIMIZE, ANALYZE, ALTER and other |
4444 | @@ -493,9 +487,8 @@ |
4445 | |
4446 | To see what values a running MySQL server is using, type |
4447 | 'mysqladmin variables' instead of 'mysqld --verbose --help'. |
4448 | -diff -ruN a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result |
4449 | ---- a/mysql-test/r/mysqldump.result 2011-04-09 18:48:03.000000000 +0400 |
4450 | -+++ b/mysql-test/r/mysqldump.result 2011-04-09 18:49:05.000000000 +0400 |
4451 | +--- a/mysql-test/r/mysqldump.result |
4452 | ++++ b/mysql-test/r/mysqldump.result |
4453 | @@ -1832,7 +1832,7 @@ |
4454 | # Bug#21288 mysqldump segmentation fault when using --where |
4455 | # |
4456 | @@ -505,9 +498,8 @@ |
4457 | mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server |
4458 | |
4459 | /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; |
4460 | -diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result |
4461 | ---- a/mysql-test/r/mysqlshow.result 2011-04-09 18:48:03.000000000 +0400 |
4462 | -+++ b/mysql-test/r/mysqlshow.result 2011-04-09 18:49:05.000000000 +0400 |
4463 | +--- a/mysql-test/r/mysqlshow.result |
4464 | ++++ b/mysql-test/r/mysqlshow.result |
4465 | @@ -80,14 +80,17 @@ |
4466 | | Tables | |
4467 | +---------------------------------------+ |
4468 | @@ -639,9 +631,8 @@ |
4469 | +---------------------------------------+ |
4470 | Wildcard: inf_rmation_schema |
4471 | +--------------------+ |
4472 | -diff -ruN a/mysql-test/r/select.result b/mysql-test/r/select.result |
4473 | ---- a/mysql-test/r/select.result 2011-04-09 18:48:03.000000000 +0400 |
4474 | -+++ b/mysql-test/r/select.result 2011-04-09 18:49:05.000000000 +0400 |
4475 | +--- a/mysql-test/r/select.result |
4476 | ++++ b/mysql-test/r/select.result |
4477 | @@ -2196,10 +2196,10 @@ |
4478 | select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1; |
4479 | a a |
4480 | @@ -655,9 +646,8 @@ |
4481 | 3 3 |
4482 | select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1; |
4483 | a a |
4484 | -diff -ruN a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result |
4485 | ---- a/mysql-test/r/show_check.result 2011-04-09 18:48:03.000000000 +0400 |
4486 | -+++ b/mysql-test/r/show_check.result 2011-04-09 18:49:05.000000000 +0400 |
4487 | +--- a/mysql-test/r/show_check.result |
4488 | ++++ b/mysql-test/r/show_check.result |
4489 | @@ -1538,14 +1538,14 @@ |
4490 | SET NAMES latin1; |
4491 | SELECT GET_LOCK('t',1000) AS 'óóóó';; |
4492 | @@ -679,9 +669,8 @@ |
4493 | SELECT RELEASE_LOCK('t'); |
4494 | RELEASE_LOCK('t') |
4495 | 1 |
4496 | -diff -ruN a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result |
4497 | ---- a/mysql-test/r/sp-threads.result 2011-04-09 18:48:03.000000000 +0400 |
4498 | -+++ b/mysql-test/r/sp-threads.result 2011-04-09 18:49:05.000000000 +0400 |
4499 | +--- a/mysql-test/r/sp-threads.result |
4500 | ++++ b/mysql-test/r/sp-threads.result |
4501 | @@ -33,11 +33,11 @@ |
4502 | lock tables t2 write; |
4503 | call bug9486(); |
4504 | @@ -699,9 +688,8 @@ |
4505 | unlock tables; |
4506 | drop procedure bug9486; |
4507 | drop table t1, t2; |
4508 | -diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result |
4509 | ---- a/mysql-test/suite/innodb/r/innodb.result 2011-04-09 18:49:04.000000000 +0400 |
4510 | -+++ b/mysql-test/suite/innodb/r/innodb.result 2011-04-09 18:49:05.000000000 +0400 |
4511 | +--- a/mysql-test/suite/innodb/r/innodb.result |
4512 | ++++ b/mysql-test/suite/innodb/r/innodb.result |
4513 | @@ -1664,7 +1664,7 @@ |
4514 | drop table t1; |
4515 | SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; |
4516 | @@ -711,9 +699,8 @@ |
4517 | SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; |
4518 | variable_value |
4519 | 16384 |
4520 | -diff -ruN a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result |
4521 | ---- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 2011-04-09 18:48:03.000000000 +0400 |
4522 | -+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4523 | +--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result |
4524 | ++++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result |
4525 | @@ -10,7 +10,6 @@ |
4526 | 1 |
4527 | '#---------------------FN_DYNVARS_046_02-------------------------#' |
4528 | @@ -722,9 +709,8 @@ |
4529 | SELECT @@innodb_flush_log_at_trx_commit; |
4530 | @@innodb_flush_log_at_trx_commit |
4531 | 1 |
4532 | -diff -ruN a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test |
4533 | ---- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 2011-04-09 18:48:03.000000000 +0400 |
4534 | -+++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test 2011-04-09 18:49:05.000000000 +0400 |
4535 | +--- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test |
4536 | ++++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test |
4537 | @@ -56,7 +56,7 @@ |
4538 | # Check if variable can be accessed with and without @@ sign # |
4539 | ############################################################################### |
4540 | @@ -734,9 +720,8 @@ |
4541 | SET innodb_flush_log_at_trx_commit = 1; |
4542 | SELECT @@innodb_flush_log_at_trx_commit; |
4543 | |
4544 | -diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test |
4545 | ---- a/mysql-test/t/connect.test 2011-04-09 18:48:03.000000000 +0400 |
4546 | -+++ b/mysql-test/t/connect.test 2011-04-09 18:49:05.000000000 +0400 |
4547 | +--- a/mysql-test/t/connect.test |
4548 | ++++ b/mysql-test/t/connect.test |
4549 | @@ -1,3 +1,5 @@ |
4550 | +set global log_warnings=0; |
4551 | + |
4552 | @@ -748,9 +733,8 @@ |
4553 | --source include/wait_until_count_sessions.inc |
4554 | |
4555 | +set global log_warnings=1; |
4556 | -diff -ruN a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test |
4557 | ---- a/mysql-test/t/show_check.test 2011-04-09 18:48:03.000000000 +0400 |
4558 | -+++ b/mysql-test/t/show_check.test 2011-04-09 18:49:05.000000000 +0400 |
4559 | +--- a/mysql-test/t/show_check.test |
4560 | ++++ b/mysql-test/t/show_check.test |
4561 | @@ -1376,10 +1376,10 @@ |
4562 | let $wait_timeout= 10; |
4563 | let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID(); |
4564 | @@ -764,9 +748,8 @@ |
4565 | SHOW PROCESSLIST; |
4566 | SELECT RELEASE_LOCK('t'); |
4567 | --connection con1 |
4568 | -diff -ruN a/mysql-test/t/sp-threads.test b/mysql-test/t/sp-threads.test |
4569 | ---- a/mysql-test/t/sp-threads.test 2011-04-09 18:48:03.000000000 +0400 |
4570 | -+++ b/mysql-test/t/sp-threads.test 2011-04-09 18:49:05.000000000 +0400 |
4571 | +--- a/mysql-test/t/sp-threads.test |
4572 | ++++ b/mysql-test/t/sp-threads.test |
4573 | @@ -81,7 +81,7 @@ |
4574 | connection con2root; |
4575 | --sleep 2 |
4576 | @@ -776,509 +759,426 @@ |
4577 | show processlist; |
4578 | unlock tables; |
4579 | connection con1root; |
4580 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result |
4581 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4582 | -+++ b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4583 | +--- /dev/null |
4584 | ++++ b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result |
4585 | @@ -0,0 +1,3 @@ |
4586 | +SELECT @@global.log_slow_sp_statements; |
4587 | +@@global.log_slow_sp_statements |
4588 | +1 |
4589 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test |
4590 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4591 | -+++ b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test 2011-04-09 18:49:05.000000000 +0400 |
4592 | +--- /dev/null |
4593 | ++++ b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test |
4594 | @@ -0,0 +1 @@ |
4595 | +SELECT @@global.log_slow_sp_statements; |
4596 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result |
4597 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4598 | -+++ b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4599 | +--- /dev/null |
4600 | ++++ b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result |
4601 | @@ -0,0 +1,3 @@ |
4602 | +SELECT @@global.fast_index_creation; |
4603 | +@@global.fast_index_creation |
4604 | +1 |
4605 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result |
4606 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4607 | -+++ b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4608 | +--- /dev/null |
4609 | ++++ b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result |
4610 | @@ -0,0 +1,3 @@ |
4611 | +SELECT @@global.have_response_time_distribution; |
4612 | +@@global.have_response_time_distribution |
4613 | +YES |
4614 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result |
4615 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4616 | -+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4617 | +--- /dev/null |
4618 | ++++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result |
4619 | @@ -0,0 +1,3 @@ |
4620 | +SELECT @@global.innodb_adaptive_flushing_method; |
4621 | +@@global.innodb_adaptive_flushing_method |
4622 | +estimate |
4623 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result |
4624 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4625 | -+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4626 | +--- /dev/null |
4627 | ++++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result |
4628 | @@ -0,0 +1,3 @@ |
4629 | +SELECT @@global.innodb_adaptive_hash_index_partitions; |
4630 | +@@global.innodb_adaptive_hash_index_partitions |
4631 | +1 |
4632 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result |
4633 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4634 | -+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4635 | +--- /dev/null |
4636 | ++++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result |
4637 | @@ -0,0 +1,3 @@ |
4638 | +SELECT @@global.innodb_buffer_pool_restore_at_startup; |
4639 | +@@global.innodb_buffer_pool_restore_at_startup |
4640 | +0 |
4641 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result |
4642 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4643 | -+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4644 | +--- /dev/null |
4645 | ++++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result |
4646 | @@ -0,0 +1,3 @@ |
4647 | +SELECT @@global.innodb_buffer_pool_shm_checksum; |
4648 | +@@global.innodb_buffer_pool_shm_checksum |
4649 | +1 |
4650 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result |
4651 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4652 | -+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4653 | +--- /dev/null |
4654 | ++++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result |
4655 | @@ -0,0 +1,3 @@ |
4656 | +SELECT @@global.innodb_buffer_pool_shm_key; |
4657 | +@@global.innodb_buffer_pool_shm_key |
4658 | +0 |
4659 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result |
4660 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4661 | -+++ b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4662 | +--- /dev/null |
4663 | ++++ b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result |
4664 | @@ -0,0 +1,3 @@ |
4665 | +SELECT @@global.innodb_checkpoint_age_target; |
4666 | +@@global.innodb_checkpoint_age_target |
4667 | +0 |
4668 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result |
4669 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4670 | -+++ b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4671 | +--- /dev/null |
4672 | ++++ b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result |
4673 | @@ -0,0 +1,3 @@ |
4674 | +SELECT @@global.innodb_corrupt_table_action; |
4675 | +@@global.innodb_corrupt_table_action |
4676 | +assert |
4677 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result |
4678 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4679 | -+++ b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4680 | +--- /dev/null |
4681 | ++++ b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result |
4682 | @@ -0,0 +1,3 @@ |
4683 | +SELECT @@global.innodb_dict_size_limit; |
4684 | +@@global.innodb_dict_size_limit |
4685 | +0 |
4686 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result |
4687 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4688 | -+++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4689 | +--- /dev/null |
4690 | ++++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result |
4691 | @@ -0,0 +1,3 @@ |
4692 | +SELECT @@global.innodb_doublewrite_file; |
4693 | +@@global.innodb_doublewrite_file |
4694 | +NULL |
4695 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result |
4696 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4697 | -+++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4698 | +--- /dev/null |
4699 | ++++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result |
4700 | @@ -0,0 +1,3 @@ |
4701 | +SELECT @@global.innodb_fast_checksum; |
4702 | +@@global.innodb_fast_checksum |
4703 | +0 |
4704 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result |
4705 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4706 | -+++ b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4707 | +--- /dev/null |
4708 | ++++ b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result |
4709 | @@ -0,0 +1,3 @@ |
4710 | +SELECT @@global.innodb_flush_neighbor_pages; |
4711 | +@@global.innodb_flush_neighbor_pages |
4712 | +1 |
4713 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result |
4714 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4715 | -+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4716 | +--- /dev/null |
4717 | ++++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result |
4718 | @@ -0,0 +1,3 @@ |
4719 | +SELECT @@global.innodb_ibuf_accel_rate; |
4720 | +@@global.innodb_ibuf_accel_rate |
4721 | +100 |
4722 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result |
4723 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4724 | -+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4725 | +--- /dev/null |
4726 | ++++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result |
4727 | @@ -0,0 +1,3 @@ |
4728 | +SELECT @@global.innodb_ibuf_active_contract; |
4729 | +@@global.innodb_ibuf_active_contract |
4730 | +1 |
4731 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result |
4732 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4733 | -+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4734 | +--- /dev/null |
4735 | ++++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result |
4736 | @@ -0,0 +1,3 @@ |
4737 | +SELECT @@global.innodb_ibuf_max_size; |
4738 | +@@global.innodb_ibuf_max_size |
4739 | +16760832 |
4740 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result |
4741 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4742 | -+++ b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4743 | +--- /dev/null |
4744 | ++++ b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result |
4745 | @@ -0,0 +1,3 @@ |
4746 | +SELECT @@global.innodb_import_table_from_xtrabackup; |
4747 | +@@global.innodb_import_table_from_xtrabackup |
4748 | +0 |
4749 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result |
4750 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4751 | -+++ b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4752 | +--- /dev/null |
4753 | ++++ b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result |
4754 | @@ -0,0 +1,3 @@ |
4755 | +SELECT @@global.innodb_lazy_drop_table; |
4756 | +@@global.innodb_lazy_drop_table |
4757 | +0 |
4758 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result |
4759 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4760 | -+++ b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4761 | +--- /dev/null |
4762 | ++++ b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result |
4763 | @@ -0,0 +1,3 @@ |
4764 | +SELECT @@global.innodb_log_block_size; |
4765 | +@@global.innodb_log_block_size |
4766 | +512 |
4767 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result |
4768 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4769 | -+++ b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4770 | +--- /dev/null |
4771 | ++++ b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result |
4772 | @@ -0,0 +1,3 @@ |
4773 | +SELECT @@global.innodb_page_size; |
4774 | +@@global.innodb_page_size |
4775 | +16384 |
4776 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result |
4777 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4778 | -+++ b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4779 | +--- /dev/null |
4780 | ++++ b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result |
4781 | @@ -0,0 +1,3 @@ |
4782 | +SELECT @@global.innodb_read_ahead; |
4783 | +@@global.innodb_read_ahead |
4784 | +linear |
4785 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result |
4786 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4787 | -+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4788 | +--- /dev/null |
4789 | ++++ b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result |
4790 | @@ -0,0 +1,3 @@ |
4791 | +SELECT @@global.innodb_recovery_stats; |
4792 | +@@global.innodb_recovery_stats |
4793 | +0 |
4794 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result |
4795 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4796 | -+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4797 | +--- /dev/null |
4798 | ++++ b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result |
4799 | @@ -0,0 +1,3 @@ |
4800 | +SELECT @@global.innodb_recovery_update_relay_log; |
4801 | +@@global.innodb_recovery_update_relay_log |
4802 | +0 |
4803 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result |
4804 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4805 | -+++ b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4806 | +--- /dev/null |
4807 | ++++ b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result |
4808 | @@ -0,0 +1,3 @@ |
4809 | +SELECT @@global.innodb_show_locks_held; |
4810 | +@@global.innodb_show_locks_held |
4811 | +10 |
4812 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result |
4813 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4814 | -+++ b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4815 | +--- /dev/null |
4816 | ++++ b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result |
4817 | @@ -0,0 +1,3 @@ |
4818 | +SELECT @@global.innodb_show_verbose_locks; |
4819 | +@@global.innodb_show_verbose_locks |
4820 | +0 |
4821 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result |
4822 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4823 | -+++ b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4824 | +--- /dev/null |
4825 | ++++ b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result |
4826 | @@ -0,0 +1,3 @@ |
4827 | +SELECT @@global.innodb_stats_auto_update; |
4828 | +@@global.innodb_stats_auto_update |
4829 | +1 |
4830 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result |
4831 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4832 | -+++ b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4833 | +--- /dev/null |
4834 | ++++ b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result |
4835 | @@ -0,0 +1,3 @@ |
4836 | +SELECT @@global.innodb_stats_update_need_lock; |
4837 | +@@global.innodb_stats_update_need_lock |
4838 | +1 |
4839 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result |
4840 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4841 | -+++ b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4842 | +--- /dev/null |
4843 | ++++ b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result |
4844 | @@ -0,0 +1,3 @@ |
4845 | +SELECT @@global.innodb_thread_concurrency_timer_based; |
4846 | +@@global.innodb_thread_concurrency_timer_based |
4847 | +0 |
4848 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result |
4849 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4850 | -+++ b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4851 | +--- /dev/null |
4852 | ++++ b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result |
4853 | @@ -0,0 +1,3 @@ |
4854 | +SELECT @@global.innodb_use_global_flush_log_at_trx_commit; |
4855 | +@@global.innodb_use_global_flush_log_at_trx_commit |
4856 | +1 |
4857 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result |
4858 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4859 | -+++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4860 | +--- /dev/null |
4861 | ++++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result |
4862 | @@ -0,0 +1,3 @@ |
4863 | +SELECT @@global.innodb_use_sys_stats_table; |
4864 | +@@global.innodb_use_sys_stats_table |
4865 | +0 |
4866 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result |
4867 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4868 | -+++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4869 | +--- /dev/null |
4870 | ++++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result |
4871 | @@ -0,0 +1,3 @@ |
4872 | +SELECT @@global.log_slow_filter; |
4873 | +@@global.log_slow_filter |
4874 | + |
4875 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result |
4876 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4877 | -+++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4878 | +--- /dev/null |
4879 | ++++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result |
4880 | @@ -0,0 +1,3 @@ |
4881 | +SELECT @@global.log_slow_rate_limit; |
4882 | +@@global.log_slow_rate_limit |
4883 | +1 |
4884 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result |
4885 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4886 | -+++ b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4887 | +--- /dev/null |
4888 | ++++ b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result |
4889 | @@ -0,0 +1,3 @@ |
4890 | +SELECT @@global.log_slow_slave_statements; |
4891 | +@@global.log_slow_slave_statements |
4892 | +0 |
4893 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result |
4894 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4895 | -+++ b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4896 | +--- /dev/null |
4897 | ++++ b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result |
4898 | @@ -0,0 +1,3 @@ |
4899 | +SELECT @@global.log_slow_verbosity; |
4900 | +@@global.log_slow_verbosity |
4901 | + |
4902 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result |
4903 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4904 | -+++ b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4905 | +--- /dev/null |
4906 | ++++ b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result |
4907 | @@ -0,0 +1,3 @@ |
4908 | +SELECT @@global.log_warnings_suppress; |
4909 | +@@global.log_warnings_suppress |
4910 | + |
4911 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result |
4912 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4913 | -+++ b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4914 | +--- /dev/null |
4915 | ++++ b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result |
4916 | @@ -0,0 +1,3 @@ |
4917 | +SELECT @@global.optimizer_fix; |
4918 | +@@global.optimizer_fix |
4919 | +1 |
4920 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result |
4921 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4922 | -+++ b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4923 | +--- /dev/null |
4924 | ++++ b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result |
4925 | @@ -0,0 +1,3 @@ |
4926 | +SELECT @@global.query_cache_strip_comments; |
4927 | +@@global.query_cache_strip_comments |
4928 | +0 |
4929 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result |
4930 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4931 | -+++ b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4932 | +--- /dev/null |
4933 | ++++ b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result |
4934 | @@ -0,0 +1,3 @@ |
4935 | +SELECT @@global.query_response_time_range_base; |
4936 | +@@global.query_response_time_range_base |
4937 | +10 |
4938 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result |
4939 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4940 | -+++ b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4941 | +--- /dev/null |
4942 | ++++ b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result |
4943 | @@ -0,0 +1,3 @@ |
4944 | +SELECT @@global.query_response_time_stats; |
4945 | +@@global.query_response_time_stats |
4946 | +0 |
4947 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result |
4948 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4949 | -+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4950 | +--- /dev/null |
4951 | ++++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result |
4952 | @@ -0,0 +1,3 @@ |
4953 | +SELECT @@global.slow_query_log_timestamp_always; |
4954 | +@@global.slow_query_log_timestamp_always |
4955 | +0 |
4956 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result |
4957 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4958 | -+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4959 | +--- /dev/null |
4960 | ++++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result |
4961 | @@ -0,0 +1,3 @@ |
4962 | +SELECT @@global.slow_query_log_timestamp_precision; |
4963 | +@@global.slow_query_log_timestamp_precision |
4964 | +second |
4965 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result |
4966 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4967 | -+++ b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4968 | +--- /dev/null |
4969 | ++++ b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result |
4970 | @@ -0,0 +1,3 @@ |
4971 | +SELECT @@global.slow_query_log_use_global_control; |
4972 | +@@global.slow_query_log_use_global_control |
4973 | + |
4974 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result |
4975 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4976 | -+++ b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4977 | +--- /dev/null |
4978 | ++++ b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result |
4979 | @@ -0,0 +1,3 @@ |
4980 | +SELECT @@global.thread_statistics; |
4981 | +@@global.thread_statistics |
4982 | +0 |
4983 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/userstat_basic.result |
4984 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4985 | -+++ b/mysql-test/suite/sys_vars/r/userstat_basic.result 2011-04-09 18:49:05.000000000 +0400 |
4986 | +--- /dev/null |
4987 | ++++ b/mysql-test/suite/sys_vars/r/userstat_basic.result |
4988 | @@ -0,0 +1,3 @@ |
4989 | +SELECT @@global.userstat; |
4990 | +@@global.userstat |
4991 | +0 |
4992 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test |
4993 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
4994 | -+++ b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test 2011-04-09 18:49:05.000000000 +0400 |
4995 | +--- /dev/null |
4996 | ++++ b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test |
4997 | @@ -0,0 +1 @@ |
4998 | +SELECT @@global.fast_index_creation; |
4999 | -diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/have_response_time_distribution_basic.test |
5000 | ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
I checked correctness by following way:
rm -rf a b Server- 5.5.13- rel20.4 a Server- 5.5.13- rel20.4 b
bzr update -r 143
make clean && make all && mv Percona-
bzr update -r 144
make clean && make all && mv Percona-
diff -ruN a b # nothing to output