Debian Codegraph @

mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.rdiff

raw
1 --- rpl_sp.result 2024-06-02 12:49:36.425852985 +0400
2 +++ rpl_sp,myisam,mix.reject 2024-06-02 13:14:01.023420644 +0400
3 @@ -126,12 +126,15 @@
4 show warnings;
5 Level Code Message
6 Error 1062 Duplicate entry '20' for key 'a'
7 +Warning 1196 Some non-transactional changed tables couldn't be rolled back
8 Note 4094 At line 4 in mysqltest1.foo4
9 select * from t2;
10 a
11 +20
12 connection slave;
13 select * from t2;
14 a
15 +20
16 select * from mysql.proc where name="foo4" and db='mysqltest1';
17 db name type specific_name language sql_data_access is_deterministic security_type param_list returns body definer created modified sql_mode comment character_set_client collation_connection db_collation body_utf8 aggregate
18 mysqltest1 foo4 PROCEDURE foo4 SQL CONTAINS_SQL YES DEFINER begin
19 @@ -171,20 +174,16 @@
20 insert into t2 values(fn1(21));
21 select * from t1;
22 a
23 -15
24 20
25 21
26 -5
27 select * from t2;
28 a
29 23
30 connection slave;
31 select * from t1;
32 a
33 -15
34 20
35 21
36 -5
37 select * from t2;
38 a
39 23
40 @@ -292,13 +291,18 @@
41 Warnings:
42 Error 1062 Duplicate entry '100' for key 'a'
43 Note 4094 At line 3 in mysqltest1.fn1
44 +Warning 1196 Some non-transactional changed tables couldn't be rolled back
45 select fn1(20);
46 ERROR 23000: Duplicate entry '20' for key 'a'
47 select * from t2;
48 a
49 +20
50 +100
51 connection slave;
52 select * from t2;
53 a
54 +20
55 +100
56 connection con1;
57 create trigger trg before insert on t1 for each row set new.a= 10;
58 ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table `mysqltest1`.`t1`
59 @@ -472,13 +476,13 @@
60 end
61 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
62 master-bin.000001 # Query # # use `mysqltest1`; insert into t1 values ( NAME_CONST('b',8))
63 -master-bin.000001 # Xid # # COMMIT /* XID */
64 +master-bin.000001 # Query # # COMMIT
65 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
66 master-bin.000001 # Query # # use `mysqltest1`; insert into t1 values (unix_timestamp())
67 -master-bin.000001 # Xid # # COMMIT /* XID */
68 +master-bin.000001 # Query # # COMMIT
69 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
70 master-bin.000001 # Query # # use `mysqltest1`; delete from t1
71 -master-bin.000001 # Xid # # COMMIT /* XID */
72 +master-bin.000001 # Query # # COMMIT
73 master-bin.000001 # Gtid # # GTID #-#-#
74 master-bin.000001 # Query # # use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo2`()
75 select * from mysqltest1.t1
76 @@ -509,24 +513,24 @@
77 end
78 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
79 master-bin.000001 # Query # # use `mysqltest1`; insert into t2 values(3)
80 -master-bin.000001 # Xid # # COMMIT /* XID */
81 +master-bin.000001 # Query # # COMMIT
82 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
83 master-bin.000001 # Query # # use `mysqltest1`; insert into t1 values (15)
84 -master-bin.000001 # Xid # # COMMIT /* XID */
85 +master-bin.000001 # Query # # COMMIT
86 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
87 master-bin.000001 # Query # # use `mysqltest1`; insert into t2 values(3)
88 -master-bin.000001 # Xid # # COMMIT /* XID */
89 +master-bin.000001 # Query # # COMMIT
90 master-bin.000001 # Gtid # # GTID #-#-#
91 master-bin.000001 # Query # # use `mysqltest1`; alter procedure foo4 sql security invoker
92 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
93 master-bin.000001 # Query # # use `mysqltest1`; insert into t2 values(3)
94 -master-bin.000001 # Xid # # COMMIT /* XID */
95 +master-bin.000001 # Query # # COMMIT
96 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
97 master-bin.000001 # Query # # use `mysqltest1`; insert into t1 values (5)
98 -master-bin.000001 # Xid # # COMMIT /* XID */
99 +master-bin.000001 # Query # # COMMIT
100 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
101 master-bin.000001 # Query # # use `mysqltest1`; delete from t2
102 -master-bin.000001 # Xid # # COMMIT /* XID */
103 +master-bin.000001 # Query # # COMMIT
104 master-bin.000001 # Gtid # # GTID #-#-#
105 master-bin.000001 # Query # # use `mysqltest1`; alter table t2 add unique (a)
106 master-bin.000001 # Gtid # # GTID #-#-#
107 @@ -537,6 +541,9 @@
108 begin
109 insert into t2 values(20),(20);
110 end
111 +master-bin.000001 # Gtid # # BEGIN GTID #-#-#
112 +master-bin.000001 # Query # # use `mysqltest1`; insert into t2 values(20),(20)
113 +master-bin.000001 # Query # # COMMIT
114 master-bin.000001 # Gtid # # GTID #-#-#
115 master-bin.000001 # Query # # use `mysqltest1`; drop procedure foo4
116 master-bin.000001 # Gtid # # GTID #-#-#
117 @@ -557,10 +564,10 @@
118 master-bin.000001 # Query # # COMMIT
119 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
120 master-bin.000001 # Query # # use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
121 -master-bin.000001 # Xid # # COMMIT /* XID */
122 +master-bin.000001 # Query # # COMMIT
123 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
124 master-bin.000001 # Query # # use `mysqltest1`; insert into t2 values(fn1(21))
125 -master-bin.000001 # Xid # # COMMIT /* XID */
126 +master-bin.000001 # Query # # COMMIT
127 master-bin.000001 # Gtid # # GTID #-#-#
128 master-bin.000001 # Query # # use `mysqltest1`; drop function fn1
129 master-bin.000001 # Gtid # # GTID #-#-#
130 @@ -571,10 +578,10 @@
131 end
132 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
133 master-bin.000001 # Query # # use `mysqltest1`; delete from t1
134 -master-bin.000001 # Xid # # COMMIT /* XID */
135 +master-bin.000001 # Query # # COMMIT
136 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
137 master-bin.000001 # Query # # use `mysqltest1`; insert into t1 values(fn1())
138 -master-bin.000001 # Xid # # COMMIT /* XID */
139 +master-bin.000001 # Query # # COMMIT
140 master-bin.000001 # Gtid # # GTID #-#-#
141 master-bin.000001 # Query # # use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` FUNCTION `fn2`() RETURNS int(11)
142 NO SQL
143 @@ -589,7 +596,7 @@
144 end
145 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
146 master-bin.000001 # Query # # use `mysqltest1`; delete from t2
147 -master-bin.000001 # Xid # # COMMIT /* XID */
148 +master-bin.000001 # Query # # COMMIT
149 master-bin.000001 # Gtid # # GTID #-#-#
150 master-bin.000001 # Query # # use `mysqltest1`; alter table t2 add unique (a)
151 master-bin.000001 # Gtid # # GTID #-#-#
152 @@ -601,21 +608,27 @@
153 return 10;
154 end
155 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
156 +master-bin.000001 # Query # # use `mysqltest1`; SELECT `mysqltest1`.`fn1`(100)
157 +master-bin.000001 # Query # # COMMIT
158 +master-bin.000001 # Gtid # # BEGIN GTID #-#-#
159 +master-bin.000001 # Query # # use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
160 +master-bin.000001 # Query # # COMMIT
161 +master-bin.000001 # Gtid # # BEGIN GTID #-#-#
162 master-bin.000001 # Query # # use `mysqltest1`; delete from t1
163 -master-bin.000001 # Xid # # COMMIT /* XID */
164 +master-bin.000001 # Query # # COMMIT
165 master-bin.000001 # Gtid # # GTID #-#-#
166 master-bin.000001 # Query # # use `mysqltest1`; CREATE DEFINER=`root`@`localhost` trigger trg before insert on t1 for each row set new.a= 10
167 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
168 master-bin.000001 # Query # # use `mysqltest1`; insert into t1 values (1)
169 -master-bin.000001 # Xid # # COMMIT /* XID */
170 +master-bin.000001 # Query # # COMMIT
171 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
172 master-bin.000001 # Query # # use `mysqltest1`; delete from t1
173 -master-bin.000001 # Xid # # COMMIT /* XID */
174 +master-bin.000001 # Query # # COMMIT
175 master-bin.000001 # Gtid # # GTID #-#-#
176 master-bin.000001 # Query # # use `mysqltest1`; drop trigger trg
177 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
178 master-bin.000001 # Query # # use `mysqltest1`; insert into t1 values (1)
179 -master-bin.000001 # Xid # # COMMIT /* XID */
180 +master-bin.000001 # Query # # COMMIT
181 master-bin.000001 # Gtid # # GTID #-#-#
182 master-bin.000001 # Query # # use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo`()
183 READS SQL DATA
184 @@ -647,7 +660,7 @@
185 master-bin.000001 # Query # # use `test`; create table t1 (a int)
186 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
187 master-bin.000001 # Query # # use `test`; insert into t1 (a) values (f1())
188 -master-bin.000001 # Xid # # COMMIT /* XID */
189 +master-bin.000001 # Query # # COMMIT
190 master-bin.000001 # Gtid # # GTID #-#-#
191 master-bin.000001 # Query # # use `test`; drop view v1
192 master-bin.000001 # Gtid # # GTID #-#-#
193 @@ -663,7 +676,7 @@
194 INSERT INTO t1 VALUES(arg)
195 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
196 master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES( NAME_CONST('arg',_utf8mb4'test' COLLATE 'utf8mb4_uca1400_ai_ci'))
197 -master-bin.000001 # Xid # # COMMIT /* XID */
198 +master-bin.000001 # Query # # COMMIT
199 master-bin.000001 # Gtid # # GTID #-#-#
200 master-bin.000001 # Query # # use `test`; DROP PROCEDURE p1
201 master-bin.000001 # Gtid # # GTID #-#-#
202 @@ -697,7 +710,7 @@
203 begin end
204 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
205 master-bin.000001 # Query # # use `mysqltest2`; insert into t values ( 1 )
206 -master-bin.000001 # Xid # # COMMIT /* XID */
207 +master-bin.000001 # Query # # COMMIT
208 master-bin.000001 # Gtid # # GTID #-#-#
209 master-bin.000001 # Query # # use `mysqltest2`; CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
210 begin
211 @@ -706,7 +719,7 @@
212 end
213 master-bin.000001 # Gtid # # BEGIN GTID #-#-#
214 master-bin.000001 # Query # # use `mysqltest`; SELECT `mysqltest2`.`f1`()
215 -master-bin.000001 # Xid # # COMMIT /* XID */
216 +master-bin.000001 # Query # # COMMIT
217 connection slave;
218 set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
219 connection master;
220 @@ -801,19 +814,25 @@
221 SET TIMESTAMP=t/*!*/;
222 insert into t1 values ( NAME_CONST('b',8))
223 /*!*/;
224 -COMMIT/*!*/;
225 +SET TIMESTAMP=t/*!*/;
226 +COMMIT
227 +/*!*/;
228 START TRANSACTION
229 /*!*/;
230 SET TIMESTAMP=t/*!*/;
231 insert into t1 values (unix_timestamp())
232 /*!*/;
233 -COMMIT/*!*/;
234 +SET TIMESTAMP=t/*!*/;
235 +COMMIT
236 +/*!*/;
237 START TRANSACTION
238 /*!*/;
239 SET TIMESTAMP=t/*!*/;
240 delete from t1
241 /*!*/;
242 -COMMIT/*!*/;
243 +SET TIMESTAMP=t/*!*/;
244 +COMMIT
245 +/*!*/;
246 SET TIMESTAMP=t/*!*/;
247 CREATE DEFINER=`root`@`localhost` PROCEDURE `foo2`()
248 select * from mysqltest1.t1
249 @@ -858,21 +877,27 @@
250 SET TIMESTAMP=t/*!*/;
251 insert into t2 values(3)
252 /*!*/;
253 -COMMIT/*!*/;
254 +SET TIMESTAMP=t/*!*/;
255 +COMMIT
256 +/*!*/;
257 START TRANSACTION
258 /*!*/;
259 SET TIMESTAMP=t/*!*/;
260 SET @@session.sql_mode=0/*!*/;
261 insert into t1 values (15)
262 /*!*/;
263 -COMMIT/*!*/;
264 +SET TIMESTAMP=t/*!*/;
265 +COMMIT
266 +/*!*/;
267 START TRANSACTION
268 /*!*/;
269 SET TIMESTAMP=t/*!*/;
270 SET @@session.sql_mode=1411383296/*!*/;
271 insert into t2 values(3)
272 /*!*/;
273 -COMMIT/*!*/;
274 +SET TIMESTAMP=t/*!*/;
275 +COMMIT
276 +/*!*/;
277 SET TIMESTAMP=t/*!*/;
278 SET @@session.sql_mode=0/*!*/;
279 alter procedure foo4 sql security invoker
280 @@ -883,20 +908,26 @@
281 SET @@session.sql_mode=1411383296/*!*/;
282 insert into t2 values(3)
283 /*!*/;
284 -COMMIT/*!*/;
285 +SET TIMESTAMP=t/*!*/;
286 +COMMIT
287 +/*!*/;
288 START TRANSACTION
289 /*!*/;
290 SET TIMESTAMP=t/*!*/;
291 insert into t1 values (5)
292 /*!*/;
293 -COMMIT/*!*/;
294 +SET TIMESTAMP=t/*!*/;
295 +COMMIT
296 +/*!*/;
297 START TRANSACTION
298 /*!*/;
299 SET TIMESTAMP=t/*!*/;
300 SET @@session.sql_mode=0/*!*/;
301 delete from t2
302 /*!*/;
303 -COMMIT/*!*/;
304 +SET TIMESTAMP=t/*!*/;
305 +COMMIT
306 +/*!*/;
307 SET TIMESTAMP=t/*!*/;
308 alter table t2 add unique (a)
309 /*!*/;
310 @@ -910,6 +941,14 @@
311 insert into t2 values(20),(20);
312 end
313 /*!*/;
314 +START TRANSACTION
315 +/*!*/;
316 +SET TIMESTAMP=t/*!*/;
317 +insert into t2 values(20),(20)
318 +/*!*/;
319 +SET TIMESTAMP=t/*!*/;
320 +COMMIT
321 +/*!*/;
322 SET TIMESTAMP=t/*!*/;
323 drop procedure foo4
324 /*!*/;
325 @@ -943,13 +982,17 @@
326 SET TIMESTAMP=t/*!*/;
327 SELECT `mysqltest1`.`fn1`(20)
328 /*!*/;
329 -COMMIT/*!*/;
330 +SET TIMESTAMP=t/*!*/;
331 +COMMIT
332 +/*!*/;
333 START TRANSACTION
334 /*!*/;
335 SET TIMESTAMP=t/*!*/;
336 insert into t2 values(fn1(21))
337 /*!*/;
338 -COMMIT/*!*/;
339 +SET TIMESTAMP=t/*!*/;
340 +COMMIT
341 +/*!*/;
342 SET TIMESTAMP=t/*!*/;
343 drop function fn1
344 /*!*/;
345 @@ -965,13 +1008,17 @@
346 SET TIMESTAMP=t/*!*/;
347 delete from t1
348 /*!*/;
349 -COMMIT/*!*/;
350 +SET TIMESTAMP=t/*!*/;
351 +COMMIT
352 +/*!*/;
353 START TRANSACTION
354 /*!*/;
355 SET TIMESTAMP=t/*!*/;
356 insert into t1 values(fn1())
357 /*!*/;
358 -COMMIT/*!*/;
359 +SET TIMESTAMP=t/*!*/;
360 +COMMIT
361 +/*!*/;
362 SET TIMESTAMP=t/*!*/;
363 SET @@session.sql_mode=1411383296/*!*/;
364 CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` FUNCTION `fn2`() RETURNS int(11)
365 @@ -993,7 +1040,9 @@
366 SET TIMESTAMP=t/*!*/;
367 delete from t2
368 /*!*/;
369 -COMMIT/*!*/;
370 +SET TIMESTAMP=t/*!*/;
371 +COMMIT
372 +/*!*/;
373 SET TIMESTAMP=t/*!*/;
374 alter table t2 add unique (a)
375 /*!*/;
376 @@ -1010,9 +1059,27 @@
377 START TRANSACTION
378 /*!*/;
379 SET TIMESTAMP=t/*!*/;
380 +SELECT `mysqltest1`.`fn1`(100)
381 +/*!*/;
382 +SET TIMESTAMP=t/*!*/;
383 +COMMIT
384 +/*!*/;
385 +START TRANSACTION
386 +/*!*/;
387 +SET TIMESTAMP=t/*!*/;
388 +SELECT `mysqltest1`.`fn1`(20)
389 +/*!*/;
390 +SET TIMESTAMP=t/*!*/;
391 +COMMIT
392 +/*!*/;
393 +START TRANSACTION
394 +/*!*/;
395 +SET TIMESTAMP=t/*!*/;
396 delete from t1
397 /*!*/;
398 -COMMIT/*!*/;
399 +SET TIMESTAMP=t/*!*/;
400 +COMMIT
401 +/*!*/;
402 SET TIMESTAMP=t/*!*/;
403 CREATE DEFINER=`root`@`localhost` trigger trg before insert on t1 for each row set new.a= 10
404 /*!*/;
405 @@ -1021,13 +1088,17 @@
406 SET TIMESTAMP=t/*!*/;
407 insert into t1 values (1)
408 /*!*/;
409 -COMMIT/*!*/;
410 +SET TIMESTAMP=t/*!*/;
411 +COMMIT
412 +/*!*/;
413 START TRANSACTION
414 /*!*/;
415 SET TIMESTAMP=t/*!*/;
416 delete from t1
417 /*!*/;
418 -COMMIT/*!*/;
419 +SET TIMESTAMP=t/*!*/;
420 +COMMIT
421 +/*!*/;
422 SET TIMESTAMP=t/*!*/;
423 drop trigger trg
424 /*!*/;
425 @@ -1036,7 +1107,9 @@
426 SET TIMESTAMP=t/*!*/;
427 insert into t1 values (1)
428 /*!*/;
429 -COMMIT/*!*/;
430 +SET TIMESTAMP=t/*!*/;
431 +COMMIT
432 +/*!*/;
433 SET TIMESTAMP=t/*!*/;
434 CREATE DEFINER=`root`@`localhost` PROCEDURE `foo`()
435 READS SQL DATA
436 @@ -1081,7 +1154,9 @@
437 SET TIMESTAMP=t/*!*/;
438 insert into t1 (a) values (f1())
439 /*!*/;
440 -COMMIT/*!*/;
441 +SET TIMESTAMP=t/*!*/;
442 +COMMIT
443 +/*!*/;
444 SET TIMESTAMP=t/*!*/;
445 drop view v1
446 /*!*/;
447 @@ -1106,7 +1181,9 @@
448 SET TIMESTAMP=t/*!*/;
449 INSERT INTO t1 VALUES( NAME_CONST('arg',_utf8mb4'test' COLLATE 'utf8mb4_uca1400_ai_ci'))
450 /*!*/;
451 -COMMIT/*!*/;
452 +SET TIMESTAMP=t/*!*/;
453 +COMMIT
454 +/*!*/;
455 SET TIMESTAMP=t/*!*/;
456 DROP PROCEDURE p1
457 /*!*/;
458 @@ -1158,7 +1235,9 @@
459 SET TIMESTAMP=t/*!*/;
460 insert into t values ( 1 )
461 /*!*/;
462 -COMMIT/*!*/;
463 +SET TIMESTAMP=t/*!*/;
464 +COMMIT
465 +/*!*/;
466 SET TIMESTAMP=t/*!*/;
467 CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
468 begin
469 @@ -1172,7 +1251,9 @@
470 SET TIMESTAMP=t/*!*/;
471 SELECT `mysqltest2`.`f1`()
472 /*!*/;
473 -COMMIT/*!*/;
474 +SET TIMESTAMP=t/*!*/;
475 +COMMIT
476 +/*!*/;
477 SET TIMESTAMP=t/*!*/;
478 drop database mysqltest
479 /*!*/;