Skip to content

Commit 65b0914

Browse files
lkotulalkotula
committed
Bug#36245953 post push fix
X Plugin that is starting in background, increments some server/status variables. The test that fails randomly, prints those status variales in result file. There is a race between X Plugin and the test, which restults in printing different values into the result files. Change-Id: I970eaaaf7c8e646bb3b3ba50776e9d72949ccf2e
1 parent 651ec81 commit 65b0914

File tree

4 files changed

+42
-41
lines changed

4 files changed

+42
-41
lines changed

‎mysql-test/r/deprecate_eof.result

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ SELECT * FROM t1 ORDER BY 1;
2525
END |
2626
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
2727
-- statement_id
28-
-- 17
28+
-- 13
2929

3030
CALL t1_sel();
3131
a
3232
1
3333
2
3434
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
3535
-- statement_id
36-
-- 20
36+
-- 16
3737

3838
-- Tracker : SESSION_TRACK_STATE_CHANGE
3939
-- 1
@@ -47,7 +47,7 @@ SELECT "session state sent as part of above SELECT" AS col_heading;
4747
END |
4848
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
4949
-- statement_id
50-
-- 21
50+
-- 17
5151

5252
CALL t1_inssel();
5353
a
@@ -57,7 +57,7 @@ a
5757
4
5858
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
5959
-- statement_id
60-
-- 25
60+
-- 21
6161

6262
-- Tracker : SESSION_TRACK_STATE_CHANGE
6363
-- 1
@@ -72,7 +72,7 @@ SELECT "no session state exists" AS col_heading;
7272
END |
7373
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
7474
-- statement_id
75-
-- 27
75+
-- 23
7676

7777
CALL t1_selins();
7878
a
@@ -82,7 +82,7 @@ a
8282
4
8383
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
8484
-- statement_id
85-
-- 29
85+
-- 25
8686

8787
col_heading
8888
no session state exists
@@ -95,15 +95,15 @@ SELECT MAX(2) FROM t1;
9595
END |
9696
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
9797
-- statement_id
98-
-- 32
98+
-- 28
9999

100100
session state sent for both SELECT statement
101101
CALL t2t1_sel();
102102
MIN(a)
103103
1
104104
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
105105
-- statement_id
106-
-- 35
106+
-- 31
107107

108108
-- Tracker : SESSION_TRACK_STATE_CHANGE
109109
-- 1
@@ -125,7 +125,7 @@ SELECT "session state sent for SELECT inside t1_sel()" AS col_heading;
125125
END |
126126
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
127127
-- statement_id
128-
-- 38
128+
-- 34
129129

130130
CALL t1_call();
131131
a
@@ -137,7 +137,7 @@ a
137137
6
138138
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
139139
-- statement_id
140-
-- 43
140+
-- 39
141141

142142
-- Tracker : SESSION_TRACK_STATE_CHANGE
143143
-- 1
@@ -173,7 +173,7 @@ SELECT * FROM t2;
173173
END |
174174
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
175175
-- statement_id
176-
-- 45
176+
-- 41
177177

178178
Warnings:
179179
Warning 1681 Specifying number of digits for floating point data types is deprecated and will be removed in a future release.
@@ -188,7 +188,7 @@ a
188188
6
189189
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
190190
-- statement_id
191-
-- 59
191+
-- 55
192192
-- time_zone
193193
-- Europe/Moscow
194194

@@ -210,7 +210,7 @@ SELECT @a,@b,@c,@d,@e,@f,@g,@h,@i,@j;
210210
20 test_1 12.34 567.891 2345 NULL test_2 67.891 234.6789 6789
211211
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
212212
-- statement_id
213-
-- 62
213+
-- 58
214214

215215

216216
#CASE2: SELECT FUNCTIONs
@@ -222,7 +222,7 @@ RETURN (SELECT COUNT(*) FROM t1);
222222
END |
223223
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
224224
-- statement_id
225-
-- 63
225+
-- 59
226226

227227
SELECT f1();
228228
f1()
@@ -235,15 +235,15 @@ f1()
235235
-- character_set_results
236236
-- big5
237237
-- statement_id
238-
-- 64
238+
-- 60
239239

240240
-- Tracker : SESSION_TRACK_STATE_CHANGE
241241
-- 1
242242

243243
CREATE VIEW v1 AS SELECT f1();
244244
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
245245
-- statement_id
246-
-- 67
246+
-- 63
247247

248248
SELECT * FROM v1;
249249
f1()
@@ -256,7 +256,7 @@ f1()
256256
-- character_set_results
257257
-- big5
258258
-- statement_id
259-
-- 68
259+
-- 64
260260

261261
-- Tracker : SESSION_TRACK_STATE_CHANGE
262262
-- 1
@@ -267,7 +267,7 @@ SELECT MIN(a) INTO x FROM t1;
267267
END |
268268
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
269269
-- statement_id
270-
-- 71
270+
-- 67
271271

272272
CREATE FUNCTION f2() RETURNS int
273273
BEGIN
@@ -278,14 +278,14 @@ RETURN a;
278278
END |
279279
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
280280
-- statement_id
281-
-- 72
281+
-- 68
282282

283283
SELECT f2();
284284
f2()
285285
1
286286
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
287287
-- statement_id
288-
-- 73
288+
-- 69
289289

290290
-- Tracker : SESSION_TRACK_STATE_CHANGE
291291
-- 1
@@ -302,14 +302,14 @@ RETURN a + b;
302302
END |
303303
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
304304
-- statement_id
305-
-- 79
305+
-- 75
306306

307307
SELECT f3();
308308
f3()
309309
6
310310
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
311311
-- statement_id
312-
-- 80
312+
-- 76
313313

314314
-- Tracker : SESSION_TRACK_STATE_CHANGE
315315
-- 1
@@ -327,7 +327,7 @@ RETURN x;
327327
END |
328328
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
329329
-- statement_id
330-
-- 89
330+
-- 85
331331

332332
Warnings:
333333
Warning 1287 'utf8mb3' is deprecated and will be removed in a future release. Please use utf8mb4 instead
@@ -342,7 +342,7 @@ f4()
342342
-- character_set_results
343343
-- utf8mb3
344344
-- statement_id
345-
-- 91
345+
-- 87
346346

347347
-- Tracker : SESSION_TRACK_STATE_CHANGE
348348
-- 1
@@ -369,14 +369,14 @@ CLOSE cur1;
369369
END |
370370
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
371371
-- statement_id
372-
-- 97
372+
-- 93
373373

374374
CALL cursor1();
375375
v1
376376
6
377377
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
378378
-- statement_id
379-
-- 111
379+
-- 107
380380
-- transaction_isolation
381381
-- READ-COMMITTED
382382

@@ -401,14 +401,14 @@ CLOSE c2;
401401
END |
402402
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
403403
-- statement_id
404-
-- 112
404+
-- 108
405405

406406
CALL cursor2();
407407
(x+y)
408408
2
409409
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
410410
-- statement_id
411-
-- 119
411+
-- 115
412412
-- transaction_isolation
413413
-- READ-COMMITTED
414414

@@ -420,7 +420,7 @@ session state sent as part of above SELECT
420420
DROP DATABASE wl7766;
421421
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
422422
-- statement_id
423-
-- 121
423+
-- 117
424424

425425
-- Tracker : SESSION_TRACK_SCHEMA
426426
--
@@ -434,17 +434,17 @@ SET @@session.session_track_state_change=ON;
434434
-- session_track_state_change
435435
-- ON
436436
-- statement_id
437-
-- 122
437+
-- 118
438438

439439
CREATE DATABASE bug19550875;
440440
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
441441
-- statement_id
442-
-- 123
442+
-- 119
443443

444444
USE bug19550875;
445445
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
446446
-- statement_id
447-
-- 124
447+
-- 120
448448

449449
-- Tracker : SESSION_TRACK_SCHEMA
450450
-- bug19550875
@@ -455,12 +455,12 @@ USE bug19550875;
455455
CREATE TABLE t1 (a int);
456456
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
457457
-- statement_id
458-
-- 125
458+
-- 121
459459

460460
INSERT INTO t1 VALUES (1), (2);
461461
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
462462
-- statement_id
463-
-- 126
463+
-- 122
464464

465465
CREATE PROCEDURE t_cache()
466466
BEGIN
@@ -473,15 +473,15 @@ SELECT * FROM t1;
473473
END |
474474
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
475475
-- statement_id
476-
-- 127
476+
-- 123
477477

478478
CALL t_cache();
479479
a
480480
1
481481
2
482482
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
483483
-- statement_id
484-
-- 130
484+
-- 126
485485

486486
-- Tracker : SESSION_TRACK_STATE_CHANGE
487487
-- 1
@@ -505,21 +505,21 @@ SELECT * FROM t1 ORDER BY 1;
505505
END |
506506
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
507507
-- statement_id
508-
-- 135
508+
-- 131
509509

510510
CREATE PROCEDURE sel_with_no_session()
511511
BEGIN
512512
SELECT * FROM t1 ORDER BY 1;
513513
END |
514514
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
515515
-- statement_id
516-
-- 136
516+
-- 132
517517

518518
#cleanup
519519
DROP DATABASE bug19550875;
520520
-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES
521521
-- statement_id
522-
-- 137
522+
-- 133
523523

524524
-- Tracker : SESSION_TRACK_SCHEMA
525525
--

‎mysql-test/suite/auth_sec/t/mysql_protocol_types-master.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--local-infile=true
1+
--local-infile=true --loose-mysqlx=0

‎mysql-test/t/deprecate_eof-master.opt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--loose-mysqlx=0

‎plugin/x/src/server/builder/ssl_context_builder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Ssl_context_builder::get_mysqld_ssl_config() const {
6767
}
6868
} catch (const ngs::Error_code &DEBUG_VAR(e)) {
6969
log_debug(
70-
"Can't get 'mysql_main' tls channels state - error: %i, messate: %s",
70+
"Can't get 'mysql_main' tls channels state - error: %i, message: %s",
7171
e.error, e.message.c_str());
7272
}
7373

0 commit comments

Comments
 (0)