Skip to content

Commit fa5c314

Browse files
vuvovavuvova
committed
fix spider tests for --ps in 10.6
see also c3a1ba0, 068246c, 690ae1d
1 parent ff9150f commit fa5c314

File tree

201 files changed

+1369
-1345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+1369
-1345
lines changed

‎storage/spider/mysql-test/spider/bg/t/basic_sql.test

Lines changed: 90 additions & 90 deletions
Large diffs are not rendered by default.

‎storage/spider/mysql-test/spider/bg/t/basic_sql_part.test

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ if ($HAVE_PARTITION)
176176
--connection child2_2
177177
if ($USE_GENERAL_LOG)
178178
{
179-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
179+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
180180
}
181181
eval $CHILD2_2_SELECT_TABLES;
182182
--connection child2_1
183183
if ($USE_GENERAL_LOG)
184184
{
185-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
185+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
186186
}
187187
eval $CHILD2_1_SELECT_TABLES2;
188188
if (!$OUTPUT_CHILD_GROUP2)
@@ -235,12 +235,12 @@ if ($HAVE_PARTITION)
235235
--connection child2_2
236236
if ($USE_GENERAL_LOG)
237237
{
238-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
238+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
239239
}
240240
--connection child2_1
241241
if ($USE_GENERAL_LOG)
242242
{
243-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
243+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
244244
}
245245
if (!$OUTPUT_CHILD_GROUP2)
246246
{
@@ -290,12 +290,12 @@ if ($HAVE_PARTITION)
290290
--connection child2_2
291291
if ($USE_GENERAL_LOG)
292292
{
293-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
293+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
294294
}
295295
--connection child2_1
296296
if ($USE_GENERAL_LOG)
297297
{
298-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
298+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
299299
}
300300
if (!$OUTPUT_CHILD_GROUP2)
301301
{
@@ -344,15 +344,15 @@ if ($HAVE_PARTITION)
344344
--connection child2_2
345345
if ($USE_GENERAL_LOG)
346346
{
347-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
348-
SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
347+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
348+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
349349
}
350350
eval $CHILD2_2_SELECT_TABLES;
351351
--connection child2_1
352352
if ($USE_GENERAL_LOG)
353353
{
354-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
355-
SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
354+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
355+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
356356
}
357357
eval $CHILD2_1_SELECT_TABLES2;
358358
if (!$OUTPUT_CHILD_GROUP2)
@@ -404,15 +404,15 @@ if ($HAVE_PARTITION)
404404
--connection child2_2
405405
if ($USE_GENERAL_LOG)
406406
{
407-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
408-
SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
407+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
408+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
409409
}
410410
eval $CHILD2_2_SELECT_TABLES;
411411
--connection child2_1
412412
if ($USE_GENERAL_LOG)
413413
{
414-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
415-
SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
414+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
415+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
416416
}
417417
eval $CHILD2_1_SELECT_TABLES2;
418418
if (!$OUTPUT_CHILD_GROUP2)
@@ -466,15 +466,15 @@ if ($HAVE_PARTITION)
466466
--connection child2_2
467467
if ($USE_GENERAL_LOG)
468468
{
469-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
470-
SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
469+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
470+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
471471
}
472472
eval $CHILD2_2_SELECT_TABLES;
473473
--connection child2_1
474474
if ($USE_GENERAL_LOG)
475475
{
476-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
477-
SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
476+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
477+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
478478
}
479479
eval $CHILD2_1_SELECT_TABLES2;
480480
if (!$OUTPUT_CHILD_GROUP2)
@@ -528,15 +528,15 @@ if ($HAVE_PARTITION)
528528
--connection child2_2
529529
if ($USE_GENERAL_LOG)
530530
{
531-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
532-
SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
531+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
532+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
533533
}
534534
eval $CHILD2_2_SELECT_TABLES;
535535
--connection child2_1
536536
if ($USE_GENERAL_LOG)
537537
{
538-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
539-
SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
538+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
539+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
540540
}
541541
eval $CHILD2_1_SELECT_TABLES2;
542542
if (!$OUTPUT_CHILD_GROUP2)

‎storage/spider/mysql-test/spider/bg/t/direct_aggregate.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ if ($USE_CHILD_GROUP2)
147147
--connection child2_1
148148
if ($USE_GENERAL_LOG)
149149
{
150-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
150+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
151151
}
152152
eval $CHILD2_1_SELECT_TABLES;
153153
if (!$OUTPUT_CHILD_GROUP2)

‎storage/spider/mysql-test/spider/bg/t/direct_aggregate_part.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ if ($HAVE_PARTITION)
153153
--connection child2_2
154154
if ($USE_GENERAL_LOG)
155155
{
156-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
156+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
157157
}
158158
eval $CHILD2_2_SELECT_TABLES;
159159
--connection child2_1
160160
if ($USE_GENERAL_LOG)
161161
{
162-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
162+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
163163
}
164164
eval $CHILD2_1_SELECT_TABLES2;
165165
if (!$OUTPUT_CHILD_GROUP2)

‎storage/spider/mysql-test/spider/bg/t/direct_update.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ if ($USE_CHILD_GROUP2)
166166
--connection child2_1
167167
if ($USE_GENERAL_LOG)
168168
{
169-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
169+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
170170
}
171171
eval $CHILD2_1_SELECT_TABLES;
172172
if (!$OUTPUT_CHILD_GROUP2)

‎storage/spider/mysql-test/spider/bg/t/direct_update_part.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ if ($HAVE_PARTITION)
172172
--connection child2_2
173173
if ($USE_GENERAL_LOG)
174174
{
175-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
175+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
176176
}
177177
eval $CHILD2_2_SELECT_TABLES;
178178
--connection child2_1
179179
if ($USE_GENERAL_LOG)
180180
{
181-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
181+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
182182
}
183183
eval $CHILD2_1_SELECT_TABLES2;
184184
if (!$OUTPUT_CHILD_GROUP2)

‎storage/spider/mysql-test/spider/bg/t/function.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ if ($USE_CHILD_GROUP2)
125125
--connection child2_1
126126
if ($USE_GENERAL_LOG)
127127
{
128-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
128+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
129129
}
130130
eval $CHILD2_1_SELECT_TEXT_PK_TABLES1;
131131
if (!$OUTPUT_CHILD_GROUP2)
@@ -219,7 +219,7 @@ if ($USE_CHILD_GROUP2)
219219
--connection child2_1
220220
if ($USE_GENERAL_LOG)
221221
{
222-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
222+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
223223
}
224224
eval $CHILD2_1_SELECT_TABLES;
225225
if (!$OUTPUT_CHILD_GROUP2)

‎storage/spider/mysql-test/spider/bg/t/ha.test

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ if ($USE_CHILD_GROUP2)
233233
--connection child2_1
234234
if ($USE_GENERAL_LOG)
235235
{
236-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
236+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
237237
}
238238
eval $CHILD2_1_SELECT_TABLES;
239239
--connection child2_2
240240
if ($USE_GENERAL_LOG)
241241
{
242-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
242+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
243243
}
244244
eval $CHILD2_2_SELECT_TABLES;
245245
if (!$OUTPUT_CHILD_GROUP2)
@@ -303,7 +303,7 @@ if ($USE_CHILD_GROUP2)
303303
--connection child2_1
304304
if ($USE_GENERAL_LOG)
305305
{
306-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
306+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
307307
}
308308
eval $CHILD2_1_SELECT_TABLES;
309309
if (!$OUTPUT_CHILD_GROUP2)
@@ -435,13 +435,13 @@ if ($USE_CHILD_GROUP2)
435435
--connection child2_1
436436
if ($USE_GENERAL_LOG)
437437
{
438-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
438+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
439439
}
440440
eval $CHILD2_1_SELECT_TABLES;
441441
--connection child2_2
442442
if ($USE_GENERAL_LOG)
443443
{
444-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
444+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
445445
}
446446
eval $CHILD2_2_SELECT_TABLES;
447447
if (!$OUTPUT_CHILD_GROUP2)
@@ -623,13 +623,13 @@ if ($USE_CHILD_GROUP2)
623623
--connection child2_1
624624
if ($USE_GENERAL_LOG)
625625
{
626-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
626+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
627627
}
628628
eval $CHILD2_1_SELECT_TABLES;
629629
--connection child2_2
630630
if ($USE_GENERAL_LOG)
631631
{
632-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
632+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
633633
}
634634
eval $CHILD2_2_SELECT_TABLES;
635635
if (!$OUTPUT_CHILD_GROUP2)
@@ -693,7 +693,7 @@ if ($USE_CHILD_GROUP2)
693693
--connection child2_2
694694
if ($USE_GENERAL_LOG)
695695
{
696-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
696+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
697697
}
698698
eval $CHILD2_2_SELECT_TABLES;
699699
if (!$OUTPUT_CHILD_GROUP2)
@@ -799,13 +799,13 @@ if ($USE_CHILD_GROUP2)
799799
--connection child2_1
800800
if ($USE_GENERAL_LOG)
801801
{
802-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
802+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
803803
}
804804
eval $CHILD2_1_SELECT_TABLES;
805805
--connection child2_2
806806
if ($USE_GENERAL_LOG)
807807
{
808-
SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
808+
SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
809809
}
810810
eval $CHILD2_2_SELECT_TABLES;
811811
if (!$OUTPUT_CHILD_GROUP2)

0 commit comments

Comments
 (0)