Merge lp:~laurynas-biveinis/percona-server/fake-changes-from-fb-5.6 into lp:percona-server/5.6
- fake-changes-from-fb-5.6
- Merge into 5.6
Status: | Merged |
---|---|
Approved by: | Stewart Smith |
Approved revision: | no longer in the source branch. |
Merged at revision: | 479 |
Proposed branch: | lp:~laurynas-biveinis/percona-server/fake-changes-from-fb-5.6 |
Merge into: | lp:percona-server/5.6 |
Prerequisite: | lp:~laurynas-biveinis/percona-server/fake-changes-binlog-5.6 |
Diff against target: |
2012 lines (+1268/-191) 17 files modified
Percona-Server/mysql-test/include/start_fake_changes.inc (+37/-0) Percona-Server/mysql-test/include/stop_fake_changes.inc (+34/-0) Percona-Server/mysql-test/r/percona_innodb_fake_changes.result (+606/-43) Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result (+58/-3) Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result (+154/-0) Percona-Server/mysql-test/t/percona_innodb_fake_changes.test (+303/-76) Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test (+10/-4) Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test (+16/-24) Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test (+1/-0) Percona-Server/sql/handler.cc (+1/-1) Percona-Server/sql/sql_insert.cc (+1/-1) Percona-Server/storage/innobase/btr/btr0cur.cc (+19/-16) Percona-Server/storage/innobase/handler/ha_innodb.cc (+11/-9) Percona-Server/storage/innobase/lock/lock0lock.cc (+4/-4) Percona-Server/storage/innobase/que/que0que.cc (+1/-1) Percona-Server/storage/innobase/row/row0ins.cc (+3/-2) Percona-Server/storage/innobase/row/row0upd.cc (+9/-7) |
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/fake-changes-from-fb-5.6 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stewart Smith (community) | Approve | ||
Vlad Lesin (community) | g2 | Approve | |
Laurynas Biveinis | Pending | ||
Review via email: mp+177312@code.launchpad.net |
This proposal supersedes a proposal from 2013-07-17.
Commit message
Description of the change
No BT or ST but BT 20439 prerequisite.
4th MP:
Re-merged from 5.5.
http://
3rd MP:
http://
Re-merged from 5.5.
2nd MP:
http://
1st MP:
http://
Merge bug 1190604 fix from 5.5.
Merge bug 1200162 changes from 5.5.
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
The 5.5 review comment re. redundant thr checks does not apply here, it's still reviewable.
Sergei Glushchenko (sergei.glushchenko) wrote : Posted in a previous version of this proposal | # |
Layrynas,
I think I see some places
btr0cur.cc line 2397, btr_cur_
lock0lock.cc line 6162, lock_clust_
lock0lock.cc line 6228, lock_sec_
que0que.cc line 6228, que_eval_sql
also, regardless this MP, there is
btr0cur.cc line 1394 -- double check of
ut_ad((thr && thr_get_
|| mtr_memo_
Sergei Glushchenko (sergei.glushchenko) wrote : Posted in a previous version of this proposal | # |
Laurynas, sorry for misspelling
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
Sergei -
> btr0cur.cc line 2397, btr_cur_
> lock0lock.cc line 6162, lock_clust_
> lock0lock.cc line 6228, lock_sec_
> que0que.cc line 6228, que_eval_sql
I reviewed them yesterday. Please show how each of them guarantees thr != NULL, because I was not able to prove that.
> btr0cur.cc line 1394 -- double check of
> ut_ad((thr && thr_get_
> || mtr_memo_
Yup, bug 1204443.
Sergei Glushchenko (sergei.glushchenko) wrote : Posted in a previous version of this proposal | # |
thr_get_trx expects that thr is NULL
btr0cur.cc line 2397, btr_cur_
line 2260:
ut_ad(thr_
|| (flags & ~(BTR_KEEP_POS_FLAG | BTR_KEEP_
== (BTR_NO_
| BTR_CREATE_FLAG | BTR_KEEP_
is either bug or thr should never be NULL here
lock0lock.cc line 6162, lock_clust_
line 6177:
ut_ad(lock_
lock0lock.cc line 6228, lock_sec_
line 6241:
ut_ad(lock_
que0que.cc line 6228, que_eval_sql
line 1294:
graph->trx = trx;
Sergei Glushchenko (sergei.glushchenko) wrote : Posted in a previous version of this proposal | # |
Nevermind of que0que.cc line 6228, que_eval_sql :)
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
> thr_get_trx expects that thr is NULL
(_not_ NULL)
You are right, thanks, I have reviewed and updated accordingly.
> btr0cur.cc line 2397, btr_cur_
>
> line 2260:
> ut_ad(thr_
> || (flags & ~(BTR_KEEP_POS_FLAG | BTR_KEEP_
> == (BTR_NO_
> | BTR_CREATE_FLAG | BTR_KEEP_
> is either bug or thr should never be NULL here
Vlad Lesin (vlad-lesin) : | # |
Vlad Lesin (vlad-lesin) wrote : | # |
Here is valid link to Jenkins testing: http://
Vlad Lesin (vlad-lesin) wrote : | # |
Stewart Smith (stewart) : | # |
Preview Diff
1 | === added file 'Percona-Server/mysql-test/include/start_fake_changes.inc' | |||
2 | --- Percona-Server/mysql-test/include/start_fake_changes.inc 1970-01-01 00:00:00 +0000 | |||
3 | +++ Percona-Server/mysql-test/include/start_fake_changes.inc 2013-10-17 08:14:49 +0000 | |||
4 | @@ -0,0 +1,37 @@ | |||
5 | 1 | # | ||
6 | 2 | # Include this file in a session before fake changes workload. It will enable | ||
7 | 3 | # the fake changes for the current session and save the relevant server state | ||
8 | 4 | # to variables that will be used by stop_fake_changes.inc that it didn't change. | ||
9 | 5 | # | ||
10 | 6 | # Since some of the state checked is global InnoDB counters, do not issue a | ||
11 | 7 | # non-fake-changes workload in parallel. | ||
12 | 8 | # | ||
13 | 9 | |||
14 | 10 | # Requires userstat | ||
15 | 11 | SELECT @@global.userstat = 1 AS should_be_1; | ||
16 | 12 | |||
17 | 13 | # Have up-to-date stats for the fake changes table, so that, if there is a | ||
18 | 14 | # non-fake-changes session running in parallel, it does not trigger an auto | ||
19 | 15 | # stat recalc which then fails these checks. | ||
20 | 16 | |||
21 | 17 | # Requires large index dive sample pages values | ||
22 | 18 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
23 | 19 | |||
24 | 20 | eval ANALYZE TABLE $fake_changes_table; | ||
25 | 21 | |||
26 | 22 | let $t_checksum_1= `CHECKSUM TABLE $fake_changes_table EXTENDED`; | ||
27 | 23 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
28 | 24 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
29 | 25 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
30 | 26 | eval SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/$fake_changes_table'; | ||
31 | 27 | eval SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table'; | ||
32 | 28 | eval SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table'; | ||
33 | 29 | eval SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/$fake_changes_table'; | ||
34 | 30 | |||
35 | 31 | # | ||
36 | 32 | # Index stats should not change, but it's only possible to inspect them | ||
37 | 33 | # manually. | ||
38 | 34 | # | ||
39 | 35 | eval SHOW INDEXES IN $fake_changes_table; | ||
40 | 36 | |||
41 | 37 | SET innodb_fake_changes=1; | ||
42 | 0 | 38 | ||
43 | === added file 'Percona-Server/mysql-test/include/stop_fake_changes.inc' | |||
44 | --- Percona-Server/mysql-test/include/stop_fake_changes.inc 1970-01-01 00:00:00 +0000 | |||
45 | +++ Percona-Server/mysql-test/include/stop_fake_changes.inc 2013-10-17 08:14:49 +0000 | |||
46 | @@ -0,0 +1,34 @@ | |||
47 | 1 | # | ||
48 | 2 | # Include this file in a session after fake changes workload. It will disable the fake | ||
49 | 3 | # changes and assert that the relevant server state has not changed from the one saved | ||
50 | 4 | # by a previous start_fake_changes.inc. | ||
51 | 5 | # | ||
52 | 6 | SET innodb_fake_changes=0; | ||
53 | 7 | |||
54 | 8 | eval CHECK TABLE $fake_changes_table; | ||
55 | 9 | |||
56 | 10 | let $t_checksum_2= `CHECKSUM TABLE $fake_changes_table EXTENDED`; | ||
57 | 11 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
58 | 12 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
59 | 13 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
60 | 14 | eval SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/$fake_changes_table'; | ||
61 | 15 | eval SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table'; | ||
62 | 16 | eval SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE '$fake_changes_table'; | ||
63 | 17 | eval SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/$fake_changes_table'; | ||
64 | 18 | |||
65 | 19 | --disable_query_log | ||
66 | 20 | eval SELECT "$t_checksum_1" LIKE "$t_checksum_2" AS should_be_1; | ||
67 | 21 | --enable_query_log | ||
68 | 22 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
69 | 23 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
70 | 24 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
71 | 25 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
72 | 26 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
73 | 27 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
74 | 28 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
75 | 29 | |||
76 | 30 | # | ||
77 | 31 | # Index stats should not change, but it's only possible to inspect them | ||
78 | 32 | # manually. | ||
79 | 33 | # | ||
80 | 34 | eval SHOW INDEXES IN $fake_changes_table; | ||
81 | 0 | 35 | ||
82 | === modified file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes.result' | |||
83 | --- Percona-Server/mysql-test/r/percona_innodb_fake_changes.result 2013-05-06 15:43:51 +0000 | |||
84 | +++ Percona-Server/mysql-test/r/percona_innodb_fake_changes.result 2013-10-17 08:14:49 +0000 | |||
85 | @@ -22,10 +22,28 @@ | |||
86 | 22 | OFF | 22 | OFF |
87 | 23 | # Explicit COMMIT should fail when innodb_fake_changes is enabled | 23 | # Explicit COMMIT should fail when innodb_fake_changes is enabled |
88 | 24 | # DML should be fine | 24 | # DML should be fine |
90 | 25 | SET @@GLOBAL.userstat= TRUE; | 25 | SET @@GLOBAL.userstat=TRUE; |
91 | 26 | SET @@GLOBAL.innodb_stats_transient_sample_pages=30000; | ||
92 | 26 | CREATE TABLE t1 (a INT) ENGINE=InnoDB; | 27 | CREATE TABLE t1 (a INT) ENGINE=InnoDB; |
93 | 27 | INSERT INTO t1 VALUES (1); | 28 | INSERT INTO t1 VALUES (1); |
95 | 28 | SET autocommit=0; | 29 | SELECT @@global.userstat = 1 AS should_be_1; |
96 | 30 | should_be_1 | ||
97 | 31 | 1 | ||
98 | 32 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
99 | 33 | should_be_1 | ||
100 | 34 | 1 | ||
101 | 35 | ANALYZE TABLE t1; | ||
102 | 36 | Table Op Msg_type Msg_text | ||
103 | 37 | test.t1 analyze status OK | ||
104 | 38 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
105 | 39 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
106 | 40 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
107 | 41 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
108 | 42 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
109 | 43 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
110 | 44 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
111 | 45 | SHOW INDEXES IN t1; | ||
112 | 46 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
113 | 29 | SET innodb_fake_changes=1; | 47 | SET innodb_fake_changes=1; |
114 | 30 | BEGIN; | 48 | BEGIN; |
115 | 31 | INSERT INTO t1 VALUES (2); | 49 | INSERT INTO t1 VALUES (2); |
116 | @@ -36,31 +54,449 @@ | |||
117 | 36 | 1 | 54 | 1 |
118 | 37 | COMMIT; | 55 | COMMIT; |
119 | 38 | ERROR HY000: Got error 131 during COMMIT | 56 | ERROR HY000: Got error 131 during COMMIT |
142 | 39 | SET innodb_fake_changes=default; | 57 | SET innodb_fake_changes=0; |
143 | 40 | # Verify that the fake changes to t1 did not leak through | 58 | CHECK TABLE t1; |
144 | 41 | CHECK TABLE t1; | 59 | Table Op Msg_type Msg_text |
145 | 42 | Table Op Msg_type Msg_text | 60 | test.t1 check status OK |
146 | 43 | test.t1 check status OK | 61 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; |
147 | 44 | should_be_1 | 62 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; |
148 | 45 | 1 | 63 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; |
149 | 46 | should_be_0 | 64 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; |
150 | 47 | 0 | 65 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; |
151 | 48 | should_be_0 | 66 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; |
152 | 49 | 0 | 67 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; |
153 | 50 | should_be_0 | 68 | should_be_1 |
154 | 51 | 0 | 69 | 1 |
155 | 52 | should_be_0 | 70 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; |
156 | 53 | 0 | 71 | should_be_0 |
157 | 54 | should_be_0 | 72 | 0 |
158 | 55 | 0 | 73 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; |
159 | 56 | should_be_0 | 74 | should_be_0 |
160 | 57 | 0 | 75 | 0 |
161 | 58 | should_be_0 | 76 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; |
162 | 59 | 0 | 77 | should_be_0 |
163 | 60 | DROP TABLE t1; | 78 | 0 |
164 | 79 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
165 | 80 | should_be_0 | ||
166 | 81 | 0 | ||
167 | 82 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
168 | 83 | should_be_0 | ||
169 | 84 | 0 | ||
170 | 85 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
171 | 86 | should_be_0 | ||
172 | 87 | 0 | ||
173 | 88 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
174 | 89 | should_be_0 | ||
175 | 90 | 0 | ||
176 | 91 | SHOW INDEXES IN t1; | ||
177 | 92 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
178 | 93 | DROP TABLE t1; | ||
179 | 94 | CREATE TABLE t1 (a INT PRIMARY KEY, b INT, UNIQUE KEY (b)) ENGINE=InnoDB; | ||
180 | 95 | INSERT INTO t1 VALUES (1,1); | ||
181 | 96 | SELECT @@global.userstat = 1 AS should_be_1; | ||
182 | 97 | should_be_1 | ||
183 | 98 | 1 | ||
184 | 99 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
185 | 100 | should_be_1 | ||
186 | 101 | 1 | ||
187 | 102 | ANALYZE TABLE t1; | ||
188 | 103 | Table Op Msg_type Msg_text | ||
189 | 104 | test.t1 analyze status OK | ||
190 | 105 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
191 | 106 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
192 | 107 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
193 | 108 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
194 | 109 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
195 | 110 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
196 | 111 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
197 | 112 | SHOW INDEXES IN t1; | ||
198 | 113 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
199 | 114 | t1 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
200 | 115 | t1 0 b 1 b A 1 NULL NULL YES BTREE | ||
201 | 116 | SET innodb_fake_changes=1; | ||
202 | 117 | SELECT * FROM t1; | ||
203 | 118 | ERROR HY000: Got error 131 during COMMIT | ||
204 | 119 | INSERT INTO t1 VALUES (2,2); | ||
205 | 120 | ERROR HY000: Got error 131 during COMMIT | ||
206 | 121 | UPDATE t1 SET a=0 where b=1; | ||
207 | 122 | ERROR 23000: Duplicate entry '1' for key 'b' | ||
208 | 123 | UPDATE t1 SET b=0 where a=1; | ||
209 | 124 | ERROR HY000: Got error 131 during COMMIT | ||
210 | 125 | UPDATE t1 SET b=0 where a=2; | ||
211 | 126 | ERROR HY000: Got error 131 during COMMIT | ||
212 | 127 | DELETE FROM t1 where b=2; | ||
213 | 128 | ERROR HY000: Got error 131 during COMMIT | ||
214 | 129 | DELETE FROM t1 where b=1; | ||
215 | 130 | ERROR HY000: Got error 131 during COMMIT | ||
216 | 131 | DELETE FROM t1 where a=2; | ||
217 | 132 | ERROR HY000: Got error 131 during COMMIT | ||
218 | 133 | DELETE FROM t1 where a=1; | ||
219 | 134 | ERROR HY000: Got error 131 during COMMIT | ||
220 | 135 | REPLACE INTO t1 values (2,3); | ||
221 | 136 | ERROR HY000: Got error 131 during COMMIT | ||
222 | 137 | BEGIN; | ||
223 | 138 | SELECT * FROM t1; | ||
224 | 139 | a b | ||
225 | 140 | 1 1 | ||
226 | 141 | COMMIT; | ||
227 | 142 | ERROR HY000: Got error 131 during COMMIT | ||
228 | 143 | BEGIN; | ||
229 | 144 | INSERT INTO t1 VALUES (2,2); | ||
230 | 145 | COMMIT; | ||
231 | 146 | ERROR HY000: Got error 131 during COMMIT | ||
232 | 147 | BEGIN; | ||
233 | 148 | UPDATE t1 SET a=0 where b=1; | ||
234 | 149 | ERROR 23000: Duplicate entry '1' for key 'b' | ||
235 | 150 | COMMIT; | ||
236 | 151 | ERROR HY000: Got error 131 during COMMIT | ||
237 | 152 | BEGIN; | ||
238 | 153 | UPDATE t1 SET b=0 where a=1; | ||
239 | 154 | COMMIT; | ||
240 | 155 | ERROR HY000: Got error 131 during COMMIT | ||
241 | 156 | BEGIN; | ||
242 | 157 | UPDATE t1 SET b=0 where a=2; | ||
243 | 158 | COMMIT; | ||
244 | 159 | ERROR HY000: Got error 131 during COMMIT | ||
245 | 160 | BEGIN; | ||
246 | 161 | DELETE FROM t1 where b=2; | ||
247 | 162 | COMMIT; | ||
248 | 163 | ERROR HY000: Got error 131 during COMMIT | ||
249 | 164 | BEGIN; | ||
250 | 165 | DELETE FROM t1 where b=1; | ||
251 | 166 | COMMIT; | ||
252 | 167 | ERROR HY000: Got error 131 during COMMIT | ||
253 | 168 | BEGIN; | ||
254 | 169 | DELETE FROM t1 where a=2; | ||
255 | 170 | COMMIT; | ||
256 | 171 | ERROR HY000: Got error 131 during COMMIT | ||
257 | 172 | BEGIN; | ||
258 | 173 | DELETE FROM t1 where a=1; | ||
259 | 174 | COMMIT; | ||
260 | 175 | ERROR HY000: Got error 131 during COMMIT | ||
261 | 176 | BEGIN; | ||
262 | 177 | REPLACE INTO t1 values (2,3); | ||
263 | 178 | COMMIT; | ||
264 | 179 | ERROR HY000: Got error 131 during COMMIT | ||
265 | 180 | INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2; | ||
266 | 181 | ERROR HY000: Got error 131 during COMMIT | ||
267 | 182 | CREATE INDEX bx ON t1(b); | ||
268 | 183 | ERROR HY000: Got error 131 during COMMIT | ||
269 | 184 | SET innodb_fake_changes=0; | ||
270 | 185 | CHECK TABLE t1; | ||
271 | 186 | Table Op Msg_type Msg_text | ||
272 | 187 | test.t1 check status OK | ||
273 | 188 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
274 | 189 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
275 | 190 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
276 | 191 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
277 | 192 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
278 | 193 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
279 | 194 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
280 | 195 | should_be_1 | ||
281 | 196 | 1 | ||
282 | 197 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
283 | 198 | should_be_0 | ||
284 | 199 | 0 | ||
285 | 200 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
286 | 201 | should_be_0 | ||
287 | 202 | 0 | ||
288 | 203 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
289 | 204 | should_be_0 | ||
290 | 205 | 0 | ||
291 | 206 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
292 | 207 | should_be_0 | ||
293 | 208 | 0 | ||
294 | 209 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
295 | 210 | should_be_0 | ||
296 | 211 | 0 | ||
297 | 212 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
298 | 213 | should_be_0 | ||
299 | 214 | 0 | ||
300 | 215 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
301 | 216 | should_be_0 | ||
302 | 217 | 0 | ||
303 | 218 | SHOW INDEXES IN t1; | ||
304 | 219 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
305 | 220 | t1 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
306 | 221 | t1 0 b 1 b A 1 NULL NULL YES BTREE | ||
307 | 222 | DROP TABLE t1; | ||
308 | 223 | CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; | ||
309 | 224 | INSERT INTO t2 VALUES (1, 1); | ||
310 | 225 | SELECT @@global.userstat = 1 AS should_be_1; | ||
311 | 226 | should_be_1 | ||
312 | 227 | 1 | ||
313 | 228 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
314 | 229 | should_be_1 | ||
315 | 230 | 1 | ||
316 | 231 | ANALYZE TABLE t2; | ||
317 | 232 | Table Op Msg_type Msg_text | ||
318 | 233 | test.t2 analyze status OK | ||
319 | 234 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
320 | 235 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
321 | 236 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
322 | 237 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'; | ||
323 | 238 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'; | ||
324 | 239 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'; | ||
325 | 240 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'; | ||
326 | 241 | SHOW INDEXES IN t2; | ||
327 | 242 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
328 | 243 | t2 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
329 | 244 | SET innodb_fake_changes=1; | ||
330 | 245 | SELECT * FROM t2; | ||
331 | 246 | ERROR HY000: Got error 131 during COMMIT | ||
332 | 247 | INSERT INTO t2 VALUES (2,2); | ||
333 | 248 | ERROR HY000: Got error 131 during COMMIT | ||
334 | 249 | UPDATE t2 SET b=0 where a=1; | ||
335 | 250 | ERROR HY000: Got error 131 during COMMIT | ||
336 | 251 | UPDATE t2 SET b=0 where a=2; | ||
337 | 252 | ERROR HY000: Got error 131 during COMMIT | ||
338 | 253 | DELETE FROM t2 where b=2; | ||
339 | 254 | ERROR HY000: Got error 131 during COMMIT | ||
340 | 255 | DELETE FROM t2 where b=1; | ||
341 | 256 | ERROR HY000: Got error 131 during COMMIT | ||
342 | 257 | DELETE FROM t2 where a=2; | ||
343 | 258 | ERROR HY000: Got error 131 during COMMIT | ||
344 | 259 | DELETE FROM t2 where a=1; | ||
345 | 260 | ERROR HY000: Got error 131 during COMMIT | ||
346 | 261 | REPLACE INTO t2 values (2,3); | ||
347 | 262 | ERROR HY000: Got error 131 during COMMIT | ||
348 | 263 | REPLACE INTO t2 VALUES (1,1); | ||
349 | 264 | ERROR HY000: Got error 131 during COMMIT | ||
350 | 265 | REPLACE INTO t2 VALUES (1,2); | ||
351 | 266 | ERROR HY000: Got error 131 during COMMIT | ||
352 | 267 | BEGIN; | ||
353 | 268 | SELECT * FROM t2; | ||
354 | 269 | a b | ||
355 | 270 | 1 1 | ||
356 | 271 | COMMIT; | ||
357 | 272 | ERROR HY000: Got error 131 during COMMIT | ||
358 | 273 | BEGIN; | ||
359 | 274 | INSERT INTO t2 VALUES (2,2); | ||
360 | 275 | COMMIT; | ||
361 | 276 | ERROR HY000: Got error 131 during COMMIT | ||
362 | 277 | BEGIN; | ||
363 | 278 | UPDATE t2 SET b=0 where a=1; | ||
364 | 279 | COMMIT; | ||
365 | 280 | ERROR HY000: Got error 131 during COMMIT | ||
366 | 281 | BEGIN; | ||
367 | 282 | UPDATE t2 SET b=0 where a=2; | ||
368 | 283 | COMMIT; | ||
369 | 284 | ERROR HY000: Got error 131 during COMMIT | ||
370 | 285 | BEGIN; | ||
371 | 286 | DELETE FROM t2 where b=2; | ||
372 | 287 | COMMIT; | ||
373 | 288 | ERROR HY000: Got error 131 during COMMIT | ||
374 | 289 | BEGIN; | ||
375 | 290 | DELETE FROM t2 where b=1; | ||
376 | 291 | COMMIT; | ||
377 | 292 | ERROR HY000: Got error 131 during COMMIT | ||
378 | 293 | BEGIN; | ||
379 | 294 | DELETE FROM t2 where a=2; | ||
380 | 295 | COMMIT; | ||
381 | 296 | ERROR HY000: Got error 131 during COMMIT | ||
382 | 297 | BEGIN; | ||
383 | 298 | DELETE FROM t2 where a=1; | ||
384 | 299 | COMMIT; | ||
385 | 300 | ERROR HY000: Got error 131 during COMMIT | ||
386 | 301 | BEGIN; | ||
387 | 302 | REPLACE INTO t2 values (2,3); | ||
388 | 303 | COMMIT; | ||
389 | 304 | ERROR HY000: Got error 131 during COMMIT | ||
390 | 305 | BEGIN; | ||
391 | 306 | REPLACE INTO t2 VALUES (1,1); | ||
392 | 307 | COMMIT; | ||
393 | 308 | ERROR HY000: Got error 131 during COMMIT | ||
394 | 309 | BEGIN; | ||
395 | 310 | REPLACE INTO t2 VALUES (1,2); | ||
396 | 311 | COMMIT; | ||
397 | 312 | ERROR HY000: Got error 131 during COMMIT | ||
398 | 313 | BEGIN; | ||
399 | 314 | REPLACE INTO t2 VALUES (1,2); | ||
400 | 315 | SELECT * from t2; | ||
401 | 316 | a b | ||
402 | 317 | 1 1 | ||
403 | 318 | REPLACE INTO t2 VALUES (1,1); | ||
404 | 319 | SELECT * from t2; | ||
405 | 320 | a b | ||
406 | 321 | 1 1 | ||
407 | 322 | ROLLBACK; | ||
408 | 323 | BEGIN; | ||
409 | 324 | INSERT INTO t2 VALUES (1,1); | ||
410 | 325 | ERROR 23000: Duplicate entry '1' for key 'PRIMARY' | ||
411 | 326 | INSERT INTO t2 VALUES (1,2); | ||
412 | 327 | ERROR 23000: Duplicate entry '1' for key 'PRIMARY' | ||
413 | 328 | ROLLBACK; | ||
414 | 329 | INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2; | ||
415 | 330 | ERROR HY000: Got error 131 during COMMIT | ||
416 | 331 | INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=b+10; | ||
417 | 332 | ERROR HY000: Got error 131 during COMMIT | ||
418 | 333 | INSERT INTO t2 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10; | ||
419 | 334 | ERROR HY000: Got error 131 during COMMIT | ||
420 | 335 | CREATE INDEX bx ON t2(b); | ||
421 | 336 | ERROR HY000: Got error 131 during COMMIT | ||
422 | 337 | SET innodb_fake_changes=0; | ||
423 | 338 | CHECK TABLE t2; | ||
424 | 339 | Table Op Msg_type Msg_text | ||
425 | 340 | test.t2 check status OK | ||
426 | 341 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
427 | 342 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
428 | 343 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
429 | 344 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'; | ||
430 | 345 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'; | ||
431 | 346 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'; | ||
432 | 347 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'; | ||
433 | 348 | should_be_1 | ||
434 | 349 | 1 | ||
435 | 350 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
436 | 351 | should_be_0 | ||
437 | 352 | 0 | ||
438 | 353 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
439 | 354 | should_be_0 | ||
440 | 355 | 0 | ||
441 | 356 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
442 | 357 | should_be_0 | ||
443 | 358 | 0 | ||
444 | 359 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
445 | 360 | should_be_0 | ||
446 | 361 | 0 | ||
447 | 362 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
448 | 363 | should_be_0 | ||
449 | 364 | 0 | ||
450 | 365 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
451 | 366 | should_be_0 | ||
452 | 367 | 0 | ||
453 | 368 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
454 | 369 | should_be_0 | ||
455 | 370 | 0 | ||
456 | 371 | SHOW INDEXES IN t2; | ||
457 | 372 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
458 | 373 | t2 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
459 | 374 | DROP TABLE t2; | ||
460 | 375 | CREATE TABLE t3 (a INT PRIMARY KEY, B TEXT) ENGINE=InnoDB; | ||
461 | 376 | INSERT INTO t3 VALUES (1, ''); | ||
462 | 377 | SELECT @@global.userstat = 1 AS should_be_1; | ||
463 | 378 | should_be_1 | ||
464 | 379 | 1 | ||
465 | 380 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
466 | 381 | should_be_1 | ||
467 | 382 | 1 | ||
468 | 383 | ANALYZE TABLE t3; | ||
469 | 384 | Table Op Msg_type Msg_text | ||
470 | 385 | test.t3 analyze status OK | ||
471 | 386 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
472 | 387 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
473 | 388 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
474 | 389 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t3'; | ||
475 | 390 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3'; | ||
476 | 391 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3'; | ||
477 | 392 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t3'; | ||
478 | 393 | SHOW INDEXES IN t3; | ||
479 | 394 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
480 | 395 | t3 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
481 | 396 | SET innodb_fake_changes=1; | ||
482 | 397 | SELECT * FROM t3; | ||
483 | 398 | ERROR HY000: Got error 131 during COMMIT | ||
484 | 399 | INSERT INTO t3 VALUES (2,lpad('a',10000, 'b')); | ||
485 | 400 | ERROR HY000: Got error 131 during COMMIT | ||
486 | 401 | UPDATE t3 SET a=0 where a=1; | ||
487 | 402 | ERROR HY000: Got error 131 during COMMIT | ||
488 | 403 | DELETE FROM t3 where a=2; | ||
489 | 404 | ERROR HY000: Got error 131 during COMMIT | ||
490 | 405 | DELETE FROM t3 where a=1; | ||
491 | 406 | ERROR HY000: Got error 131 during COMMIT | ||
492 | 407 | REPLACE INTO t3 values (2,lpad('a',9000,'q')); | ||
493 | 408 | ERROR HY000: Got error 131 during COMMIT | ||
494 | 409 | INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c'); | ||
495 | 410 | ERROR HY000: Got error 131 during COMMIT | ||
496 | 411 | BEGIN; | ||
497 | 412 | SELECT * FROM t3; | ||
498 | 413 | a B | ||
499 | 414 | 1 | ||
500 | 415 | COMMIT; | ||
501 | 416 | ERROR HY000: Got error 131 during COMMIT | ||
502 | 417 | BEGIN; | ||
503 | 418 | INSERT INTO t3 VALUES (2,lpad('a',10000, 'b')); | ||
504 | 419 | COMMIT; | ||
505 | 420 | ERROR HY000: Got error 131 during COMMIT | ||
506 | 421 | BEGIN; | ||
507 | 422 | UPDATE t3 SET a=0 where a=1; | ||
508 | 423 | COMMIT; | ||
509 | 424 | ERROR HY000: Got error 131 during COMMIT | ||
510 | 425 | BEGIN; | ||
511 | 426 | DELETE FROM t3 where a=2; | ||
512 | 427 | COMMIT; | ||
513 | 428 | ERROR HY000: Got error 131 during COMMIT | ||
514 | 429 | BEGIN; | ||
515 | 430 | DELETE FROM t3 where a=1; | ||
516 | 431 | COMMIT; | ||
517 | 432 | ERROR HY000: Got error 131 during COMMIT | ||
518 | 433 | BEGIN; | ||
519 | 434 | REPLACE INTO t3 values (2,lpad('a',9000,'q')); | ||
520 | 435 | COMMIT; | ||
521 | 436 | ERROR HY000: Got error 131 during COMMIT | ||
522 | 437 | BEGIN; | ||
523 | 438 | INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c'); | ||
524 | 439 | COMMIT; | ||
525 | 440 | ERROR HY000: Got error 131 during COMMIT | ||
526 | 441 | SET innodb_fake_changes=0; | ||
527 | 442 | CHECK TABLE t3; | ||
528 | 443 | Table Op Msg_type Msg_text | ||
529 | 444 | test.t3 check status OK | ||
530 | 445 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
531 | 446 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
532 | 447 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
533 | 448 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t3'; | ||
534 | 449 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3'; | ||
535 | 450 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3'; | ||
536 | 451 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t3'; | ||
537 | 452 | should_be_1 | ||
538 | 453 | 1 | ||
539 | 454 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
540 | 455 | should_be_0 | ||
541 | 456 | 0 | ||
542 | 457 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
543 | 458 | should_be_0 | ||
544 | 459 | 0 | ||
545 | 460 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
546 | 461 | should_be_0 | ||
547 | 462 | 0 | ||
548 | 463 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
549 | 464 | should_be_0 | ||
550 | 465 | 0 | ||
551 | 466 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
552 | 467 | should_be_0 | ||
553 | 468 | 0 | ||
554 | 469 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
555 | 470 | should_be_0 | ||
556 | 471 | 0 | ||
557 | 472 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
558 | 473 | should_be_0 | ||
559 | 474 | 0 | ||
560 | 475 | SHOW INDEXES IN t3; | ||
561 | 476 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
562 | 477 | t3 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
563 | 478 | DROP TABLE t3; | ||
564 | 61 | # DDL must result in error | 479 | # DDL must result in error |
565 | 62 | CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; | 480 | CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; |
567 | 63 | SET autocommit=0; | 481 | SELECT @@global.userstat = 1 AS should_be_1; |
568 | 482 | should_be_1 | ||
569 | 483 | 1 | ||
570 | 484 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
571 | 485 | should_be_1 | ||
572 | 486 | 1 | ||
573 | 487 | ANALYZE TABLE t1; | ||
574 | 488 | Table Op Msg_type Msg_text | ||
575 | 489 | test.t1 analyze status OK | ||
576 | 490 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
577 | 491 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
578 | 492 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
579 | 493 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
580 | 494 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
581 | 495 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
582 | 496 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
583 | 497 | SHOW INDEXES IN t1; | ||
584 | 498 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
585 | 499 | t1 0 PRIMARY 1 a A 0 NULL NULL BTREE | ||
586 | 64 | SET innodb_fake_changes=1; | 500 | SET innodb_fake_changes=1; |
587 | 65 | BEGIN; | 501 | BEGIN; |
588 | 66 | CREATE TABLE t2 (a INT) ENGINE=InnoDB; | 502 | CREATE TABLE t2 (a INT) ENGINE=InnoDB; |
589 | @@ -68,52 +504,179 @@ | |||
590 | 68 | DROP TABLE t1; | 504 | DROP TABLE t1; |
591 | 69 | ERROR 42S02: Unknown table 'test.t1' | 505 | ERROR 42S02: Unknown table 'test.t1' |
592 | 70 | TRUNCATE TABLE t1; | 506 | TRUNCATE TABLE t1; |
594 | 71 | ERROR HY000: Got error 131 during COMMIT | 507 | ERROR HY000: Table storage engine for 't1' doesn't have this option |
595 | 72 | ALTER TABLE t1 ENGINE=MyISAM; | 508 | ALTER TABLE t1 ENGINE=MyISAM; |
596 | 73 | ERROR HY000: Got error 131 during COMMIT | 509 | ERROR HY000: Got error 131 during COMMIT |
597 | 74 | ROLLBACK; | 510 | ROLLBACK; |
598 | 75 | SET innodb_fake_changes=0; | 511 | SET innodb_fake_changes=0; |
599 | 512 | CHECK TABLE t1; | ||
600 | 513 | Table Op Msg_type Msg_text | ||
601 | 514 | test.t1 check status OK | ||
602 | 515 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
603 | 516 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
604 | 517 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
605 | 518 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
606 | 519 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
607 | 520 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
608 | 521 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
609 | 522 | should_be_1 | ||
610 | 523 | 1 | ||
611 | 524 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
612 | 525 | should_be_0 | ||
613 | 526 | 0 | ||
614 | 527 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
615 | 528 | should_be_0 | ||
616 | 529 | 0 | ||
617 | 530 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
618 | 531 | should_be_0 | ||
619 | 532 | 0 | ||
620 | 533 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
621 | 534 | should_be_0 | ||
622 | 535 | 0 | ||
623 | 536 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
624 | 537 | should_be_0 | ||
625 | 538 | 0 | ||
626 | 539 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
627 | 540 | should_be_0 | ||
628 | 541 | 0 | ||
629 | 542 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
630 | 543 | should_be_0 | ||
631 | 544 | 0 | ||
632 | 545 | SHOW INDEXES IN t1; | ||
633 | 546 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
634 | 547 | t1 0 PRIMARY 1 a A 0 NULL NULL BTREE | ||
635 | 76 | INSERT INTO t1 VALUES (1), (2); | 548 | INSERT INTO t1 VALUES (1), (2); |
636 | 77 | COMMIT; | ||
637 | 78 | CREATE TABLE t2 (a INT PRIMARY KEY, b INT, INDEX b_ind (b), | 549 | CREATE TABLE t2 (a INT PRIMARY KEY, b INT, INDEX b_ind (b), |
638 | 79 | FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB; | 550 | FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB; |
639 | 80 | INSERT INTO t2 VALUES (1, 1); | 551 | INSERT INTO t2 VALUES (1, 1); |
640 | 81 | INSERT INTO t2 VALUES (2, 2); | 552 | INSERT INTO t2 VALUES (2, 2); |
641 | 82 | COMMIT; | 553 | COMMIT; |
642 | 554 | SELECT @@global.userstat = 1 AS should_be_1; | ||
643 | 555 | should_be_1 | ||
644 | 556 | 1 | ||
645 | 557 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
646 | 558 | should_be_1 | ||
647 | 559 | 1 | ||
648 | 560 | ANALYZE TABLE t1; | ||
649 | 561 | Table Op Msg_type Msg_text | ||
650 | 562 | test.t1 analyze status OK | ||
651 | 563 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
652 | 564 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
653 | 565 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
654 | 566 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
655 | 567 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
656 | 568 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
657 | 569 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
658 | 570 | SHOW INDEXES IN t1; | ||
659 | 571 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
660 | 572 | t1 0 PRIMARY 1 a A 2 NULL NULL BTREE | ||
661 | 83 | SET innodb_fake_changes=1; | 573 | SET innodb_fake_changes=1; |
662 | 574 | BEGIN; | ||
663 | 84 | DELETE FROM t1 WHERE a=1; | 575 | DELETE FROM t1 WHERE a=1; |
664 | 85 | UPDATE t1 SET a=3 WHERE a=2; | 576 | UPDATE t1 SET a=3 WHERE a=2; |
665 | 86 | COMMIT; | 577 | COMMIT; |
666 | 87 | ERROR HY000: Got error 131 during COMMIT | 578 | ERROR HY000: Got error 131 during COMMIT |
667 | 579 | SET innodb_fake_changes=0; | ||
668 | 580 | CHECK TABLE t1; | ||
669 | 581 | Table Op Msg_type Msg_text | ||
670 | 582 | test.t1 check status OK | ||
671 | 583 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
672 | 584 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
673 | 585 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
674 | 586 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
675 | 587 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
676 | 588 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
677 | 589 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
678 | 88 | should_be_1 | 590 | should_be_1 |
679 | 89 | 1 | 591 | 1 |
693 | 90 | should_be_0 | 592 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; |
694 | 91 | 0 | 593 | should_be_0 |
695 | 92 | should_be_0 | 594 | 0 |
696 | 93 | 0 | 595 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; |
697 | 94 | should_be_0 | 596 | should_be_0 |
698 | 95 | 0 | 597 | 0 |
699 | 96 | should_be_0 | 598 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; |
700 | 97 | 0 | 599 | should_be_0 |
701 | 98 | should_be_0 | 600 | 0 |
702 | 99 | 0 | 601 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; |
703 | 100 | should_be_0 | 602 | should_be_0 |
704 | 101 | 0 | 603 | 0 |
705 | 102 | SET innodb_fake_changes=0; | 604 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; |
706 | 605 | should_be_0 | ||
707 | 606 | 0 | ||
708 | 607 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
709 | 608 | should_be_0 | ||
710 | 609 | 0 | ||
711 | 610 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
712 | 611 | should_be_0 | ||
713 | 612 | 0 | ||
714 | 613 | SHOW INDEXES IN t1; | ||
715 | 614 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
716 | 615 | t1 0 PRIMARY 1 a A 2 NULL NULL BTREE | ||
717 | 103 | DROP TABLE t2; | 616 | DROP TABLE t2; |
718 | 104 | CREATE TABLE t3 (a INT primary key, b text) ENGINE=InnoDB; | 617 | CREATE TABLE t3 (a INT primary key, b text) ENGINE=InnoDB; |
719 | 105 | INSERT INTO t3 VALUES (1,''); | 618 | INSERT INTO t3 VALUES (1,''); |
721 | 106 | COMMIT; | 619 | SELECT @@global.userstat = 1 AS should_be_1; |
722 | 620 | should_be_1 | ||
723 | 621 | 1 | ||
724 | 622 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
725 | 623 | should_be_1 | ||
726 | 624 | 1 | ||
727 | 625 | ANALYZE TABLE t3; | ||
728 | 626 | Table Op Msg_type Msg_text | ||
729 | 627 | test.t3 analyze status OK | ||
730 | 628 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
731 | 629 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
732 | 630 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
733 | 631 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t3'; | ||
734 | 632 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3'; | ||
735 | 633 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3'; | ||
736 | 634 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t3'; | ||
737 | 635 | SHOW INDEXES IN t3; | ||
738 | 636 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
739 | 637 | t3 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
740 | 107 | SET innodb_fake_changes=1; | 638 | SET innodb_fake_changes=1; |
741 | 639 | BEGIN; | ||
742 | 108 | UPDATE t3 set b=lpad('b',11000,'c') where a=1; | 640 | UPDATE t3 set b=lpad('b',11000,'c') where a=1; |
743 | 109 | COMMIT; | 641 | COMMIT; |
744 | 110 | ERROR HY000: Got error 131 during COMMIT | 642 | ERROR HY000: Got error 131 during COMMIT |
747 | 111 | SET innodb_fake_changes=default; | 643 | SET innodb_fake_changes=0; |
746 | 112 | # Verify that the fake changes to t3 did not leak through | ||
748 | 113 | CHECK TABLE t3; | 644 | CHECK TABLE t3; |
749 | 114 | Table Op Msg_type Msg_text | 645 | Table Op Msg_type Msg_text |
750 | 115 | test.t3 check status OK | 646 | test.t3 check status OK |
751 | 647 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
752 | 648 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
753 | 649 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
754 | 650 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t3'; | ||
755 | 651 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3'; | ||
756 | 652 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't3'; | ||
757 | 653 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t3'; | ||
758 | 116 | should_be_1 | 654 | should_be_1 |
759 | 117 | 1 | 655 | 1 |
760 | 656 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
761 | 657 | should_be_0 | ||
762 | 658 | 0 | ||
763 | 659 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
764 | 660 | should_be_0 | ||
765 | 661 | 0 | ||
766 | 662 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
767 | 663 | should_be_0 | ||
768 | 664 | 0 | ||
769 | 665 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
770 | 666 | should_be_0 | ||
771 | 667 | 0 | ||
772 | 668 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
773 | 669 | should_be_0 | ||
774 | 670 | 0 | ||
775 | 671 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
776 | 672 | should_be_0 | ||
777 | 673 | 0 | ||
778 | 674 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
779 | 675 | should_be_0 | ||
780 | 676 | 0 | ||
781 | 677 | SHOW INDEXES IN t3; | ||
782 | 678 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
783 | 679 | t3 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
784 | 118 | DROP TABLE t1, t3; | 680 | DROP TABLE t1, t3; |
785 | 119 | SET @@GLOBAL.userstat= default; | 681 | SET @@GLOBAL.userstat= default; |
786 | 682 | SET @@GLOBAL.innodb_stats_transient_sample_pages=default; | ||
787 | 120 | 683 | ||
788 | === modified file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result' | |||
789 | --- Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result 2012-10-17 11:30:19 +0000 | |||
790 | +++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_898306.result 2013-10-17 08:14:49 +0000 | |||
791 | @@ -1,7 +1,29 @@ | |||
792 | 1 | DROP TABLE IF EXISTS t1; | 1 | DROP TABLE IF EXISTS t1; |
793 | 2 | SET @@GLOBAL.userstat=ON; | ||
794 | 3 | SET @@GLOBAL.innodb_stats_transient_sample_pages=30000; | ||
795 | 2 | CREATE TABLE t1 (a INT primary key, b int, unique key (b)) ENGINE=InnoDB; | 4 | CREATE TABLE t1 (a INT primary key, b int, unique key (b)) ENGINE=InnoDB; |
796 | 3 | INSERT INTO t1 VALUES (1,1); | 5 | INSERT INTO t1 VALUES (1,1); |
797 | 4 | SET autocommit=1; | 6 | SET autocommit=1; |
798 | 7 | SELECT @@global.userstat = 1 AS should_be_1; | ||
799 | 8 | should_be_1 | ||
800 | 9 | 1 | ||
801 | 10 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
802 | 11 | should_be_1 | ||
803 | 12 | 1 | ||
804 | 13 | ANALYZE TABLE t1; | ||
805 | 14 | Table Op Msg_type Msg_text | ||
806 | 15 | test.t1 analyze status OK | ||
807 | 16 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
808 | 17 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
809 | 18 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
810 | 19 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
811 | 20 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
812 | 21 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
813 | 22 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
814 | 23 | SHOW INDEXES IN t1; | ||
815 | 24 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
816 | 25 | t1 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
817 | 26 | t1 0 b 1 b A 1 NULL NULL YES BTREE | ||
818 | 5 | SET innodb_fake_changes=1; | 27 | SET innodb_fake_changes=1; |
819 | 6 | # Confirm that duplicate key errors on REPLACE works | 28 | # Confirm that duplicate key errors on REPLACE works |
820 | 7 | REPLACE INTO t1 VALUES (1,1); | 29 | REPLACE INTO t1 VALUES (1,1); |
821 | @@ -34,10 +56,43 @@ | |||
822 | 34 | INSERT INTO t1 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10; | 56 | INSERT INTO t1 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10; |
823 | 35 | ERROR HY000: Got error 131 during COMMIT | 57 | ERROR HY000: Got error 131 during COMMIT |
824 | 36 | SET innodb_fake_changes=0; | 58 | SET innodb_fake_changes=0; |
825 | 37 | SELECT * from t1; | ||
826 | 38 | a b | ||
827 | 39 | 1 1 | ||
828 | 40 | CHECK TABLE t1; | 59 | CHECK TABLE t1; |
829 | 41 | Table Op Msg_type Msg_text | 60 | Table Op Msg_type Msg_text |
830 | 42 | test.t1 check status OK | 61 | test.t1 check status OK |
831 | 62 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
832 | 63 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
833 | 64 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
834 | 65 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
835 | 66 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
836 | 67 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
837 | 68 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
838 | 69 | should_be_1 | ||
839 | 70 | 1 | ||
840 | 71 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
841 | 72 | should_be_0 | ||
842 | 73 | 0 | ||
843 | 74 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
844 | 75 | should_be_0 | ||
845 | 76 | 0 | ||
846 | 77 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
847 | 78 | should_be_0 | ||
848 | 79 | 0 | ||
849 | 80 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
850 | 81 | should_be_0 | ||
851 | 82 | 0 | ||
852 | 83 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
853 | 84 | should_be_0 | ||
854 | 85 | 0 | ||
855 | 86 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
856 | 87 | should_be_0 | ||
857 | 88 | 0 | ||
858 | 89 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
859 | 90 | should_be_0 | ||
860 | 91 | 0 | ||
861 | 92 | SHOW INDEXES IN t1; | ||
862 | 93 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
863 | 94 | t1 0 PRIMARY 1 a A 1 NULL NULL BTREE | ||
864 | 95 | t1 0 b 1 b A 1 NULL NULL YES BTREE | ||
865 | 43 | DROP TABLE t1; | 96 | DROP TABLE t1; |
866 | 97 | SET @@GLOBAL.userstat=default; | ||
867 | 98 | SET @@GLOBAL.innodb_stats_transient_sample_pages=default; | ||
868 | 44 | 99 | ||
869 | === modified file 'Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result' | |||
870 | --- Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result 2012-10-16 11:18:45 +0000 | |||
871 | +++ Percona-Server/mysql-test/r/percona_innodb_fake_changes_bug_917942.result 2013-10-17 08:14:49 +0000 | |||
872 | @@ -1,7 +1,28 @@ | |||
873 | 1 | DROP TABLE IF EXISTS t1; | 1 | DROP TABLE IF EXISTS t1; |
874 | 2 | SET @@GLOBAL.userstat=ON; | ||
875 | 3 | SET @@GLOBAL.innodb_stats_transient_sample_pages=30000; | ||
876 | 2 | Test compressed | 4 | Test compressed |
877 | 3 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8; | 5 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8; |
878 | 4 | INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b")); | 6 | INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b")); |
879 | 7 | SELECT @@global.userstat = 1 AS should_be_1; | ||
880 | 8 | should_be_1 | ||
881 | 9 | 1 | ||
882 | 10 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
883 | 11 | should_be_1 | ||
884 | 12 | 1 | ||
885 | 13 | ANALYZE TABLE t1; | ||
886 | 14 | Table Op Msg_type Msg_text | ||
887 | 15 | test.t1 analyze status OK | ||
888 | 16 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
889 | 17 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
890 | 18 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
891 | 19 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
892 | 20 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
893 | 21 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
894 | 22 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
895 | 23 | SHOW INDEXES IN t1; | ||
896 | 24 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
897 | 25 | t1 0 PRIMARY 1 id A 1 NULL NULL BTREE | ||
898 | 5 | SET innodb_fake_changes=1; | 26 | SET innodb_fake_changes=1; |
899 | 6 | INSERT INTO t1 VALUES(1, "foo", LPAD("a", 4600, "b")) ON DUPLICATE KEY UPDATE T = VALUES(T); | 27 | INSERT INTO t1 VALUES(1, "foo", LPAD("a", 4600, "b")) ON DUPLICATE KEY UPDATE T = VALUES(T); |
900 | 7 | ERROR HY000: Got error 131 during COMMIT | 28 | ERROR HY000: Got error 131 during COMMIT |
901 | @@ -11,12 +32,62 @@ | |||
902 | 11 | CHECK TABLE t1; | 32 | CHECK TABLE t1; |
903 | 12 | Table Op Msg_type Msg_text | 33 | Table Op Msg_type Msg_text |
904 | 13 | test.t1 check status OK | 34 | test.t1 check status OK |
905 | 35 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
906 | 36 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
907 | 37 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
908 | 38 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
909 | 39 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
910 | 40 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
911 | 41 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
912 | 14 | should_be_1 | 42 | should_be_1 |
913 | 15 | 1 | 43 | 1 |
914 | 44 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
915 | 45 | should_be_0 | ||
916 | 46 | 0 | ||
917 | 47 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
918 | 48 | should_be_0 | ||
919 | 49 | 0 | ||
920 | 50 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
921 | 51 | should_be_0 | ||
922 | 52 | 0 | ||
923 | 53 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
924 | 54 | should_be_0 | ||
925 | 55 | 0 | ||
926 | 56 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
927 | 57 | should_be_0 | ||
928 | 58 | 0 | ||
929 | 59 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
930 | 60 | should_be_0 | ||
931 | 61 | 0 | ||
932 | 62 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
933 | 63 | should_be_0 | ||
934 | 64 | 0 | ||
935 | 65 | SHOW INDEXES IN t1; | ||
936 | 66 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
937 | 67 | t1 0 PRIMARY 1 id A 1 NULL NULL BTREE | ||
938 | 16 | DROP TABLE t1; | 68 | DROP TABLE t1; |
939 | 17 | Test for uncompressed | 69 | Test for uncompressed |
940 | 18 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB; | 70 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB; |
941 | 19 | INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b")); | 71 | INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b")); |
942 | 72 | SELECT @@global.userstat = 1 AS should_be_1; | ||
943 | 73 | should_be_1 | ||
944 | 74 | 1 | ||
945 | 75 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
946 | 76 | should_be_1 | ||
947 | 77 | 1 | ||
948 | 78 | ANALYZE TABLE t1; | ||
949 | 79 | Table Op Msg_type Msg_text | ||
950 | 80 | test.t1 analyze status OK | ||
951 | 81 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
952 | 82 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
953 | 83 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
954 | 84 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
955 | 85 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
956 | 86 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
957 | 87 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
958 | 88 | SHOW INDEXES IN t1; | ||
959 | 89 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
960 | 90 | t1 0 PRIMARY 1 id A 1 NULL NULL BTREE | ||
961 | 20 | SET innodb_fake_changes=1; | 91 | SET innodb_fake_changes=1; |
962 | 21 | ERROR HY000: Got error 131 during COMMIT | 92 | ERROR HY000: Got error 131 during COMMIT |
963 | 22 | ERROR HY000: Got error 131 during COMMIT | 93 | ERROR HY000: Got error 131 during COMMIT |
964 | @@ -122,11 +193,61 @@ | |||
965 | 122 | CHECK TABLE t1; | 193 | CHECK TABLE t1; |
966 | 123 | Table Op Msg_type Msg_text | 194 | Table Op Msg_type Msg_text |
967 | 124 | test.t1 check status OK | 195 | test.t1 check status OK |
968 | 196 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
969 | 197 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
970 | 198 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
971 | 199 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
972 | 200 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
973 | 201 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
974 | 202 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
975 | 125 | should_be_1 | 203 | should_be_1 |
976 | 126 | 1 | 204 | 1 |
977 | 205 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
978 | 206 | should_be_0 | ||
979 | 207 | 0 | ||
980 | 208 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
981 | 209 | should_be_0 | ||
982 | 210 | 0 | ||
983 | 211 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
984 | 212 | should_be_0 | ||
985 | 213 | 0 | ||
986 | 214 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
987 | 215 | should_be_0 | ||
988 | 216 | 0 | ||
989 | 217 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
990 | 218 | should_be_0 | ||
991 | 219 | 0 | ||
992 | 220 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
993 | 221 | should_be_0 | ||
994 | 222 | 0 | ||
995 | 223 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
996 | 224 | should_be_0 | ||
997 | 225 | 0 | ||
998 | 226 | SHOW INDEXES IN t1; | ||
999 | 227 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
1000 | 228 | t1 0 PRIMARY 1 id A 1 NULL NULL BTREE | ||
1001 | 127 | DROP TABLE t1; | 229 | DROP TABLE t1; |
1002 | 128 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8; | 230 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8; |
1003 | 129 | INSERT INTO t1 VALUES(2, LPAD("v", 2, "b"), LPAD("a", 200, "b")); | 231 | INSERT INTO t1 VALUES(2, LPAD("v", 2, "b"), LPAD("a", 200, "b")); |
1004 | 232 | SELECT @@global.userstat = 1 AS should_be_1; | ||
1005 | 233 | should_be_1 | ||
1006 | 234 | 1 | ||
1007 | 235 | SELECT @@global.innodb_stats_transient_sample_pages = 30000 AS should_be_1; | ||
1008 | 236 | should_be_1 | ||
1009 | 237 | 1 | ||
1010 | 238 | ANALYZE TABLE t1; | ||
1011 | 239 | Table Op Msg_type Msg_text | ||
1012 | 240 | test.t1 analyze status OK | ||
1013 | 241 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
1014 | 242 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_deleted'; | ||
1015 | 243 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_updated'; | ||
1016 | 244 | SELECT NUM_ROWS INTO @table_rows_estimate_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
1017 | 245 | SELECT ROWS_CHANGED INTO @table_rows_changed_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
1018 | 246 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_1 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
1019 | 247 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
1020 | 248 | SHOW INDEXES IN t1; | ||
1021 | 249 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
1022 | 250 | t1 0 PRIMARY 1 id A 1 NULL NULL BTREE | ||
1023 | 130 | SET innodb_fake_changes=1; | 251 | SET innodb_fake_changes=1; |
1024 | 131 | INSERT INTO t1 VALUES (3, "foo", LPAD("a", 4600, "b")); | 252 | INSERT INTO t1 VALUES (3, "foo", LPAD("a", 4600, "b")); |
1025 | 132 | ERROR HY000: Got error 131 during COMMIT | 253 | ERROR HY000: Got error 131 during COMMIT |
1026 | @@ -134,8 +255,39 @@ | |||
1027 | 134 | CHECK TABLE t1; | 255 | CHECK TABLE t1; |
1028 | 135 | Table Op Msg_type Msg_text | 256 | Table Op Msg_type Msg_text |
1029 | 136 | test.t1 check status OK | 257 | test.t1 check status OK |
1030 | 258 | SELECT VARIABLE_VALUE INTO @innodb_rows_inserted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'Innodb_rows_inserted'; | ||
1031 | 259 | SELECT VARIABLE_VALUE INTO @innodb_rows_deleted_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'; | ||
1032 | 260 | SELECT VARIABLE_VALUE INTO @innodb_rows_updated_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'; | ||
1033 | 261 | SELECT NUM_ROWS INTO @table_rows_estimate_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
1034 | 262 | SELECT ROWS_CHANGED INTO @table_rows_changed_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
1035 | 263 | SELECT ROWS_CHANGED_X_INDEXES INTO @table_rows_changed_x_indexes_2 FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'; | ||
1036 | 264 | SELECT MODIFIED_COUNTER INTO @table_dml_counter_2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'; | ||
1037 | 137 | should_be_1 | 265 | should_be_1 |
1038 | 138 | 1 | 266 | 1 |
1039 | 267 | SELECT @innodb_rows_inserted_2 - @innodb_rows_inserted_1 AS should_be_0; | ||
1040 | 268 | should_be_0 | ||
1041 | 269 | 0 | ||
1042 | 270 | SELECT @innodb_rows_deleted_2 - @innodb_rows_deleted_1 AS should_be_0; | ||
1043 | 271 | should_be_0 | ||
1044 | 272 | 0 | ||
1045 | 273 | SELECT @innodb_rows_updated_2 - @innodb_rows_updated_1 AS should_be_0; | ||
1046 | 274 | should_be_0 | ||
1047 | 275 | 0 | ||
1048 | 276 | SELECT @table_rows_estimate_2 - @table_rows_estimate_1 AS should_be_0; | ||
1049 | 277 | should_be_0 | ||
1050 | 278 | 0 | ||
1051 | 279 | SELECT @table_rows_changed_2 - @table_rows_changed_1 AS should_be_0; | ||
1052 | 280 | should_be_0 | ||
1053 | 281 | 0 | ||
1054 | 282 | SELECT @table_rows_changed_x_indexes_2 - @table_rows_changed_x_indexes_1 AS should_be_0; | ||
1055 | 283 | should_be_0 | ||
1056 | 284 | 0 | ||
1057 | 285 | SELECT @table_dml_counter_2 - @table_dml_counter_1 AS should_be_0; | ||
1058 | 286 | should_be_0 | ||
1059 | 287 | 0 | ||
1060 | 288 | SHOW INDEXES IN t1; | ||
1061 | 289 | Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment | ||
1062 | 290 | t1 0 PRIMARY 1 id A 1 NULL NULL BTREE | ||
1063 | 139 | DROP TABLE t1; | 291 | DROP TABLE t1; |
1064 | 140 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB; | 292 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB; |
1065 | 141 | INSERT INTO t1 VALUES(2, LPAD("v", 3, "b"), LPAD("a", 100, "b")); | 293 | INSERT INTO t1 VALUES(2, LPAD("v", 3, "b"), LPAD("a", 100, "b")); |
1066 | @@ -149,3 +301,5 @@ | |||
1067 | 149 | should_be_1 | 301 | should_be_1 |
1068 | 150 | 1 | 302 | 1 |
1069 | 151 | DROP TABLE t1; | 303 | DROP TABLE t1; |
1070 | 304 | SET @@GLOBAL.userstat=default; | ||
1071 | 305 | SET @@GLOBAL.innodb_stats_transient_sample_pages=default; | ||
1072 | 152 | 306 | ||
1073 | === modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes.test' | |||
1074 | --- Percona-Server/mysql-test/t/percona_innodb_fake_changes.test 2013-05-06 15:43:51 +0000 | |||
1075 | +++ Percona-Server/mysql-test/t/percona_innodb_fake_changes.test 2013-10-17 08:14:49 +0000 | |||
1076 | @@ -4,7 +4,6 @@ | |||
1077 | 4 | DROP TABLE IF EXISTS t1, t2, t3; | 4 | DROP TABLE IF EXISTS t1, t2, t3; |
1078 | 5 | --enable_warnings | 5 | --enable_warnings |
1079 | 6 | 6 | ||
1080 | 7 | |||
1081 | 8 | --echo # Checking variables | 7 | --echo # Checking variables |
1082 | 9 | SHOW VARIABLES LIKE 'innodb_fake_changes'; | 8 | SHOW VARIABLES LIKE 'innodb_fake_changes'; |
1083 | 10 | SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; | 9 | SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='innodb_fake_changes'; |
1084 | @@ -17,21 +16,15 @@ | |||
1085 | 17 | 16 | ||
1086 | 18 | --echo # Explicit COMMIT should fail when innodb_fake_changes is enabled | 17 | --echo # Explicit COMMIT should fail when innodb_fake_changes is enabled |
1087 | 19 | --echo # DML should be fine | 18 | --echo # DML should be fine |
1089 | 20 | SET @@GLOBAL.userstat= TRUE; | 19 | SET @@GLOBAL.userstat=TRUE; |
1090 | 20 | SET @@GLOBAL.innodb_stats_transient_sample_pages=30000; | ||
1091 | 21 | |||
1092 | 21 | CREATE TABLE t1 (a INT) ENGINE=InnoDB; | 22 | CREATE TABLE t1 (a INT) ENGINE=InnoDB; |
1093 | 22 | INSERT INTO t1 VALUES (1); | 23 | INSERT INTO t1 VALUES (1); |
1094 | 23 | 24 | ||
1103 | 24 | let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`; | 25 | --let $fake_changes_table=t1 |
1104 | 25 | let $innodb_rows_inserted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_inserted'`; | 26 | --source include/start_fake_changes.inc |
1097 | 26 | let $innodb_rows_deleted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`; | ||
1098 | 27 | let $innodb_rows_updated_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`; | ||
1099 | 28 | let $table_rows_estimate_1= `SELECT NUM_ROWS FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'`; | ||
1100 | 29 | let $table_dml_counter_1= `SELECT MODIFIED_COUNTER FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'`; | ||
1101 | 30 | let $table_rows_changed_1= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`; | ||
1102 | 31 | let $table_rows_changed_x_indexes_1= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`; | ||
1105 | 32 | 27 | ||
1106 | 33 | SET autocommit=0; | ||
1107 | 34 | SET innodb_fake_changes=1; | ||
1108 | 35 | BEGIN; | 28 | BEGIN; |
1109 | 36 | INSERT INTO t1 VALUES (2); | 29 | INSERT INTO t1 VALUES (2); |
1110 | 37 | UPDATE t1 SET a=0; | 30 | UPDATE t1 SET a=0; |
1111 | @@ -39,107 +32,341 @@ | |||
1112 | 39 | SELECT * FROM t1; | 32 | SELECT * FROM t1; |
1113 | 40 | --error 1180 | 33 | --error 1180 |
1114 | 41 | COMMIT; | 34 | COMMIT; |
1137 | 42 | SET innodb_fake_changes=default; | 35 | |
1138 | 43 | --echo # Verify that the fake changes to t1 did not leak through | 36 | --source include/stop_fake_changes.inc |
1139 | 44 | CHECK TABLE t1; | 37 | |
1140 | 45 | let $t1_checksum_2= `CHECKSUM TABLE t1 EXTENDED`; | 38 | DROP TABLE t1; |
1141 | 46 | let $innodb_rows_inserted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_inserted'`; | 39 | |
1142 | 47 | let $innodb_rows_deleted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`; | 40 | # |
1143 | 48 | let $innodb_rows_updated_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`; | 41 | # Test primary and secondary index access |
1144 | 49 | let $table_rows_estimate_2= `SELECT NUM_ROWS FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'`; | 42 | # |
1145 | 50 | let $table_dml_counter_2= `SELECT MODIFIED_COUNTER FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t1'`; | 43 | CREATE TABLE t1 (a INT PRIMARY KEY, b INT, UNIQUE KEY (b)) ENGINE=InnoDB; |
1146 | 51 | let $table_rows_changed_2= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`; | 44 | INSERT INTO t1 VALUES (1,1); |
1147 | 52 | let $table_rows_changed_x_indexes_2= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't1'`; | 45 | |
1148 | 53 | --disable_query_log | 46 | --source include/start_fake_changes.inc |
1149 | 54 | eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1; | 47 | |
1150 | 55 | eval SELECT "$innodb_rows_inserted_2" - "$innodb_rows_inserted_1" AS should_be_0; | 48 | # Test with autocommit |
1151 | 56 | eval SELECT "$innodb_rows_deleted_2" - "$innodb_rows_deleted_1" AS should_be_0; | 49 | --error ER_ERROR_DURING_COMMIT |
1152 | 57 | eval SELECT "$innodb_rows_updated_2" - "$innodb_rows_updated_1" AS should_be_0; | 50 | SELECT * FROM t1; |
1153 | 58 | eval SELECT "$table_rows_estimate_2" - "$table_rows_estimate_1" AS should_be_0; | 51 | --error ER_ERROR_DURING_COMMIT |
1154 | 59 | eval SELECT "$table_dml_counter_2" - "$table_dml_counter_1" AS should_be_0; | 52 | INSERT INTO t1 VALUES (2,2); |
1155 | 60 | eval SELECT "$table_rows_changed_2" - "$table_rows_changed_1" AS should_be_0; | 53 | --error ER_DUP_ENTRY |
1156 | 61 | eval SELECT "$table_rows_changed_x_indexes_2" - "$table_rows_changed_x_indexes_1" AS should_be_0; | 54 | UPDATE t1 SET a=0 where b=1; |
1157 | 62 | --enable_query_log | 55 | --error ER_ERROR_DURING_COMMIT |
1158 | 63 | DROP TABLE t1; | 56 | UPDATE t1 SET b=0 where a=1; |
1159 | 57 | --error ER_ERROR_DURING_COMMIT | ||
1160 | 58 | UPDATE t1 SET b=0 where a=2; | ||
1161 | 59 | --error ER_ERROR_DURING_COMMIT | ||
1162 | 60 | DELETE FROM t1 where b=2; | ||
1163 | 61 | --error ER_ERROR_DURING_COMMIT | ||
1164 | 62 | DELETE FROM t1 where b=1; | ||
1165 | 63 | --error ER_ERROR_DURING_COMMIT | ||
1166 | 64 | DELETE FROM t1 where a=2; | ||
1167 | 65 | --error ER_ERROR_DURING_COMMIT | ||
1168 | 66 | DELETE FROM t1 where a=1; | ||
1169 | 67 | --error ER_ERROR_DURING_COMMIT | ||
1170 | 68 | REPLACE INTO t1 values (2,3); | ||
1171 | 69 | |||
1172 | 70 | # Test with transactions | ||
1173 | 71 | BEGIN; | ||
1174 | 72 | SELECT * FROM t1; | ||
1175 | 73 | --error ER_ERROR_DURING_COMMIT | ||
1176 | 74 | COMMIT; | ||
1177 | 75 | |||
1178 | 76 | BEGIN; | ||
1179 | 77 | INSERT INTO t1 VALUES (2,2); | ||
1180 | 78 | --error ER_ERROR_DURING_COMMIT | ||
1181 | 79 | COMMIT; | ||
1182 | 80 | |||
1183 | 81 | BEGIN; | ||
1184 | 82 | --error ER_DUP_ENTRY | ||
1185 | 83 | UPDATE t1 SET a=0 where b=1; | ||
1186 | 84 | --error ER_ERROR_DURING_COMMIT | ||
1187 | 85 | COMMIT; | ||
1188 | 86 | |||
1189 | 87 | BEGIN; | ||
1190 | 88 | UPDATE t1 SET b=0 where a=1; | ||
1191 | 89 | --error ER_ERROR_DURING_COMMIT | ||
1192 | 90 | COMMIT; | ||
1193 | 91 | |||
1194 | 92 | BEGIN; | ||
1195 | 93 | UPDATE t1 SET b=0 where a=2; | ||
1196 | 94 | --error ER_ERROR_DURING_COMMIT | ||
1197 | 95 | COMMIT; | ||
1198 | 96 | |||
1199 | 97 | BEGIN; | ||
1200 | 98 | DELETE FROM t1 where b=2; | ||
1201 | 99 | --error ER_ERROR_DURING_COMMIT | ||
1202 | 100 | COMMIT; | ||
1203 | 101 | |||
1204 | 102 | BEGIN; | ||
1205 | 103 | DELETE FROM t1 where b=1; | ||
1206 | 104 | --error ER_ERROR_DURING_COMMIT | ||
1207 | 105 | COMMIT; | ||
1208 | 106 | |||
1209 | 107 | BEGIN; | ||
1210 | 108 | DELETE FROM t1 where a=2; | ||
1211 | 109 | --error ER_ERROR_DURING_COMMIT | ||
1212 | 110 | COMMIT; | ||
1213 | 111 | |||
1214 | 112 | BEGIN; | ||
1215 | 113 | DELETE FROM t1 where a=1; | ||
1216 | 114 | --error ER_ERROR_DURING_COMMIT | ||
1217 | 115 | COMMIT; | ||
1218 | 116 | |||
1219 | 117 | BEGIN; | ||
1220 | 118 | REPLACE INTO t1 values (2,3); | ||
1221 | 119 | --error ER_ERROR_DURING_COMMIT | ||
1222 | 120 | COMMIT; | ||
1223 | 121 | |||
1224 | 122 | --error ER_ERROR_DURING_COMMIT | ||
1225 | 123 | INSERT INTO t1 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2; | ||
1226 | 124 | --error ER_ERROR_DURING_COMMIT | ||
1227 | 125 | CREATE INDEX bx ON t1(b); | ||
1228 | 126 | |||
1229 | 127 | --source include/stop_fake_changes.inc | ||
1230 | 128 | |||
1231 | 129 | DROP TABLE t1; | ||
1232 | 130 | |||
1233 | 131 | # | ||
1234 | 132 | # Test all accesses through the primary index | ||
1235 | 133 | # | ||
1236 | 134 | CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; | ||
1237 | 135 | INSERT INTO t2 VALUES (1, 1); | ||
1238 | 136 | |||
1239 | 137 | --let $fake_changes_table=t2 | ||
1240 | 138 | --source include/start_fake_changes.inc | ||
1241 | 139 | |||
1242 | 140 | # Test with autocommit | ||
1243 | 141 | --error ER_ERROR_DURING_COMMIT | ||
1244 | 142 | SELECT * FROM t2; | ||
1245 | 143 | --error ER_ERROR_DURING_COMMIT | ||
1246 | 144 | INSERT INTO t2 VALUES (2,2); | ||
1247 | 145 | --error ER_ERROR_DURING_COMMIT | ||
1248 | 146 | UPDATE t2 SET b=0 where a=1; | ||
1249 | 147 | --error ER_ERROR_DURING_COMMIT | ||
1250 | 148 | UPDATE t2 SET b=0 where a=2; | ||
1251 | 149 | --error ER_ERROR_DURING_COMMIT | ||
1252 | 150 | DELETE FROM t2 where b=2; | ||
1253 | 151 | --error ER_ERROR_DURING_COMMIT | ||
1254 | 152 | DELETE FROM t2 where b=1; | ||
1255 | 153 | --error ER_ERROR_DURING_COMMIT | ||
1256 | 154 | DELETE FROM t2 where a=2; | ||
1257 | 155 | --error ER_ERROR_DURING_COMMIT | ||
1258 | 156 | DELETE FROM t2 where a=1; | ||
1259 | 157 | --error ER_ERROR_DURING_COMMIT | ||
1260 | 158 | REPLACE INTO t2 values (2,3); | ||
1261 | 159 | --error ER_ERROR_DURING_COMMIT | ||
1262 | 160 | REPLACE INTO t2 VALUES (1,1); | ||
1263 | 161 | --error ER_ERROR_DURING_COMMIT | ||
1264 | 162 | REPLACE INTO t2 VALUES (1,2); | ||
1265 | 163 | |||
1266 | 164 | # Test with transactions | ||
1267 | 165 | BEGIN; | ||
1268 | 166 | SELECT * FROM t2; | ||
1269 | 167 | --error ER_ERROR_DURING_COMMIT | ||
1270 | 168 | COMMIT; | ||
1271 | 169 | |||
1272 | 170 | BEGIN; | ||
1273 | 171 | INSERT INTO t2 VALUES (2,2); | ||
1274 | 172 | --error ER_ERROR_DURING_COMMIT | ||
1275 | 173 | COMMIT; | ||
1276 | 174 | |||
1277 | 175 | BEGIN; | ||
1278 | 176 | UPDATE t2 SET b=0 where a=1; | ||
1279 | 177 | --error ER_ERROR_DURING_COMMIT | ||
1280 | 178 | COMMIT; | ||
1281 | 179 | |||
1282 | 180 | BEGIN; | ||
1283 | 181 | UPDATE t2 SET b=0 where a=2; | ||
1284 | 182 | --error ER_ERROR_DURING_COMMIT | ||
1285 | 183 | COMMIT; | ||
1286 | 184 | |||
1287 | 185 | BEGIN; | ||
1288 | 186 | DELETE FROM t2 where b=2; | ||
1289 | 187 | --error ER_ERROR_DURING_COMMIT | ||
1290 | 188 | COMMIT; | ||
1291 | 189 | |||
1292 | 190 | BEGIN; | ||
1293 | 191 | DELETE FROM t2 where b=1; | ||
1294 | 192 | --error ER_ERROR_DURING_COMMIT | ||
1295 | 193 | COMMIT; | ||
1296 | 194 | |||
1297 | 195 | BEGIN; | ||
1298 | 196 | DELETE FROM t2 where a=2; | ||
1299 | 197 | --error ER_ERROR_DURING_COMMIT | ||
1300 | 198 | COMMIT; | ||
1301 | 199 | |||
1302 | 200 | BEGIN; | ||
1303 | 201 | DELETE FROM t2 where a=1; | ||
1304 | 202 | --error ER_ERROR_DURING_COMMIT | ||
1305 | 203 | COMMIT; | ||
1306 | 204 | |||
1307 | 205 | BEGIN; | ||
1308 | 206 | REPLACE INTO t2 values (2,3); | ||
1309 | 207 | --error ER_ERROR_DURING_COMMIT | ||
1310 | 208 | COMMIT; | ||
1311 | 209 | |||
1312 | 210 | BEGIN; | ||
1313 | 211 | REPLACE INTO t2 VALUES (1,1); | ||
1314 | 212 | --error ER_ERROR_DURING_COMMIT | ||
1315 | 213 | COMMIT; | ||
1316 | 214 | |||
1317 | 215 | BEGIN; | ||
1318 | 216 | REPLACE INTO t2 VALUES (1,2); | ||
1319 | 217 | --error ER_ERROR_DURING_COMMIT | ||
1320 | 218 | COMMIT; | ||
1321 | 219 | |||
1322 | 220 | # Confirm that duplicate key errors are OK | ||
1323 | 221 | BEGIN; | ||
1324 | 222 | REPLACE INTO t2 VALUES (1,2); | ||
1325 | 223 | SELECT * from t2; | ||
1326 | 224 | REPLACE INTO t2 VALUES (1,1); | ||
1327 | 225 | SELECT * from t2; | ||
1328 | 226 | ROLLBACK; | ||
1329 | 227 | |||
1330 | 228 | BEGIN; | ||
1331 | 229 | --error ER_DUP_ENTRY | ||
1332 | 230 | INSERT INTO t2 VALUES (1,1); | ||
1333 | 231 | --error ER_DUP_ENTRY | ||
1334 | 232 | INSERT INTO t2 VALUES (1,2); | ||
1335 | 233 | ROLLBACK; | ||
1336 | 234 | |||
1337 | 235 | --error ER_ERROR_DURING_COMMIT | ||
1338 | 236 | INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=2; | ||
1339 | 237 | --error ER_ERROR_DURING_COMMIT | ||
1340 | 238 | INSERT INTO t2 VALUES (1,1) ON DUPLICATE KEY UPDATE b=b+10; | ||
1341 | 239 | --error ER_ERROR_DURING_COMMIT | ||
1342 | 240 | INSERT INTO t2 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10; | ||
1343 | 241 | --error ER_ERROR_DURING_COMMIT | ||
1344 | 242 | CREATE INDEX bx ON t2(b); | ||
1345 | 243 | |||
1346 | 244 | --source include/stop_fake_changes.inc | ||
1347 | 245 | |||
1348 | 246 | DROP TABLE t2; | ||
1349 | 247 | |||
1350 | 248 | # | ||
1351 | 249 | # Test TEXT | ||
1352 | 250 | # | ||
1353 | 251 | CREATE TABLE t3 (a INT PRIMARY KEY, B TEXT) ENGINE=InnoDB; | ||
1354 | 252 | INSERT INTO t3 VALUES (1, ''); | ||
1355 | 253 | |||
1356 | 254 | --let $fake_changes_table=t3 | ||
1357 | 255 | --source include/start_fake_changes.inc | ||
1358 | 256 | |||
1359 | 257 | # Test with autocommit | ||
1360 | 258 | --error ER_ERROR_DURING_COMMIT | ||
1361 | 259 | SELECT * FROM t3; | ||
1362 | 260 | --error ER_ERROR_DURING_COMMIT | ||
1363 | 261 | INSERT INTO t3 VALUES (2,lpad('a',10000, 'b')); | ||
1364 | 262 | --error ER_ERROR_DURING_COMMIT | ||
1365 | 263 | UPDATE t3 SET a=0 where a=1; | ||
1366 | 264 | --error ER_ERROR_DURING_COMMIT | ||
1367 | 265 | DELETE FROM t3 where a=2; | ||
1368 | 266 | --error ER_ERROR_DURING_COMMIT | ||
1369 | 267 | DELETE FROM t3 where a=1; | ||
1370 | 268 | --error ER_ERROR_DURING_COMMIT | ||
1371 | 269 | REPLACE INTO t3 values (2,lpad('a',9000,'q')); | ||
1372 | 270 | --error ER_ERROR_DURING_COMMIT | ||
1373 | 271 | INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c'); | ||
1374 | 272 | |||
1375 | 273 | # Test with transactions | ||
1376 | 274 | BEGIN; | ||
1377 | 275 | SELECT * FROM t3; | ||
1378 | 276 | --error ER_ERROR_DURING_COMMIT | ||
1379 | 277 | COMMIT; | ||
1380 | 278 | |||
1381 | 279 | BEGIN; | ||
1382 | 280 | INSERT INTO t3 VALUES (2,lpad('a',10000, 'b')); | ||
1383 | 281 | --error ER_ERROR_DURING_COMMIT | ||
1384 | 282 | COMMIT; | ||
1385 | 283 | |||
1386 | 284 | BEGIN; | ||
1387 | 285 | UPDATE t3 SET a=0 where a=1; | ||
1388 | 286 | --error ER_ERROR_DURING_COMMIT | ||
1389 | 287 | COMMIT; | ||
1390 | 288 | |||
1391 | 289 | BEGIN; | ||
1392 | 290 | DELETE FROM t3 where a=2; | ||
1393 | 291 | --error ER_ERROR_DURING_COMMIT | ||
1394 | 292 | COMMIT; | ||
1395 | 293 | |||
1396 | 294 | BEGIN; | ||
1397 | 295 | DELETE FROM t3 where a=1; | ||
1398 | 296 | --error ER_ERROR_DURING_COMMIT | ||
1399 | 297 | COMMIT; | ||
1400 | 298 | |||
1401 | 299 | BEGIN; | ||
1402 | 300 | REPLACE INTO t3 values (2,lpad('a',9000,'q')); | ||
1403 | 301 | --error ER_ERROR_DURING_COMMIT | ||
1404 | 302 | COMMIT; | ||
1405 | 303 | |||
1406 | 304 | BEGIN; | ||
1407 | 305 | INSERT INTO t3 VALUES (1,1) ON DUPLICATE KEY UPDATE b=lpad('b',11000,'c'); | ||
1408 | 306 | --error ER_ERROR_DURING_COMMIT | ||
1409 | 307 | COMMIT; | ||
1410 | 308 | |||
1411 | 309 | --source include/stop_fake_changes.inc | ||
1412 | 310 | |||
1413 | 311 | DROP TABLE t3; | ||
1414 | 64 | 312 | ||
1415 | 65 | --echo # DDL must result in error | 313 | --echo # DDL must result in error |
1416 | 66 | CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; | 314 | CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; |
1419 | 67 | SET autocommit=0; | 315 | |
1420 | 68 | SET innodb_fake_changes=1; | 316 | --let $fake_changes_table=t1 |
1421 | 317 | --source include/start_fake_changes.inc | ||
1422 | 318 | |||
1423 | 69 | BEGIN; | 319 | BEGIN; |
1424 | 70 | --error ER_ILLEGAL_HA | 320 | --error ER_ILLEGAL_HA |
1425 | 71 | CREATE TABLE t2 (a INT) ENGINE=InnoDB; | 321 | CREATE TABLE t2 (a INT) ENGINE=InnoDB; |
1426 | 72 | --error 1051 | 322 | --error 1051 |
1427 | 73 | DROP TABLE t1; | 323 | DROP TABLE t1; |
1429 | 74 | --error 1180 | 324 | --error 1031 |
1430 | 75 | TRUNCATE TABLE t1; | 325 | TRUNCATE TABLE t1; |
1431 | 76 | --error 1180 | 326 | --error 1180 |
1432 | 77 | ALTER TABLE t1 ENGINE=MyISAM; | 327 | ALTER TABLE t1 ENGINE=MyISAM; |
1433 | 78 | ROLLBACK; | 328 | ROLLBACK; |
1434 | 79 | 329 | ||
1435 | 330 | --source include/stop_fake_changes.inc | ||
1436 | 331 | |||
1437 | 80 | # Test stat counters foreign key constraints | 332 | # Test stat counters foreign key constraints |
1438 | 81 | SET innodb_fake_changes=0; | ||
1439 | 82 | INSERT INTO t1 VALUES (1), (2); | 333 | INSERT INTO t1 VALUES (1), (2); |
1441 | 83 | COMMIT; | 334 | |
1442 | 84 | CREATE TABLE t2 (a INT PRIMARY KEY, b INT, INDEX b_ind (b), | 335 | CREATE TABLE t2 (a INT PRIMARY KEY, b INT, INDEX b_ind (b), |
1443 | 85 | FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB; | 336 | FOREIGN KEY (b) REFERENCES t1(a) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB; |
1444 | 86 | INSERT INTO t2 VALUES (1, 1); | 337 | INSERT INTO t2 VALUES (1, 1); |
1445 | 87 | INSERT INTO t2 VALUES (2, 2); | 338 | INSERT INTO t2 VALUES (2, 2); |
1446 | 88 | COMMIT; | 339 | COMMIT; |
1447 | 89 | 340 | ||
1455 | 90 | let $t2_checksum_1= `CHECKSUM TABLE t2 EXTENDED`; | 341 | --let $fake_changes_table=t1 |
1456 | 91 | let $innodb_rows_deleted_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`; | 342 | --source include/start_fake_changes.inc |
1450 | 92 | let $innodb_rows_updated_1= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`; | ||
1451 | 93 | let $table_rows_estimate_1= `SELECT NUM_ROWS FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'`; | ||
1452 | 94 | let $table_dml_counter_1= `SELECT MODIFIED_COUNTER FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'`; | ||
1453 | 95 | let $table_rows_changed_1= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`; | ||
1454 | 96 | let $table_rows_changed_x_indexes_1= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`; | ||
1457 | 97 | 343 | ||
1459 | 98 | SET innodb_fake_changes=1; | 344 | BEGIN; |
1460 | 99 | DELETE FROM t1 WHERE a=1; | 345 | DELETE FROM t1 WHERE a=1; |
1461 | 100 | UPDATE t1 SET a=3 WHERE a=2; | 346 | UPDATE t1 SET a=3 WHERE a=2; |
1462 | 101 | --error 1180 | 347 | --error 1180 |
1463 | 102 | COMMIT; | 348 | COMMIT; |
1464 | 103 | 349 | ||
1484 | 104 | let $t2_checksum_2= `CHECKSUM TABLE t2 EXTENDED`; | 350 | --source include/stop_fake_changes.inc |
1485 | 105 | let $innodb_rows_deleted_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_deleted'`; | 351 | |
1467 | 106 | let $innodb_rows_updated_2= `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Innodb_rows_updated'`; | ||
1468 | 107 | let $table_rows_estimate_2= `SELECT NUM_ROWS FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'`; | ||
1469 | 108 | let $table_dml_counter_2= `SELECT MODIFIED_COUNTER FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE NAME LIKE 'test/t2'`; | ||
1470 | 109 | let $table_rows_changed_2= `SELECT ROWS_CHANGED FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`; | ||
1471 | 110 | let $table_rows_changed_x_indexes_2= `SELECT ROWS_CHANGED_X_INDEXES FROM INFORMATION_SCHEMA.TABLE_STATISTICS WHERE TABLE_SCHEMA LIKE 'test' AND TABLE_NAME LIKE 't2'`; | ||
1472 | 111 | |||
1473 | 112 | --disable_query_log | ||
1474 | 113 | eval SELECT "$t2_checksum_1" LIKE "$t2_checksum_2" AS should_be_1; | ||
1475 | 114 | eval SELECT "$innodb_rows_deleted_2" - "$innodb_rows_deleted_1" AS should_be_0; | ||
1476 | 115 | eval SELECT "$innodb_rows_updated_2" - "$innodb_rows_updated_1" AS should_be_0; | ||
1477 | 116 | eval SELECT "$table_rows_estimate_2" - "$table_rows_estimate_1" AS should_be_0; | ||
1478 | 117 | eval SELECT "$table_rows_estimate_2" - "$table_rows_estimate_1" AS should_be_0; | ||
1479 | 118 | eval SELECT "$table_rows_changed_2" - "$table_rows_changed_1" AS should_be_0; | ||
1480 | 119 | eval SELECT "$table_rows_changed_x_indexes_2" - "$table_rows_changed_x_indexes_1" AS should_be_0; | ||
1481 | 120 | --enable_query_log | ||
1482 | 121 | |||
1483 | 122 | SET innodb_fake_changes=0; | ||
1486 | 123 | DROP TABLE t2; | 352 | DROP TABLE t2; |
1487 | 124 | 353 | ||
1488 | 125 | # Test for bug 890404: uninitialized value warning in btr_cur_pessimistic_update | 354 | # Test for bug 890404: uninitialized value warning in btr_cur_pessimistic_update |
1489 | 126 | CREATE TABLE t3 (a INT primary key, b text) ENGINE=InnoDB; | 355 | CREATE TABLE t3 (a INT primary key, b text) ENGINE=InnoDB; |
1490 | 127 | INSERT INTO t3 VALUES (1,''); | 356 | INSERT INTO t3 VALUES (1,''); |
1491 | 128 | COMMIT; | ||
1492 | 129 | let $t3_checksum_1= `CHECKSUM TABLE t3 EXTENDED`; | 357 | let $t3_checksum_1= `CHECKSUM TABLE t3 EXTENDED`; |
1495 | 130 | SET innodb_fake_changes=1; | 358 | |
1496 | 131 | 359 | --let $fake_changes_table=t3 | |
1497 | 360 | --source include/start_fake_changes.inc | ||
1498 | 361 | |||
1499 | 362 | BEGIN; | ||
1500 | 132 | UPDATE t3 set b=lpad('b',11000,'c') where a=1; | 363 | UPDATE t3 set b=lpad('b',11000,'c') where a=1; |
1501 | 133 | --error ER_ERROR_DURING_COMMIT | 364 | --error ER_ERROR_DURING_COMMIT |
1502 | 134 | COMMIT; | 365 | COMMIT; |
1503 | 135 | 366 | ||
1511 | 136 | SET innodb_fake_changes=default; | 367 | --source include/stop_fake_changes.inc |
1512 | 137 | --echo # Verify that the fake changes to t3 did not leak through | 368 | |
1506 | 138 | CHECK TABLE t3; | ||
1507 | 139 | let $t3_checksum_2= `CHECKSUM TABLE t3 EXTENDED`; | ||
1508 | 140 | --disable_query_log | ||
1509 | 141 | eval SELECT "$t3_checksum_1" LIKE "$t3_checksum_2" AS should_be_1; | ||
1510 | 142 | --enable_query_log | ||
1513 | 143 | DROP TABLE t1, t3; | 369 | DROP TABLE t1, t3; |
1514 | 144 | 370 | ||
1515 | 145 | SET @@GLOBAL.userstat= default; | 371 | SET @@GLOBAL.userstat= default; |
1516 | 372 | SET @@GLOBAL.innodb_stats_transient_sample_pages=default; | ||
1517 | 146 | 373 | ||
1518 | === modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test' | |||
1519 | --- Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test 2012-10-17 11:30:19 +0000 | |||
1520 | +++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_898306.test 2013-10-17 08:14:49 +0000 | |||
1521 | @@ -7,11 +7,16 @@ | |||
1522 | 7 | DROP TABLE IF EXISTS t1; | 7 | DROP TABLE IF EXISTS t1; |
1523 | 8 | --enable_warnings | 8 | --enable_warnings |
1524 | 9 | 9 | ||
1525 | 10 | SET @@GLOBAL.userstat=ON; | ||
1526 | 11 | SET @@GLOBAL.innodb_stats_transient_sample_pages=30000; | ||
1527 | 12 | |||
1528 | 10 | CREATE TABLE t1 (a INT primary key, b int, unique key (b)) ENGINE=InnoDB; | 13 | CREATE TABLE t1 (a INT primary key, b int, unique key (b)) ENGINE=InnoDB; |
1529 | 11 | INSERT INTO t1 VALUES (1,1); | 14 | INSERT INTO t1 VALUES (1,1); |
1530 | 12 | 15 | ||
1531 | 13 | SET autocommit=1; | 16 | SET autocommit=1; |
1533 | 14 | SET innodb_fake_changes=1; | 17 | |
1534 | 18 | --let $fake_changes_table=t1 | ||
1535 | 19 | --source include/start_fake_changes.inc | ||
1536 | 15 | 20 | ||
1537 | 16 | --echo # Confirm that duplicate key errors on REPLACE works | 21 | --echo # Confirm that duplicate key errors on REPLACE works |
1538 | 17 | 22 | ||
1539 | @@ -52,8 +57,9 @@ | |||
1540 | 52 | --error ER_ERROR_DURING_COMMIT | 57 | --error ER_ERROR_DURING_COMMIT |
1541 | 53 | INSERT INTO t1 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10; | 58 | INSERT INTO t1 VALUES (1,2) ON DUPLICATE KEY UPDATE b=b+10; |
1542 | 54 | 59 | ||
1546 | 55 | SET innodb_fake_changes=0; | 60 | --source include/stop_fake_changes.inc |
1544 | 56 | SELECT * from t1; | ||
1545 | 57 | CHECK TABLE t1; | ||
1547 | 58 | 61 | ||
1548 | 59 | DROP TABLE t1; | 62 | DROP TABLE t1; |
1549 | 63 | |||
1550 | 64 | SET @@GLOBAL.userstat=default; | ||
1551 | 65 | SET @@GLOBAL.innodb_stats_transient_sample_pages=default; | ||
1552 | 60 | 66 | ||
1553 | === modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test' | |||
1554 | --- Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test 2012-10-17 11:30:19 +0000 | |||
1555 | +++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_bug_917942.test 2013-10-17 08:14:49 +0000 | |||
1556 | @@ -7,6 +7,9 @@ | |||
1557 | 7 | DROP TABLE IF EXISTS t1; | 7 | DROP TABLE IF EXISTS t1; |
1558 | 8 | --enable_warnings | 8 | --enable_warnings |
1559 | 9 | 9 | ||
1560 | 10 | SET @@GLOBAL.userstat=ON; | ||
1561 | 11 | SET @@GLOBAL.innodb_stats_transient_sample_pages=30000; | ||
1562 | 12 | |||
1563 | 10 | # | 13 | # |
1564 | 11 | # Confirm that cursor->tree_height is initialized when calling btr_cur_pessimistic_update | 14 | # Confirm that cursor->tree_height is initialized when calling btr_cur_pessimistic_update |
1565 | 12 | # for transactions with innodb_fake_changes set | 15 | # for transactions with innodb_fake_changes set |
1566 | @@ -16,30 +19,25 @@ | |||
1567 | 16 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8; | 19 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8; |
1568 | 17 | 20 | ||
1569 | 18 | INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b")); | 21 | INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b")); |
1570 | 19 | let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`; | ||
1571 | 20 | 22 | ||
1573 | 21 | SET innodb_fake_changes=1; | 23 | --let $fake_changes_table=t1 |
1574 | 24 | --source include/start_fake_changes.inc | ||
1575 | 22 | 25 | ||
1576 | 23 | --error 1180 | 26 | --error 1180 |
1577 | 24 | INSERT INTO t1 VALUES(1, "foo", LPAD("a", 4600, "b")) ON DUPLICATE KEY UPDATE T = VALUES(T); | 27 | INSERT INTO t1 VALUES(1, "foo", LPAD("a", 4600, "b")) ON DUPLICATE KEY UPDATE T = VALUES(T); |
1578 | 25 | --error 1180 | 28 | --error 1180 |
1579 | 26 | UPDATE t1 SET T = LPAD("A", 4600, "b"); | 29 | UPDATE t1 SET T = LPAD("A", 4600, "b"); |
1580 | 27 | 30 | ||
1587 | 28 | SET innodb_fake_changes=0; | 31 | --source include/stop_fake_changes.inc |
1588 | 29 | CHECK TABLE t1; | 32 | |
1583 | 30 | let $t1_checksum_2= `CHECKSUM TABLE t1 EXTENDED`; | ||
1584 | 31 | --disable_query_log | ||
1585 | 32 | eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1; | ||
1586 | 33 | --enable_query_log | ||
1589 | 34 | DROP TABLE t1; | 33 | DROP TABLE t1; |
1590 | 35 | 34 | ||
1591 | 36 | --echo Test for uncompressed | 35 | --echo Test for uncompressed |
1592 | 37 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB; | 36 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB; |
1593 | 38 | 37 | ||
1594 | 39 | INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b")); | 38 | INSERT INTO t1 VALUES(NULL, LPAD("v", 2, "b"), LPAD("a", 100, "b")); |
1595 | 40 | let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`; | ||
1596 | 41 | 39 | ||
1598 | 42 | SET innodb_fake_changes=1; | 40 | --source include/start_fake_changes.inc |
1599 | 43 | 41 | ||
1600 | 44 | --disable_query_log | 42 | --disable_query_log |
1601 | 45 | let $x = 50; | 43 | let $x = 50; |
1602 | @@ -53,12 +51,8 @@ | |||
1603 | 53 | } | 51 | } |
1604 | 54 | --enable_query_log | 52 | --enable_query_log |
1605 | 55 | 53 | ||
1612 | 56 | SET innodb_fake_changes=0; | 54 | --source include/stop_fake_changes.inc |
1613 | 57 | CHECK TABLE t1; | 55 | |
1608 | 58 | let $t1_checksum_2= `CHECKSUM TABLE t1 EXTENDED`; | ||
1609 | 59 | --disable_query_log | ||
1610 | 60 | eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1; | ||
1611 | 61 | --enable_query_log | ||
1614 | 62 | DROP TABLE t1; | 56 | DROP TABLE t1; |
1615 | 63 | 57 | ||
1616 | 64 | # | 58 | # |
1617 | @@ -69,19 +63,14 @@ | |||
1618 | 69 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8; | 63 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB KEY_BLOCK_SIZE=8; |
1619 | 70 | 64 | ||
1620 | 71 | INSERT INTO t1 VALUES(2, LPAD("v", 2, "b"), LPAD("a", 200, "b")); | 65 | INSERT INTO t1 VALUES(2, LPAD("v", 2, "b"), LPAD("a", 200, "b")); |
1621 | 72 | let $t1_checksum_1= `CHECKSUM TABLE t1 EXTENDED`; | ||
1622 | 73 | 66 | ||
1624 | 74 | SET innodb_fake_changes=1; | 67 | --source include/start_fake_changes.inc |
1625 | 75 | 68 | ||
1626 | 76 | --error 1180 | 69 | --error 1180 |
1627 | 77 | INSERT INTO t1 VALUES (3, "foo", LPAD("a", 4600, "b")); | 70 | INSERT INTO t1 VALUES (3, "foo", LPAD("a", 4600, "b")); |
1628 | 78 | 71 | ||
1635 | 79 | SET innodb_fake_changes=0; | 72 | --source include/stop_fake_changes.inc |
1636 | 80 | CHECK TABLE t1; | 73 | |
1631 | 81 | let $t1_checksum_2= `CHECKSUM TABLE t1 EXTENDED`; | ||
1632 | 82 | --disable_query_log | ||
1633 | 83 | eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1; | ||
1634 | 84 | --enable_query_log | ||
1637 | 85 | DROP TABLE t1; | 74 | DROP TABLE t1; |
1638 | 86 | 75 | ||
1639 | 87 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB; | 76 | CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT, v VARCHAR(200), t TEXT) ENGINE=INNODB; |
1640 | @@ -101,3 +90,6 @@ | |||
1641 | 101 | eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1; | 90 | eval SELECT "$t1_checksum_1" LIKE "$t1_checksum_2" AS should_be_1; |
1642 | 102 | --enable_query_log | 91 | --enable_query_log |
1643 | 103 | DROP TABLE t1; | 92 | DROP TABLE t1; |
1644 | 93 | |||
1645 | 94 | SET @@GLOBAL.userstat=default; | ||
1646 | 95 | SET @@GLOBAL.innodb_stats_transient_sample_pages=default; | ||
1647 | 104 | 96 | ||
1648 | === modified file 'Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test' | |||
1649 | --- Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test 2012-10-11 14:18:34 +0000 | |||
1650 | +++ Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test 2013-10-17 08:14:49 +0000 | |||
1651 | @@ -16,6 +16,7 @@ | |||
1652 | 16 | --connection conn1 | 16 | --connection conn1 |
1653 | 17 | --echo # Verifying that X_LOCK not acquired | 17 | --echo # Verifying that X_LOCK not acquired |
1654 | 18 | SET autocommit=0; | 18 | SET autocommit=0; |
1655 | 19 | # Cannot use start_fake_changes.inc as conn2 issues real workload before reverting | ||
1656 | 19 | SET innodb_fake_changes=1; | 20 | SET innodb_fake_changes=1; |
1657 | 20 | BEGIN; | 21 | BEGIN; |
1658 | 21 | SELECT * FROM t1 FOR UPDATE; | 22 | SELECT * FROM t1 FOR UPDATE; |
1659 | 22 | 23 | ||
1660 | === modified file 'Percona-Server/sql/handler.cc' | |||
1661 | --- Percona-Server/sql/handler.cc 2013-10-15 11:37:57 +0000 | |||
1662 | +++ Percona-Server/sql/handler.cc 2013-10-17 08:14:49 +0000 | |||
1663 | @@ -2121,7 +2121,7 @@ | |||
1664 | 2121 | and committing the transaction in other engines. | 2121 | and committing the transaction in other engines. |
1665 | 2122 | */ | 2122 | */ |
1666 | 2123 | if (!ha_info->is_trx_read_write() | 2123 | if (!ha_info->is_trx_read_write() |
1668 | 2124 | && !(ht->is_fake_change && ht->is_fake_change(ht, thd))) | 2124 | && likely(!(ht->is_fake_change && ht->is_fake_change(ht, thd)))) |
1669 | 2125 | continue; | 2125 | continue; |
1670 | 2126 | if ((err= ht->prepare(ht, thd, all))) | 2126 | if ((err= ht->prepare(ht, thd, all))) |
1671 | 2127 | { | 2127 | { |
1672 | 2128 | 2128 | ||
1673 | === modified file 'Percona-Server/sql/sql_insert.cc' | |||
1674 | --- Percona-Server/sql/sql_insert.cc 2013-10-15 11:37:57 +0000 | |||
1675 | +++ Percona-Server/sql/sql_insert.cc 2013-10-17 08:14:49 +0000 | |||
1676 | @@ -1906,7 +1906,7 @@ | |||
1677 | 1906 | 2) do nothing on fake delete | 1906 | 2) do nothing on fake delete |
1678 | 1907 | 3) goto #1 | 1907 | 3) goto #1 |
1679 | 1908 | */ | 1908 | */ |
1681 | 1909 | if (table->file->is_fake_change_enabled(thd)) | 1909 | if (unlikely(table->file->is_fake_change_enabled(thd))) |
1682 | 1910 | goto ok_or_after_trg_err; | 1910 | goto ok_or_after_trg_err; |
1683 | 1911 | /* Let us attempt do write_row() once more */ | 1911 | /* Let us attempt do write_row() once more */ |
1684 | 1912 | } | 1912 | } |
1685 | 1913 | 1913 | ||
1686 | === modified file 'Percona-Server/storage/innobase/btr/btr0cur.cc' | |||
1687 | --- Percona-Server/storage/innobase/btr/btr0cur.cc 2013-10-15 11:37:57 +0000 | |||
1688 | +++ Percona-Server/storage/innobase/btr/btr0cur.cc 2013-10-17 08:14:49 +0000 | |||
1689 | @@ -1252,7 +1252,7 @@ | |||
1690 | 1252 | rec_t* rec; | 1252 | rec_t* rec; |
1691 | 1253 | roll_ptr_t roll_ptr; | 1253 | roll_ptr_t roll_ptr; |
1692 | 1254 | 1254 | ||
1694 | 1255 | if (thr && thr_get_trx(thr)->fake_changes) { | 1255 | if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) { |
1695 | 1256 | /* skip LOCK, UNDO */ | 1256 | /* skip LOCK, UNDO */ |
1696 | 1257 | return(DB_SUCCESS); | 1257 | return(DB_SUCCESS); |
1697 | 1258 | } | 1258 | } |
1698 | @@ -1514,7 +1514,7 @@ | |||
1699 | 1514 | goto fail_err; | 1514 | goto fail_err; |
1700 | 1515 | } | 1515 | } |
1701 | 1516 | 1516 | ||
1703 | 1517 | if (thr && thr_get_trx(thr)->fake_changes) { | 1517 | if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) { |
1704 | 1518 | /* skip CHANGE, LOG */ | 1518 | /* skip CHANGE, LOG */ |
1705 | 1519 | *big_rec = big_rec_vec; | 1519 | *big_rec = big_rec_vec; |
1706 | 1520 | return(err); /* == DB_SUCCESS */ | 1520 | return(err); /* == DB_SUCCESS */ |
1707 | @@ -1719,7 +1719,7 @@ | |||
1708 | 1719 | } | 1719 | } |
1709 | 1720 | } | 1720 | } |
1710 | 1721 | 1721 | ||
1712 | 1722 | if (thr && thr_get_trx(thr)->fake_changes) { | 1722 | if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) { |
1713 | 1723 | /* skip CHANGE, LOG */ | 1723 | /* skip CHANGE, LOG */ |
1714 | 1724 | if (n_reserved > 0) { | 1724 | if (n_reserved > 0) { |
1715 | 1725 | fil_space_release_free_extents(index->space, | 1725 | fil_space_release_free_extents(index->space, |
1716 | @@ -1785,7 +1785,7 @@ | |||
1717 | 1785 | 1785 | ||
1718 | 1786 | ut_ad(thr || (flags & BTR_NO_LOCKING_FLAG)); | 1786 | ut_ad(thr || (flags & BTR_NO_LOCKING_FLAG)); |
1719 | 1787 | 1787 | ||
1721 | 1788 | if (thr && thr_get_trx(thr)->fake_changes) { | 1788 | if (UNIV_UNLIKELY(thr && thr_get_trx(thr)->fake_changes)) { |
1722 | 1789 | /* skip LOCK, UNDO */ | 1789 | /* skip LOCK, UNDO */ |
1723 | 1790 | return(DB_SUCCESS); | 1790 | return(DB_SUCCESS); |
1724 | 1791 | } | 1791 | } |
1725 | @@ -2253,7 +2253,8 @@ | |||
1726 | 2253 | rec = btr_cur_get_rec(cursor); | 2253 | rec = btr_cur_get_rec(cursor); |
1727 | 2254 | index = cursor->index; | 2254 | index = cursor->index; |
1728 | 2255 | ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(index->table)); | 2255 | ut_ad(!!page_rec_is_comp(rec) == dict_table_is_comp(index->table)); |
1730 | 2256 | ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); | 2256 | ut_ad(thr_get_trx(thr)->fake_changes |
1731 | 2257 | || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); | ||
1732 | 2257 | /* The insert buffer tree should never be updated in place. */ | 2258 | /* The insert buffer tree should never be updated in place. */ |
1733 | 2258 | ut_ad(!dict_index_is_ibuf(index)); | 2259 | ut_ad(!dict_index_is_ibuf(index)); |
1734 | 2259 | ut_ad(dict_index_is_online_ddl(index) == !!(flags & BTR_CREATE_FLAG) | 2260 | ut_ad(dict_index_is_online_ddl(index) == !!(flags & BTR_CREATE_FLAG) |
1735 | @@ -2398,7 +2399,7 @@ | |||
1736 | 2398 | goto func_exit; | 2399 | goto func_exit; |
1737 | 2399 | } | 2400 | } |
1738 | 2400 | 2401 | ||
1740 | 2401 | if (thr && thr_get_trx(thr)->fake_changes) { | 2402 | if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) { |
1741 | 2402 | /* skip CHANGE, LOG */ | 2403 | /* skip CHANGE, LOG */ |
1742 | 2403 | ut_ad(err == DB_SUCCESS); | 2404 | ut_ad(err == DB_SUCCESS); |
1743 | 2404 | return(DB_SUCCESS); | 2405 | return(DB_SUCCESS); |
1744 | @@ -2555,9 +2556,11 @@ | |||
1745 | 2555 | page_zip = buf_block_get_page_zip(block); | 2556 | page_zip = buf_block_get_page_zip(block); |
1746 | 2556 | index = cursor->index; | 2557 | index = cursor->index; |
1747 | 2557 | 2558 | ||
1751 | 2558 | ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, dict_index_get_lock(index), | 2559 | ut_ad(thr_get_trx(thr)->fake_changes |
1752 | 2559 | MTR_MEMO_X_LOCK)); | 2560 | || mtr_memo_contains(mtr, dict_index_get_lock(index), |
1753 | 2560 | ut_ad((thr && thr_get_trx(thr)->fake_changes) || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); | 2561 | MTR_MEMO_X_LOCK)); |
1754 | 2562 | ut_ad(thr_get_trx(thr)->fake_changes | ||
1755 | 2563 | || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)); | ||
1756 | 2561 | #ifdef UNIV_ZIP_DEBUG | 2564 | #ifdef UNIV_ZIP_DEBUG |
1757 | 2562 | ut_a(!page_zip || page_zip_validate(page_zip, page, index)); | 2565 | ut_a(!page_zip || page_zip_validate(page_zip, page, index)); |
1758 | 2563 | #endif /* UNIV_ZIP_DEBUG */ | 2566 | #endif /* UNIV_ZIP_DEBUG */ |
1759 | @@ -2614,7 +2617,7 @@ | |||
1760 | 2614 | if (UNIV_UNLIKELY(cursor->tree_height == ULINT_UNDEFINED)) { | 2617 | if (UNIV_UNLIKELY(cursor->tree_height == ULINT_UNDEFINED)) { |
1761 | 2615 | /* When the tree height is uninitialized due to fake | 2618 | /* When the tree height is uninitialized due to fake |
1762 | 2616 | changes, reserve some hardcoded number of extents. */ | 2619 | changes, reserve some hardcoded number of extents. */ |
1764 | 2617 | ut_a(thr && thr_get_trx(thr)->fake_changes); | 2620 | ut_a(thr_get_trx(thr)->fake_changes); |
1765 | 2618 | n_extents = 3; | 2621 | n_extents = 3; |
1766 | 2619 | } | 2622 | } |
1767 | 2620 | else { | 2623 | else { |
1768 | @@ -2653,7 +2656,7 @@ | |||
1769 | 2653 | 2656 | ||
1770 | 2654 | trx = thr_get_trx(thr); | 2657 | trx = thr_get_trx(thr); |
1771 | 2655 | 2658 | ||
1773 | 2656 | if (!(flags & BTR_KEEP_SYS_FLAG) && !trx->fake_changes) { | 2659 | if (!(flags & BTR_KEEP_SYS_FLAG) && UNIV_LIKELY(!trx->fake_changes)) { |
1774 | 2657 | row_upd_index_entry_sys_field(new_entry, index, DATA_ROLL_PTR, | 2660 | row_upd_index_entry_sys_field(new_entry, index, DATA_ROLL_PTR, |
1775 | 2658 | roll_ptr); | 2661 | roll_ptr); |
1776 | 2659 | row_upd_index_entry_sys_field(new_entry, index, DATA_TRX_ID, | 2662 | row_upd_index_entry_sys_field(new_entry, index, DATA_TRX_ID, |
1777 | @@ -2725,7 +2728,7 @@ | |||
1778 | 2725 | ut_ad(flags & BTR_KEEP_POS_FLAG); | 2728 | ut_ad(flags & BTR_KEEP_POS_FLAG); |
1779 | 2726 | } | 2729 | } |
1780 | 2727 | 2730 | ||
1782 | 2728 | if (trx->fake_changes) { | 2731 | if (UNIV_UNLIKELY(trx->fake_changes)) { |
1783 | 2729 | /* skip CHANGE, LOG */ | 2732 | /* skip CHANGE, LOG */ |
1784 | 2730 | err = DB_SUCCESS; | 2733 | err = DB_SUCCESS; |
1785 | 2731 | goto return_after_reservations; | 2734 | goto return_after_reservations; |
1786 | @@ -3057,9 +3060,9 @@ | |||
1787 | 3057 | ut_ad(dict_index_is_clust(index)); | 3060 | ut_ad(dict_index_is_clust(index)); |
1788 | 3058 | ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets))); | 3061 | ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets))); |
1789 | 3059 | 3062 | ||
1793 | 3060 | if (thr && thr_get_trx(thr)->fake_changes) { | 3063 | if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) { |
1794 | 3061 | /* skip LOCK, UNDO, CHANGE, LOG */ | 3064 | /* skip LOCK, UNDO, CHANGE, LOG */ |
1795 | 3062 | return(DB_SUCCESS); | 3065 | return(DB_SUCCESS); |
1796 | 3063 | } | 3066 | } |
1797 | 3064 | 3067 | ||
1798 | 3065 | err = lock_clust_rec_modify_check_and_lock(BTR_NO_LOCKING_FLAG, block, | 3068 | err = lock_clust_rec_modify_check_and_lock(BTR_NO_LOCKING_FLAG, block, |
1799 | @@ -3200,7 +3203,7 @@ | |||
1800 | 3200 | rec_t* rec; | 3203 | rec_t* rec; |
1801 | 3201 | dberr_t err; | 3204 | dberr_t err; |
1802 | 3202 | 3205 | ||
1804 | 3203 | if (thr && thr_get_trx(thr)->fake_changes) { | 3206 | if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) { |
1805 | 3204 | /* skip LOCK, CHANGE, LOG */ | 3207 | /* skip LOCK, CHANGE, LOG */ |
1806 | 3205 | return(DB_SUCCESS); | 3208 | return(DB_SUCCESS); |
1807 | 3206 | } | 3209 | } |
1808 | 3207 | 3210 | ||
1809 | === modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc' | |||
1810 | --- Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-10-15 11:37:57 +0000 | |||
1811 | +++ Percona-Server/storage/innobase/handler/ha_innodb.cc 2013-10-17 08:14:49 +0000 | |||
1812 | @@ -1548,7 +1548,7 @@ | |||
1813 | 1548 | ha_innobase::is_fake_change_enabled(THD* thd) | 1548 | ha_innobase::is_fake_change_enabled(THD* thd) |
1814 | 1549 | { | 1549 | { |
1815 | 1550 | trx_t* trx = thd_to_trx(thd); | 1550 | trx_t* trx = thd_to_trx(thd); |
1817 | 1551 | return(trx && trx->fake_changes); | 1551 | return(trx && UNIV_UNLIKELY(trx->fake_changes)); |
1818 | 1552 | } | 1552 | } |
1819 | 1553 | 1553 | ||
1820 | 1554 | /********************************************************************//** | 1554 | /********************************************************************//** |
1821 | @@ -3771,7 +3771,7 @@ | |||
1822 | 3771 | whom the transaction is being committed */ | 3771 | whom the transaction is being committed */ |
1823 | 3772 | { | 3772 | { |
1824 | 3773 | trx_t* trx = check_trx_exists(thd); | 3773 | trx_t* trx = check_trx_exists(thd); |
1826 | 3774 | return trx->fake_changes; | 3774 | return UNIV_UNLIKELY(trx->fake_changes); |
1827 | 3775 | } | 3775 | } |
1828 | 3776 | 3776 | ||
1829 | 3777 | /*****************************************************************//** | 3777 | /*****************************************************************//** |
1830 | @@ -3879,9 +3879,11 @@ | |||
1831 | 3879 | /* No-op in XtraDB */ | 3879 | /* No-op in XtraDB */ |
1832 | 3880 | trx_search_latch_release_if_reserved(trx); | 3880 | trx_search_latch_release_if_reserved(trx); |
1833 | 3881 | 3881 | ||
1835 | 3882 | if (trx->fake_changes && | 3882 | if (UNIV_UNLIKELY(trx->fake_changes && |
1836 | 3883 | (commit_trx || | 3883 | (commit_trx || |
1838 | 3884 | (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))) { | 3884 | (!thd_test_options(thd, |
1839 | 3885 | OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))))) { | ||
1840 | 3886 | |||
1841 | 3885 | /* rollback implicitly */ | 3887 | /* rollback implicitly */ |
1842 | 3886 | innobase_rollback(hton, thd, commit_trx); | 3888 | innobase_rollback(hton, thd, commit_trx); |
1843 | 3887 | /* because debug assertion code complains, if something left */ | 3889 | /* because debug assertion code complains, if something left */ |
1844 | @@ -10059,7 +10061,7 @@ | |||
1845 | 10059 | 10061 | ||
1846 | 10060 | trx = innobase_trx_allocate(thd); | 10062 | trx = innobase_trx_allocate(thd); |
1847 | 10061 | 10063 | ||
1849 | 10062 | if (trx->fake_changes) { | 10064 | if (UNIV_UNLIKELY(trx->fake_changes)) { |
1850 | 10063 | innobase_commit_low(trx); | 10065 | innobase_commit_low(trx); |
1851 | 10064 | trx_free_for_mysql(trx); | 10066 | trx_free_for_mysql(trx); |
1852 | 10065 | DBUG_RETURN(HA_ERR_WRONG_COMMAND); | 10067 | DBUG_RETURN(HA_ERR_WRONG_COMMAND); |
1853 | @@ -10431,7 +10433,7 @@ | |||
1854 | 10431 | DBUG_RETURN(HA_ERR_CRASHED); | 10433 | DBUG_RETURN(HA_ERR_CRASHED); |
1855 | 10432 | } | 10434 | } |
1856 | 10433 | 10435 | ||
1858 | 10434 | if (prebuilt->trx->fake_changes) { | 10436 | if (UNIV_UNLIKELY(prebuilt->trx->fake_changes)) { |
1859 | 10435 | DBUG_RETURN(HA_ERR_WRONG_COMMAND); | 10437 | DBUG_RETURN(HA_ERR_WRONG_COMMAND); |
1860 | 10436 | } | 10438 | } |
1861 | 10437 | 10439 | ||
1862 | @@ -10519,7 +10521,7 @@ | |||
1863 | 10519 | 10521 | ||
1864 | 10520 | trx = innobase_trx_allocate(thd); | 10522 | trx = innobase_trx_allocate(thd); |
1865 | 10521 | 10523 | ||
1867 | 10522 | if (trx->fake_changes) { | 10524 | if (UNIV_UNLIKELY(trx->fake_changes)) { |
1868 | 10523 | innobase_commit_low(trx); | 10525 | innobase_commit_low(trx); |
1869 | 10524 | trx_free_for_mysql(trx); | 10526 | trx_free_for_mysql(trx); |
1870 | 10525 | DBUG_RETURN(HA_ERR_WRONG_COMMAND); | 10527 | DBUG_RETURN(HA_ERR_WRONG_COMMAND); |
1871 | @@ -10649,7 +10651,7 @@ | |||
1872 | 10649 | #endif | 10651 | #endif |
1873 | 10650 | trx = innobase_trx_allocate(thd); | 10652 | trx = innobase_trx_allocate(thd); |
1874 | 10651 | 10653 | ||
1876 | 10652 | if (trx->fake_changes) { | 10654 | if (UNIV_UNLIKELY(trx->fake_changes)) { |
1877 | 10653 | my_free(namebuf); | 10655 | my_free(namebuf); |
1878 | 10654 | innobase_commit_low(trx); | 10656 | innobase_commit_low(trx); |
1879 | 10655 | trx_free_for_mysql(trx); | 10657 | trx_free_for_mysql(trx); |
1880 | @@ -10829,7 +10831,7 @@ | |||
1881 | 10829 | trx_search_latch_release_if_reserved(parent_trx); | 10831 | trx_search_latch_release_if_reserved(parent_trx); |
1882 | 10830 | 10832 | ||
1883 | 10831 | trx = innobase_trx_allocate(thd); | 10833 | trx = innobase_trx_allocate(thd); |
1885 | 10832 | if (trx->fake_changes) { | 10834 | if (UNIV_UNLIKELY(trx->fake_changes)) { |
1886 | 10833 | innobase_commit_low(trx); | 10835 | innobase_commit_low(trx); |
1887 | 10834 | trx_free_for_mysql(trx); | 10836 | trx_free_for_mysql(trx); |
1888 | 10835 | DBUG_RETURN(HA_ERR_WRONG_COMMAND); | 10837 | DBUG_RETURN(HA_ERR_WRONG_COMMAND); |
1889 | 10836 | 10838 | ||
1890 | === modified file 'Percona-Server/storage/innobase/lock/lock0lock.cc' | |||
1891 | --- Percona-Server/storage/innobase/lock/lock0lock.cc 2013-08-14 03:57:21 +0000 | |||
1892 | +++ Percona-Server/storage/innobase/lock/lock0lock.cc 2013-10-17 08:14:49 +0000 | |||
1893 | @@ -4415,7 +4415,7 @@ | |||
1894 | 4415 | 4415 | ||
1895 | 4416 | trx = thr_get_trx(thr); | 4416 | trx = thr_get_trx(thr); |
1896 | 4417 | 4417 | ||
1898 | 4418 | if (trx->fake_changes && mode == LOCK_IX) { | 4418 | if (UNIV_UNLIKELY(trx->fake_changes && mode == LOCK_IX)) { |
1899 | 4419 | mode = LOCK_IS; | 4419 | mode = LOCK_IS; |
1900 | 4420 | } | 4420 | } |
1901 | 4421 | 4421 | ||
1902 | @@ -5943,7 +5943,7 @@ | |||
1903 | 5943 | 5943 | ||
1904 | 5944 | trx = thr_get_trx(thr); | 5944 | trx = thr_get_trx(thr); |
1905 | 5945 | 5945 | ||
1907 | 5946 | if (trx->fake_changes) { | 5946 | if (UNIV_UNLIKELY(trx->fake_changes)) { |
1908 | 5947 | return(DB_SUCCESS); | 5947 | return(DB_SUCCESS); |
1909 | 5948 | } | 5948 | } |
1910 | 5949 | 5949 | ||
1911 | @@ -6159,7 +6159,7 @@ | |||
1912 | 6159 | return(DB_SUCCESS); | 6159 | return(DB_SUCCESS); |
1913 | 6160 | } | 6160 | } |
1914 | 6161 | 6161 | ||
1916 | 6162 | if (thr && thr_get_trx(thr)->fake_changes) { | 6162 | if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) { |
1917 | 6163 | return(DB_SUCCESS); | 6163 | return(DB_SUCCESS); |
1918 | 6164 | } | 6164 | } |
1919 | 6165 | 6165 | ||
1920 | @@ -6225,7 +6225,7 @@ | |||
1921 | 6225 | return(DB_SUCCESS); | 6225 | return(DB_SUCCESS); |
1922 | 6226 | } | 6226 | } |
1923 | 6227 | 6227 | ||
1925 | 6228 | if (thr && thr_get_trx(thr)->fake_changes) { | 6228 | if (UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes)) { |
1926 | 6229 | return(DB_SUCCESS); | 6229 | return(DB_SUCCESS); |
1927 | 6230 | } | 6230 | } |
1928 | 6231 | 6231 | ||
1929 | 6232 | 6232 | ||
1930 | === modified file 'Percona-Server/storage/innobase/que/que0que.cc' | |||
1931 | --- Percona-Server/storage/innobase/que/que0que.cc 2013-08-06 15:16:34 +0000 | |||
1932 | +++ Percona-Server/storage/innobase/que/que0que.cc 2013-10-17 08:14:49 +0000 | |||
1933 | @@ -1273,7 +1273,7 @@ | |||
1934 | 1273 | 1273 | ||
1935 | 1274 | ut_a(trx->error_state == DB_SUCCESS); | 1274 | ut_a(trx->error_state == DB_SUCCESS); |
1936 | 1275 | 1275 | ||
1938 | 1276 | if (trx->fake_changes) { | 1276 | if (UNIV_UNLIKELY(trx->fake_changes)) { |
1939 | 1277 | /* fake_changes should not access to system tables */ | 1277 | /* fake_changes should not access to system tables */ |
1940 | 1278 | fprintf(stderr, "InnoDB: ERROR: innodb_fake_changes tried to access to system tables.\n"); | 1278 | fprintf(stderr, "InnoDB: ERROR: innodb_fake_changes tried to access to system tables.\n"); |
1941 | 1279 | return(DB_ERROR); | 1279 | return(DB_ERROR); |
1942 | 1280 | 1280 | ||
1943 | === modified file 'Percona-Server/storage/innobase/row/row0ins.cc' | |||
1944 | --- Percona-Server/storage/innobase/row/row0ins.cc 2013-08-14 03:57:21 +0000 | |||
1945 | +++ Percona-Server/storage/innobase/row/row0ins.cc 2013-10-17 08:14:49 +0000 | |||
1946 | @@ -2757,8 +2757,9 @@ | |||
1947 | 2757 | 2757 | ||
1948 | 2758 | btr_cur_search_to_nth_level( | 2758 | btr_cur_search_to_nth_level( |
1949 | 2759 | index, 0, entry, PAGE_CUR_LE, | 2759 | index, 0, entry, PAGE_CUR_LE, |
1952 | 2760 | thr_get_trx(thr)->fake_changes ? BTR_SEARCH_LEAF : | 2760 | UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes) |
1953 | 2761 | (btr_latch_mode) | 2761 | ? BTR_SEARCH_LEAF |
1954 | 2762 | : (btr_latch_mode) | ||
1955 | 2762 | (search_mode & ~(BTR_INSERT | BTR_IGNORE_SEC_UNIQUE)), | 2763 | (search_mode & ~(BTR_INSERT | BTR_IGNORE_SEC_UNIQUE)), |
1956 | 2763 | &cursor, 0, __FILE__, __LINE__, &mtr); | 2764 | &cursor, 0, __FILE__, __LINE__, &mtr); |
1957 | 2764 | } | 2765 | } |
1958 | 2765 | 2766 | ||
1959 | === modified file 'Percona-Server/storage/innobase/row/row0upd.cc' | |||
1960 | --- Percona-Server/storage/innobase/row/row0upd.cc 2013-08-06 15:16:34 +0000 | |||
1961 | +++ Percona-Server/storage/innobase/row/row0upd.cc 2013-10-17 08:14:49 +0000 | |||
1962 | @@ -1751,7 +1751,7 @@ | |||
1963 | 1751 | btr_pcur_get_btr_cur(&pcur)->thr = thr; | 1751 | btr_pcur_get_btr_cur(&pcur)->thr = thr; |
1964 | 1752 | 1752 | ||
1965 | 1753 | search_result = row_search_index_entry(index, entry, | 1753 | search_result = row_search_index_entry(index, entry, |
1967 | 1754 | trx->fake_changes | 1754 | UNIV_UNLIKELY(trx->fake_changes) |
1968 | 1755 | ? BTR_SEARCH_LEAF | 1755 | ? BTR_SEARCH_LEAF |
1969 | 1756 | : (btr_latch_mode)mode, | 1756 | : (btr_latch_mode)mode, |
1970 | 1757 | &pcur, &mtr); | 1757 | &pcur, &mtr); |
1971 | @@ -2015,7 +2015,7 @@ | |||
1972 | 2015 | the previous invocation of this function. Mark the | 2015 | the previous invocation of this function. Mark the |
1973 | 2016 | off-page columns in the entry inherited. */ | 2016 | off-page columns in the entry inherited. */ |
1974 | 2017 | 2017 | ||
1976 | 2018 | if (!(trx->fake_changes)) { | 2018 | if (UNIV_LIKELY(!trx->fake_changes)) { |
1977 | 2019 | change_ownership = row_upd_clust_rec_by_insert_inherit( | 2019 | change_ownership = row_upd_clust_rec_by_insert_inherit( |
1978 | 2020 | NULL, NULL, entry, node->update); | 2020 | NULL, NULL, entry, node->update); |
1979 | 2021 | ut_a(change_ownership); | 2021 | ut_a(change_ownership); |
1980 | @@ -2049,7 +2049,8 @@ | |||
1981 | 2049 | delete-marked old record, mark them disowned by the | 2049 | delete-marked old record, mark them disowned by the |
1982 | 2050 | old record and owned by the new entry. */ | 2050 | old record and owned by the new entry. */ |
1983 | 2051 | 2051 | ||
1985 | 2052 | if (rec_offs_any_extern(offsets) && !(trx->fake_changes)) { | 2052 | if (rec_offs_any_extern(offsets) |
1986 | 2053 | && UNIV_LIKELY(!(trx->fake_changes))) { | ||
1987 | 2053 | change_ownership = row_upd_clust_rec_by_insert_inherit( | 2054 | change_ownership = row_upd_clust_rec_by_insert_inherit( |
1988 | 2054 | rec, offsets, entry, node->update); | 2055 | rec, offsets, entry, node->update); |
1989 | 2055 | 2056 | ||
1990 | @@ -2204,9 +2205,10 @@ | |||
1991 | 2204 | the same transaction do not modify the record in the meantime. | 2205 | the same transaction do not modify the record in the meantime. |
1992 | 2205 | Therefore we can assert that the restoration of the cursor succeeds. */ | 2206 | Therefore we can assert that the restoration of the cursor succeeds. */ |
1993 | 2206 | 2207 | ||
1997 | 2207 | ut_a(btr_pcur_restore_position(thr_get_trx(thr)->fake_changes | 2208 | ut_a(btr_pcur_restore_position( |
1998 | 2208 | ? BTR_SEARCH_TREE : BTR_MODIFY_TREE, | 2209 | UNIV_UNLIKELY(thr_get_trx(thr)->fake_changes) |
1999 | 2209 | pcur, mtr)); | 2210 | ? BTR_SEARCH_TREE : BTR_MODIFY_TREE, |
2000 | 2211 | pcur, mtr)); | ||
2001 | 2210 | 2212 | ||
2002 | 2211 | ut_ad(!rec_get_deleted_flag(btr_pcur_get_rec(pcur), | 2213 | ut_ad(!rec_get_deleted_flag(btr_pcur_get_rec(pcur), |
2003 | 2212 | dict_table_is_comp(index->table))); | 2214 | dict_table_is_comp(index->table))); |
2004 | @@ -2220,7 +2222,7 @@ | |||
2005 | 2220 | &offsets, offsets_heap, heap, &big_rec, | 2222 | &offsets, offsets_heap, heap, &big_rec, |
2006 | 2221 | node->update, node->cmpl_info, | 2223 | node->update, node->cmpl_info, |
2007 | 2222 | thr, thr_get_trx(thr)->id, mtr); | 2224 | thr, thr_get_trx(thr)->id, mtr); |
2009 | 2223 | if (big_rec && !(thr_get_trx(thr)->fake_changes)) { | 2225 | if (big_rec && UNIV_LIKELY(!(thr_get_trx(thr)->fake_changes))) { |
2010 | 2224 | ut_a(err == DB_SUCCESS); | 2226 | ut_a(err == DB_SUCCESS); |
2011 | 2225 | /* Write out the externally stored | 2227 | /* Write out the externally stored |
2012 | 2226 | columns while still x-latching | 2228 | columns while still x-latching |
Same comment as for the 5.5 MP.