fix spider tests for --ps in 10.6

see also c3a1ba0f, 068246c0, 690ae1de

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

@@ -176,13 +176,13 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -235,12 +235,12 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     if (!$OUTPUT_CHILD_GROUP2)
     {
@@ -290,12 +290,12 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     if (!$OUTPUT_CHILD_GROUP2)
     {
@@ -344,15 +344,15 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -404,15 +404,15 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -466,15 +466,15 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -528,15 +528,15 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)

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

@@ -147,7 +147,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)

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

@@ -153,13 +153,13 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)

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

@@ -166,7 +166,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)

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

@@ -172,13 +172,13 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)

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

@@ -125,7 +125,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TEXT_PK_TABLES1;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -219,7 +219,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)

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

@@ -233,13 +233,13 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -303,7 +303,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -435,13 +435,13 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -623,13 +623,13 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -693,7 +693,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -799,13 +799,13 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/bg/t/ha_part.test

@@ -274,20 +274,20 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -356,14 +356,14 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -501,20 +501,20 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -723,20 +723,20 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -809,19 +809,19 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -933,20 +933,20 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/bg/t/spider3_fixes.test

@@ -129,8 +129,10 @@ eval CREATE TABLE t2 (
   id int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (id)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_INCREMENT1_1;
+--disable_ps_protocol
 eval $MASTER_1_AUTO_INCREMENT_INCREMENT2;
 eval $MASTER_1_AUTO_INCREMENT_OFFSET2;
+--enable_ps_protocol
 if ($USE_REPLICATION)
 {
   SET SESSION sql_log_bin= 1;
@@ -241,7 +243,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
   }
   eval $CHILD2_1_SELECT_INCREMENT_TABLES1;
   if ($OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/bg/t/spider3_fixes_part.test

@@ -163,8 +163,10 @@ if ($HAVE_PARTITION)
     id int(11) NOT NULL AUTO_INCREMENT,
     PRIMARY KEY (id)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_INCREMENT1_P_1;
+  --disable_ps_protocol
   eval $MASTER_1_AUTO_INCREMENT_INCREMENT2;
   eval $MASTER_1_AUTO_INCREMENT_OFFSET2;
+  --enable_ps_protocol
   if ($USE_REPLICATION)
   {
     SET SESSION sql_log_bin= 1;
@@ -275,7 +277,7 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_1_SELECT_INCREMENT_TABLES1;
     if ($OUTPUT_CHILD_GROUP2)
@@ -293,7 +295,7 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_2_SELECT_INCREMENT_TABLES1;
     if ($OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/bg/t/spider_fixes.test

@@ -164,7 +164,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -206,7 +206,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -248,7 +248,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -337,7 +337,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -359,7 +359,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -381,7 +381,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -403,7 +403,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -425,7 +425,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -447,7 +447,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -469,7 +469,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -491,7 +491,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -513,7 +513,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -535,7 +535,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -557,7 +557,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -579,7 +579,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -676,7 +676,7 @@ if ($HAVE_TRIGGER)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_1_SELECT_TABLES4;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -722,7 +722,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -812,7 +812,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -899,8 +899,8 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -1073,8 +1073,10 @@ eval CREATE TABLE t1 (
   id int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (id)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_INCREMENT1_1;
+--disable_ps_protocol
 eval $MASTER_1_AUTO_INCREMENT_INCREMENT2;
 eval $MASTER_1_AUTO_INCREMENT_OFFSET2;
+--enable_ps_protocol
 if ($USE_REPLICATION)
 {
   SET SESSION sql_log_bin= 1;
@@ -1139,7 +1141,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
   }
   eval $CHILD2_1_SELECT_INCREMENT_TABLES1;
   if ($OUTPUT_CHILD_GROUP2)
@@ -1324,7 +1326,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TEXT_PK_TABLES1;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -1380,7 +1382,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TEXT_PK_TABLES1;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/bg/t/spider_fixes_part.test

@@ -176,13 +176,13 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -281,19 +281,19 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -404,12 +404,12 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     if (!$OUTPUT_CHILD_GROUP2)
     {
@@ -509,8 +509,10 @@ if ($HAVE_PARTITION)
     id int(11) NOT NULL AUTO_INCREMENT,
     PRIMARY KEY (id)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_INCREMENT1_P_1;
+  --disable_ps_protocol
   eval $MASTER_1_AUTO_INCREMENT_INCREMENT2;
   eval $MASTER_1_AUTO_INCREMENT_OFFSET2;
+  --enable_ps_protocol
   if ($USE_REPLICATION)
   {
     SET SESSION sql_log_bin= 1;
@@ -575,7 +577,7 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_1_SELECT_INCREMENT_TABLES1;
     if ($OUTPUT_CHILD_GROUP2)
@@ -593,7 +595,7 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_2_SELECT_INCREMENT_TABLES1;
     if ($OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/bg/t/vp_fixes.test

@@ -206,7 +206,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
   }
   eval $CHILD2_1_SELECT_TABLES5;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -303,7 +303,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
   }
   eval $CHILD2_1_SELECT_TABLES5;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/bugfix/include/checksum_table_with_quick_mode_3_init.inc

@@ -21,7 +21,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 --connection master_1
 set @old_spider_quick_mode= @@spider_quick_mode;
 set session spider_quick_mode= 3;

storage/spider/mysql-test/spider/bugfix/include/cp932_column_init.inc

@@ -23,7 +23,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey, txt_utf8, txt_cp932 FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%update %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%update %');
 --connection master_1
 set @old_spider_direct_dup_insert= @@spider_direct_dup_insert;
 set session spider_direct_dup_insert= 1;

storage/spider/mysql-test/spider/bugfix/include/delete_with_float_column_init.inc

@@ -10,7 +10,7 @@
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey, f FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %';
 --connection slave1_1
 --disable_warnings
 --disable_query_log

storage/spider/mysql-test/spider/bugfix/include/group_by_order_by_limit_init.inc

@@ -35,7 +35,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey, skey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -51,4 +51,4 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey, skey FROM tbl_a ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';

storage/spider/mysql-test/spider/bugfix/include/insert_select_init.inc

@@ -37,7 +37,7 @@ let $CHILD2_1_CREATE_TABLES2=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey, dt FROM tbl_b ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --connection master_1
 set @old_spider_direct_dup_insert= @@spider_direct_dup_insert;
 set session spider_direct_dup_insert= 1;

storage/spider/mysql-test/spider/bugfix/include/mdev_19866_init.inc

@@ -34,7 +34,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey, val FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -49,4 +49,4 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey, val FROM tbl_a ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';

storage/spider/mysql-test/spider/bugfix/include/mdev_20100_init.inc

@@ -43,4 +43,4 @@ let $CHILD2_1_SELECT_TABLES=
   SELECT a, b, c FROM ta_r3 ORDER BY a $STR_SEMICOLON
   SELECT a, b, c FROM ta_r4 ORDER BY a;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';

storage/spider/mysql-test/spider/bugfix/include/mdev_20502_init.inc

@@ -22,4 +22,4 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT id, val FROM tbl_a ORDER BY id;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';

storage/spider/mysql-test/spider/bugfix/include/mdev_21884_init.inc

@@ -49,7 +49,7 @@ let $CHILD2_1_SELECT_TABLES=
   SELECT a, b, c FROM ta_r2 ORDER BY a $STR_SEMICOLON
   SELECT a, b, c FROM ta_r3 ORDER BY a;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --connection master_1
 set @old_spider_bgs_mode= @@spider_bgs_mode;
 set session spider_bgs_mode= 2;

storage/spider/mysql-test/spider/bugfix/include/quick_mode_0_init.inc

@@ -24,7 +24,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_b;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --connection master_1
 set @old_spider_quick_mode= @@spider_quick_mode;
 set session spider_quick_mode= 0;

storage/spider/mysql-test/spider/bugfix/include/quick_mode_1_init.inc

@@ -24,7 +24,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_b;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --connection master_1
 set @old_spider_quick_mode= @@spider_quick_mode;
 set session spider_quick_mode= 1;

storage/spider/mysql-test/spider/bugfix/include/quick_mode_2_init.inc

@@ -24,7 +24,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_b;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --connection master_1
 set @old_spider_quick_mode= @@spider_quick_mode;
 set session spider_quick_mode= 2;

storage/spider/mysql-test/spider/bugfix/include/quick_mode_3_init.inc

@@ -24,7 +24,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_b;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --connection master_1
 set @old_spider_quick_mode= @@spider_quick_mode;
 set session spider_quick_mode= 3;

storage/spider/mysql-test/spider/bugfix/include/return_found_rows_insert_init.inc

@@ -23,5 +23,5 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT skey, dt, tm FROM tbl_a ORDER BY skey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%replace %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%replace %');
 --let $MASTER_1_SET_COMMAND=set session spider_direct_dup_insert=1 $STR_SEMICOLON

storage/spider/mysql-test/spider/bugfix/include/return_found_rows_update_init.inc

@@ -23,4 +23,4 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT skey, dt, tm FROM tbl_a ORDER BY skey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';

storage/spider/mysql-test/spider/bugfix/include/select_by_null_init.inc

@@ -21,4 +21,4 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';

storage/spider/mysql-test/spider/bugfix/include/select_with_backquote_init.inc

@@ -22,4 +22,4 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey, txt_utf8 FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';

storage/spider/mysql-test/spider/bugfix/include/slave_trx_isolation_init.inc

@@ -22,7 +22,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%set %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%set %';
 --connection slave1_1
 --disable_warnings
 --disable_query_log

storage/spider/mysql-test/spider/bugfix/include/sql_mode_init.inc

@@ -37,4 +37,4 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%sql_mode%';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%';

storage/spider/mysql-test/spider/bugfix/include/strict_group_by_init.inc

@@ -35,7 +35,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey, skey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -51,7 +51,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey, skey FROM tbl_a ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --connection master_1
 set @old_spider_sync_sql_mode= @@spider_sync_sql_mode;
 set session spider_sync_sql_mode= FALSE;

storage/spider/mysql-test/spider/bugfix/include/wait_timeout_init.inc

@@ -33,7 +33,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -47,7 +47,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
 --connection child2_1
 set @old_wait_timeout= @@wait_timeout;
 set global wait_timeout= 1;

storage/spider/mysql-test/spider/bugfix/include/wrapper_mariadb_init.inc

@@ -21,4 +21,4 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';

storage/spider/mysql-test/spider/bugfix/include/xa_cmd_init.inc

@@ -21,4 +21,4 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';

storage/spider/mysql-test/spider/bugfix/r/checksum_table_with_quick_mode_3.result

@@ -44,10 +44,10 @@ CHECKSUM TABLE tbl_a EXTENDED;
 Table	Checksum
 auto_test_local.tbl_a	1061386331
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 argument
 checksum table `auto_test_remote`.`tbl_a` extended
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/cp932_column.result

@@ -45,12 +45,12 @@ UPDATE tbl_a SET txt_cp932 = '
 SET NAMES utf8;
 connection child2_1;
 SET NAMES cp932;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%update %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%update %');
 argument
 insert into `auto_test_remote`.`tbl_a`(`pkey`,`txt_utf8`,`txt_cp932`)values(10,'',_cp932'\\x92\\x86\\x8D\\x91')
 insert high_priority into `auto_test_remote`.`tbl_a`(`pkey`,`txt_utf8`,`txt_cp932`)values(0,'',_cp932'') on duplicate key update `txt_cp932` = _cp932'\x92\x86\x8D\x91'
 update `auto_test_remote`.`tbl_a` set `txt_cp932` = _cp932'\x92\x86\x8D\x91' where (`pkey` = 2)
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%update %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%update %')
 SELECT pkey, txt_utf8, txt_cp932 FROM tbl_a ORDER BY pkey;
 pkey	txt_utf8	txt_cp932
 0		

storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_default.result

@@ -52,11 +52,11 @@ connection slave1_1;
 connection master_1;
 SET SESSION sql_log_bin= 0;
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %';
 argument
 delete from `auto_test_remote`.`tbl_a` where `pkey` = 0 and `f` is null limit 1
 delete from `auto_test_remote`.`tbl_a` where `pkey` = 1 and `f` = cast(0.671437 as float) limit 1
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %'
 SELECT pkey, f FROM tbl_a ORDER BY pkey;
 pkey	f
 connection slave1_1;

storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mariadb.result

@@ -52,11 +52,11 @@ connection slave1_1;
 connection master_1;
 SET SESSION sql_log_bin= 0;
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %';
 argument
 delete from `auto_test_remote`.`tbl_a` where `pkey` = 0 and `f` is null limit 1
 delete from `auto_test_remote`.`tbl_a` where `pkey` = 1 and `f` = cast(0.671437 as float) limit 1
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %'
 SELECT pkey, f FROM tbl_a ORDER BY pkey;
 pkey	f
 connection slave1_1;

storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mysql.result

@@ -52,11 +52,11 @@ connection slave1_1;
 connection master_1;
 SET SESSION sql_log_bin= 0;
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %';
 argument
 delete from `auto_test_remote`.`tbl_a` where `pkey` = 0 and `f` is null limit 1
 delete from `auto_test_remote`.`tbl_a` where `pkey` = 1 and `f` = /* create function to_float(a decimal(20,6)) returns float return a */ to_float(0.671437) limit 1
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %'
 SELECT pkey, f FROM tbl_a ORDER BY pkey;
 pkey	f
 connection slave1_1;

storage/spider/mysql-test/spider/bugfix/r/group_by_order_by_limit.result

@@ -54,10 +54,10 @@ skey	cnt
 11	2
 10	2
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select count(0),`skey` from `auto_test_remote`.`tbl_a` group by `skey` order by `skey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey, skey FROM tbl_a ORDER BY pkey;
 pkey	skey
 1	1
@@ -76,10 +76,10 @@ pkey	skey
 27	12
 29	14
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select count(0),`skey` from `auto_test_remote2`.`tbl_a` group by `skey` order by `skey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey, skey FROM tbl_a ORDER BY pkey;
 pkey	skey
 0	0

storage/spider/mysql-test/spider/bugfix/r/insert_select.result

@@ -58,7 +58,7 @@ INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FRO
 INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FROM tbl_a WHERE skey = 6 AND dt > DATE_ADD('2012-12-01', INTERVAL -10 DAY));
 INSERT IGNORE INTO tbl_b (SELECT skey, CAST(CONCAT(dt, ' ', tm) AS datetime) FROM tbl_a WHERE skey = 5 AND dt > DATE_ADD('2012-12-01', INTERVAL -10 DAY));
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 4) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
 select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 3) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
@@ -70,7 +70,7 @@ select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetim
 select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 7) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
 select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 6) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
 select t0.`skey` `skey`,cast((concat(t0.`dt` , _latin1' ' , t0.`tm`)) as datetime) `CAST(CONCAT(dt, ' ', tm) AS datetime)` from `auto_test_remote`.`tbl_a` t0 where ((t0.`skey` = 5) and (t0.`dt` > _latin1'2012-11-21')) lock in share mode
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey, dt FROM tbl_b ORDER BY pkey;
 pkey	dt
 0	2013-01-01 13:00:00

storage/spider/mysql-test/spider/bugfix/r/mdev_19866.result

@@ -68,25 +68,25 @@ pkey	val
 2	2
 4	4
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey`,`val` from `auto_test_remote`.`tbl_a`
 select `pkey`,`val` from `auto_test_remote`.`tbl_a` where `pkey` = 1
 select `pkey`,`val` from `auto_test_remote`.`tbl_a`
 select `pkey`,`val` from `auto_test_remote`.`tbl_a`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey, val FROM tbl_a ORDER BY pkey;
 pkey	val
 1	1
 3	3
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey`,`val` from `auto_test_remote2`.`tbl_a`
 select `pkey`,`val` from `auto_test_remote2`.`tbl_a`
 select `pkey`,`val` from `auto_test_remote2`.`tbl_a` where `pkey` = 2
 select `pkey`,`val` from `auto_test_remote2`.`tbl_a`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey, val FROM tbl_a ORDER BY pkey;
 pkey	val
 2	2

storage/spider/mysql-test/spider/bugfix/r/mdev_20100.result

@@ -76,7 +76,7 @@ SELECT a, b, c FROM tbl_a PARTITION (pt2,pt3);
 a	b	c
 5	c	2001-12-31 23:59:59
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select t0.`a` `a`,t0.`b` `b`,t0.`c` `c` from `auto_test_remote`.`ta_r3` t0 where (t0.`b` = 'c')
 select `a`,`b`,`c` from `auto_test_remote`.`ta_r2`
@@ -90,7 +90,7 @@ select `a`,`b`,`c` from `auto_test_remote`.`ta_r4`
 select t0.`a` `a`,t0.`b` `b`,t0.`c` `c` from `auto_test_remote`.`ta_r2` t0 where (t0.`b` = 'c')
 select `a`,`b`,`c` from `auto_test_remote`.`ta_r3`
 select `a`,`b`,`c` from `auto_test_remote`.`ta_r4`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT a, b, c FROM ta_r2 ORDER BY a ;
 SELECT a, b, c FROM ta_r3 ORDER BY a ;
 SELECT a, b, c FROM ta_r4 ORDER BY a;

storage/spider/mysql-test/spider/bugfix/r/mdev_20502.result

@@ -52,7 +52,7 @@ m	const	val	sq
 3	0	1	2
 2	0	2	2
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select t0.`id` `id`,t0.`val` `val` from `auto_test_remote`.`tbl_a` t0
 select t0.`id` `id`,t0.`val` `val`,(t0.`val` + 10) `val+10` from `auto_test_remote`.`tbl_a` t0
@@ -62,7 +62,7 @@ select (t0.`val` + 10) `val+10`,t0.`val` `val` from `auto_test_remote`.`tbl_a` t
 select (t0.`val` + 1) `tbl_a.val+1` from `auto_test_remote`.`tbl_a` t0 limit 1
 select max(t0.`id`) `m`,t0.`val` `val` from `auto_test_remote`.`tbl_a` t0 group by t0.`val` order by t0.`val`
 select (t0.`val` + 1) `tbl_a.val+1` from `auto_test_remote`.`tbl_a` t0 limit 1
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT id, val FROM tbl_a ORDER BY id;
 id	val
 1	1

storage/spider/mysql-test/spider/bugfix/r/mdev_21884.result

@@ -70,11 +70,11 @@ a	b
 13	c
 connection child2_1;
 SET NAMES utf8;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `a`,`b` from `auto_test_remote`.`ta_r2` order by `a`,`b`
 select `a`,`b` from `auto_test_remote`.`ta_r3` order by `a`,`b`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT a, b, c FROM ta_r2 ORDER BY a ;
 SELECT a, b, c FROM ta_r3 ORDER BY a;
 a	b	c

storage/spider/mysql-test/spider/bugfix/r/quick_mode_0.result

@@ -90,10 +90,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -127,7 +127,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -159,7 +159,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0
@@ -234,10 +234,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -271,7 +271,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -303,7 +303,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0
@@ -378,10 +378,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -415,7 +415,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -447,7 +447,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/quick_mode_1.result

@@ -90,10 +90,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -127,7 +127,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -159,7 +159,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0
@@ -234,10 +234,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -271,7 +271,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -303,7 +303,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0
@@ -378,10 +378,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -415,7 +415,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -447,7 +447,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/quick_mode_2.result

@@ -90,10 +90,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -127,7 +127,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -159,7 +159,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0
@@ -234,10 +234,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -271,7 +271,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -303,7 +303,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0
@@ -378,10 +378,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -415,7 +415,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -447,7 +447,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/quick_mode_3.result

@@ -90,10 +90,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -127,7 +127,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -159,7 +159,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0
@@ -234,10 +234,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -271,7 +271,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -303,7 +303,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0
@@ -378,10 +378,10 @@ pkey
 28
 29
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote`.`tbl_a` order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0
@@ -415,7 +415,7 @@ pkey
 28
 29
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 0
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 1
@@ -447,7 +447,7 @@ select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 26
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 27
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 28
 select `pkey` from `auto_test_remote2`.`tbl_b` where `pkey` = 29
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_b ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/return_found_rows_insert.result

@@ -50,10 +50,10 @@ Records: 10  Duplicates: 5  Warnings: 0
 
 Bye
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%replace %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%replace %');
 argument
 insert ignore into `auto_test_remote`.`tbl_a`(`skey`,`dt`,`tm`)values(0,_latin1'2013-01-01',_latin1'13:00:00'),(2,_latin1'2013-02-01',_latin1'13:00:00'),(4,_latin1'2013-03-01',_latin1'13:00:00'),(7,_latin1'2013-04-01',_latin1'13:00:00'),(8,_latin1'2013-05-01',_latin1'13:00:00'),(10,_latin1'2013-06-01',_latin1'13:00:00'),(11,_latin1'2013-07-01',_latin1'13:00:00'),(12,_latin1'2013-08-01',_latin1'13:00:00'),(13,_latin1'2013-09-01',_latin1'13:00:00'),(14,_latin1'2013-10-01',_latin1'13:00:00')
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%replace %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%replace %')
 SELECT skey, dt, tm FROM tbl_a ORDER BY skey;
 skey	dt	tm
 0	2012-01-01	12:00:00
@@ -88,10 +88,10 @@ Records: 10  Duplicates: 4  Warnings: 0
 
 Bye
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%replace %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%replace %');
 argument
 replace into `auto_test_remote`.`tbl_a`(`skey`,`dt`,`tm`)values(1,_latin1'2012-02-01',_latin1'12:00:00'),(3,_latin1'2012-12-01',_latin1'11:00:00'),(8,_latin1'2012-11-30',_latin1'11:00:00'),(9,_latin1'2012-11-29',_latin1'11:00:00'),(10,_latin1'2012-11-28',_latin1'11:00:00'),(15,_latin1'2012-11-27',_latin1'11:00:00'),(16,_latin1'2012-11-26',_latin1'11:00:00'),(17,_latin1'2012-11-25',_latin1'11:00:00'),(18,_latin1'2012-11-24',_latin1'11:00:00'),(19,_latin1'2012-11-23',_latin1'11:00:00')
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%replace %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%replace %')
 SELECT skey, dt, tm FROM tbl_a ORDER BY skey;
 skey	dt	tm
 0	2012-01-01	12:00:00
@@ -131,10 +131,10 @@ Records: 10  Duplicates: 4  Warnings: 0
 
 Bye
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%replace %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%replace %');
 argument
 insert high_priority into `auto_test_remote`.`tbl_a`(`skey`,`dt`,`tm`)values(1,_latin1'2012-11-01',_latin1'11:00:00'),(3,_latin1'2012-12-01',_latin1'11:00:00'),(11,_latin1'2012-11-30',_latin1'11:00:00'),(15,_latin1'2012-11-29',_latin1'11:00:00'),(16,_latin1'2012-11-28',_latin1'11:00:00'),(20,_latin1'2012-11-27',_latin1'11:00:00'),(21,_latin1'2012-11-26',_latin1'11:00:00'),(22,_latin1'2012-11-25',_latin1'11:00:00'),(23,_latin1'2012-11-24',_latin1'11:00:00'),(24,_latin1'2012-11-23',_latin1'11:00:00') on duplicate key update `dt` = values(`dt`),`tm` = values(`tm`)
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %' OR argument LIKE '%replace %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND (argument LIKE '%insert %' OR argument LIKE '%replace %')
 SELECT skey, dt, tm FROM tbl_a ORDER BY skey;
 skey	dt	tm
 0	2012-01-01	12:00:00

storage/spider/mysql-test/spider/bugfix/r/return_found_rows_update.result

@@ -46,10 +46,10 @@ Rows matched: 3  Changed: 2  Warnings: 0
 
 Bye
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
 argument
 update `auto_test_remote`.`tbl_a` set `tm` = _latin1'12:00:00' where (`skey` = 0)
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %'
 SELECT skey, dt, tm FROM tbl_a ORDER BY skey;
 skey	dt	tm
 0	2012-01-01	12:00:00

storage/spider/mysql-test/spider/bugfix/r/select_by_null.result

@@ -38,9 +38,9 @@ connection master_1;
 SELECT pkey FROM tbl_a WHERE NULL;
 pkey
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/select_with_backquote.result

@@ -42,10 +42,10 @@ pkey	LEFT(`txt_utf8`, 4)
 2	2345
 connection child2_1;
 SET NAMES utf8;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select t0.`pkey` `pkey`,(left(t0.`txt_utf8` , 4)) `LEFT(``txt_utf8``, 4)` from `auto_test_remote`.`tbl_a` t0 order by `LEFT(``txt_utf8``, 4)` limit 3
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey, txt_utf8 FROM tbl_a ORDER BY pkey;
 pkey	txt_utf8
 0	01234567

storage/spider/mysql-test/spider/bugfix/r/slave_trx_isolation.result

@@ -46,12 +46,12 @@ connection slave1_1;
 connection master_1;
 SET SESSION sql_log_bin= 0;
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%set %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%set %';
 argument
 set session time_zone = '+00:00';set @`spider_lc_./auto_test_remote/tbl_a` = '-xxxxxxxxxxxx-xxxxx-./auto_test_local/tbl_a-'
 SET NAMES utf8mb3
 set session transaction isolation level read committed;set session autocommit = 1;set session wait_timeout = 604800;set session sql_mode = 'strict_trans_tables,error_for_division_by_zero,no_auto_create_user,no_engine_substitution';start transaction
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%set %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%set %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/sql_mode_mariadb.result

@@ -48,10 +48,10 @@ pkey
 8
 9
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%sql_mode%';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%';
 argument
 set session transaction isolation level repeatable read;set session autocommit = 1;set session sql_log_off = 0;set session wait_timeout = 604800;set session sql_mode = 'real_as_float,ignore_bad_table_options,no_unsigned_subtraction,no_dir_in_create,no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,allow_invalid_dates,error_for_division_by_zero,no_auto_create_user,high_not_precedence,no_engine_substitution,pad_char_to_full_length,empty_string_is_null,simultaneous_assignment,time_round_fractional';set session time_zone = '+00:00';set @`spider_lc_./auto_test_remote/tbl_a` = '-xxxxxxxxxxxx-xxxxx-./auto_test_local/tbl_a-';start transaction
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%sql_mode%'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/sql_mode_mysql.result

@@ -48,10 +48,10 @@ pkey
 8
 9
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%sql_mode%';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%';
 argument
 set session transaction isolation level repeatable read;set session autocommit = 1;set session sql_log_off = 0;set session wait_timeout = 604800;set session sql_mode = 'real_as_float,ignore_bad_table_options,no_unsigned_subtraction,no_dir_in_create,no_auto_value_on_zero,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,allow_invalid_dates,error_for_division_by_zero,no_auto_create_user,high_not_precedence,no_engine_substitution,pad_char_to_full_length';set session time_zone = '+00:00';set @`spider_lc_./auto_test_remote/tbl_a` = '-xxxxxxxxxxxx-xxxxx-./auto_test_local/tbl_a-';start transaction
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%sql_mode%'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%sql_mode%'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/strict_group_by.result

@@ -57,10 +57,10 @@ SELECT count(pkey) cnt, skey FROM tbl_a;
 cnt	skey
 30	1
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select count(`pkey`),min(`pkey`),min(`skey`) from `auto_test_remote`.`tbl_a`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey, skey FROM tbl_a ORDER BY pkey;
 pkey	skey
 1	1
@@ -79,10 +79,10 @@ pkey	skey
 27	12
 29	14
 connection child2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select count(`pkey`),min(`pkey`),min(`skey`) from `auto_test_remote2`.`tbl_a`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey, skey FROM tbl_a ORDER BY pkey;
 pkey	skey
 0	0

storage/spider/mysql-test/spider/bugfix/r/wait_timeout.result

@@ -60,14 +60,14 @@ connection child2_1_2;
 SELECT SLEEP(2);
 SLEEP(2)
 0
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
 argument
 insert into `auto_test_remote`.`tbl_a`(`pkey`)values(31),(33),(35),(37),(39),(41),(43),(45),(47),(49),(51),(53),(55),(57),(59)
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %'
 connection child2_2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
 argument
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %'
 connection child2_1;
 UNLOCK TABLES;
 SELECT pkey FROM tbl_a ORDER BY pkey;

storage/spider/mysql-test/spider/bugfix/r/wrapper_mariadb.result

@@ -45,10 +45,10 @@ pkey
 8
 9
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 argument
 select t0.`pkey` `pkey` from `auto_test_remote`.`tbl_a` t0 order by `pkey`
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/bugfix/r/xa_cmd.result

@@ -35,10 +35,10 @@ XA END 'test';
 XA PREPARE 'test';
 XA COMMIT 'test';
 connection child2_1;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
 argument
 insert into `auto_test_remote`.`tbl_a`(`pkey`)values(0),(1),(2),(3),(4),(5),(6),(7),(8),(9)
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %'
 SELECT pkey FROM tbl_a ORDER BY pkey;
 pkey
 0

storage/spider/mysql-test/spider/feature/include/checksum_table_parallel_init.inc

@@ -33,7 +33,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -47,7 +47,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 --connection master_1
 set @old_spider_bgs_mode= @@spider_bgs_mode;
 set session spider_bgs_mode= 1;

storage/spider/mysql-test/spider/feature/r/checksum_table_parallel_extended.result

@@ -58,15 +58,15 @@ connection child2_1_2;
 SELECT SLEEP(1);
 SLEEP(1)
 0
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 argument
 checksum table `auto_test_remote`.`tbl_a` extended
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %'
 connection child2_2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 argument
 checksum table `auto_test_remote2`.`tbl_a` extended
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %'
 connection child2_1;
 UNLOCK TABLES;
 SELECT pkey FROM tbl_a ORDER BY pkey;

storage/spider/mysql-test/spider/feature/r/checksum_table_parallel_no_opt.result

@@ -58,13 +58,13 @@ connection child2_1_2;
 SELECT SLEEP(1);
 SLEEP(1)
 0
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 argument
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %'
 connection child2_2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 argument
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %'
 connection child2_1;
 UNLOCK TABLES;
 SELECT pkey FROM tbl_a ORDER BY pkey;

storage/spider/mysql-test/spider/feature/r/checksum_table_parallel_quick.result

@@ -58,13 +58,13 @@ connection child2_1_2;
 SELECT SLEEP(1);
 SLEEP(1)
 0
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 argument
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %'
 connection child2_2_2;
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 argument
-SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %'
+SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %'
 connection child2_1;
 UNLOCK TABLES;
 SELECT pkey FROM tbl_a ORDER BY pkey;

storage/spider/mysql-test/spider/handler/t/basic_sql_part.test

@@ -176,13 +176,13 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -235,12 +235,12 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     if (!$OUTPUT_CHILD_GROUP2)
     {
@@ -290,12 +290,12 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     if (!$OUTPUT_CHILD_GROUP2)
     {
@@ -344,15 +344,15 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -404,15 +404,15 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'update %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -466,15 +466,15 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -528,15 +528,15 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE 'delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE 'delete %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/direct_aggregate.test

@@ -147,7 +147,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/direct_aggregate_part.test

@@ -153,13 +153,13 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/direct_update.test

@@ -166,7 +166,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/direct_update_part.test

@@ -172,13 +172,13 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%handler %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%handler %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/function.test

@@ -125,7 +125,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TEXT_PK_TABLES1;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -219,7 +219,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/ha.test

@@ -233,13 +233,13 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -303,7 +303,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -435,13 +435,13 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -623,13 +623,13 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -693,7 +693,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -799,13 +799,13 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TABLES;
   --connection child2_2
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_2_SELECT_TABLES;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/ha_part.test

@@ -274,20 +274,20 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -356,14 +356,14 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -501,20 +501,20 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -723,20 +723,20 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -809,19 +809,19 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -933,20 +933,20 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES;
     eval $CHILD2_1_SELECT_TABLES2;
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_3
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_3_SELECT_TABLES;
     if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/spider3_fixes.test

@@ -129,8 +129,10 @@ eval CREATE TABLE t2 (
   id int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (id)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_INCREMENT1_1;
+--disable_ps_protocol
 eval $MASTER_1_AUTO_INCREMENT_INCREMENT2;
 eval $MASTER_1_AUTO_INCREMENT_OFFSET2;
+--enable_ps_protocol
 if ($USE_REPLICATION)
 {
   SET SESSION sql_log_bin= 1;
@@ -241,7 +243,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
   }
   eval $CHILD2_1_SELECT_INCREMENT_TABLES1;
   if ($OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/spider3_fixes_part.test

@@ -163,8 +163,10 @@ if ($HAVE_PARTITION)
     id int(11) NOT NULL AUTO_INCREMENT,
     PRIMARY KEY (id)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_INCREMENT1_P_1;
+  --disable_ps_protocol
   eval $MASTER_1_AUTO_INCREMENT_INCREMENT2;
   eval $MASTER_1_AUTO_INCREMENT_OFFSET2;
+  --enable_ps_protocol
   if ($USE_REPLICATION)
   {
     SET SESSION sql_log_bin= 1;
@@ -275,7 +277,7 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_1_SELECT_INCREMENT_TABLES1;
     if ($OUTPUT_CHILD_GROUP2)
@@ -293,7 +295,7 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_2_SELECT_INCREMENT_TABLES1;
     if ($OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/spider_fixes.test

@@ -164,7 +164,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -206,7 +206,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -248,7 +248,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -337,7 +337,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -359,7 +359,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -381,7 +381,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -403,7 +403,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -425,7 +425,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -447,7 +447,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -469,7 +469,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -491,7 +491,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -513,7 +513,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -535,7 +535,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -557,7 +557,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     TRUNCATE TABLE mysql.general_log;
   }
   if (!$OUTPUT_CHILD_GROUP2)
@@ -579,7 +579,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -676,7 +676,7 @@ if ($HAVE_TRIGGER)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_1_SELECT_TABLES4;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -722,7 +722,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -812,7 +812,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -899,8 +899,8 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
   }
   if (!$OUTPUT_CHILD_GROUP2)
   {
@@ -1073,8 +1073,10 @@ eval CREATE TABLE t1 (
   id int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (id)
 ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_INCREMENT1_1;
+--disable_ps_protocol
 eval $MASTER_1_AUTO_INCREMENT_INCREMENT2;
 eval $MASTER_1_AUTO_INCREMENT_OFFSET2;
+--enable_ps_protocol
 if ($USE_REPLICATION)
 {
   SET SESSION sql_log_bin= 1;
@@ -1139,7 +1141,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
   }
   eval $CHILD2_1_SELECT_INCREMENT_TABLES1;
   if ($OUTPUT_CHILD_GROUP2)
@@ -1324,7 +1326,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TEXT_PK_TABLES1;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -1380,7 +1382,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
   }
   eval $CHILD2_1_SELECT_TEXT_PK_TABLES1;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/spider_fixes_part.test

@@ -176,13 +176,13 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -281,19 +281,19 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %';
     }
     eval $CHILD2_2_SELECT_TABLES;
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%update %';
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%update %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%delete %';
     }
     eval $CHILD2_1_SELECT_TABLES2;
     if (!$OUTPUT_CHILD_GROUP2)
@@ -404,12 +404,12 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
     }
     if (!$OUTPUT_CHILD_GROUP2)
     {
@@ -509,8 +509,10 @@ if ($HAVE_PARTITION)
     id int(11) NOT NULL AUTO_INCREMENT,
     PRIMARY KEY (id)
   ) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_INCREMENT1_P_1;
+  --disable_ps_protocol
   eval $MASTER_1_AUTO_INCREMENT_INCREMENT2;
   eval $MASTER_1_AUTO_INCREMENT_OFFSET2;
+  --enable_ps_protocol
   if ($USE_REPLICATION)
   {
     SET SESSION sql_log_bin= 1;
@@ -575,7 +577,7 @@ if ($HAVE_PARTITION)
     --connection child2_1
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_1_SELECT_INCREMENT_TABLES1;
     if ($OUTPUT_CHILD_GROUP2)
@@ -593,7 +595,7 @@ if ($HAVE_PARTITION)
     --connection child2_2
     if ($USE_GENERAL_LOG)
     {
-      SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+      SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
     }
     eval $CHILD2_2_SELECT_INCREMENT_TABLES1;
     if ($OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/handler/t/vp_fixes.test

@@ -206,7 +206,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
   }
   eval $CHILD2_1_SELECT_TABLES5;
   if (!$OUTPUT_CHILD_GROUP2)
@@ -303,7 +303,7 @@ if ($USE_CHILD_GROUP2)
   --connection child2_1
   if ($USE_GENERAL_LOG)
   {
-    SELECT argument FROM mysql.general_log WHERE argument LIKE '%insert %';
+    SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%insert %';
   }
   eval $CHILD2_1_SELECT_TABLES5;
   if (!$OUTPUT_CHILD_GROUP2)

storage/spider/mysql-test/spider/include/checksum_table_with_quick_mode_3_init.inc

@@ -21,7 +21,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%checksum %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%checksum %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_join_init.inc

@@ -46,7 +46,7 @@ let $CHILD2_1_SELECT_CONST_TABLE_JOIN=
 let $CHILD2_1_SELECT_CONST_TABLE2_JOIN=
   SELECT * FROM tbl_ncd_cm_person;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_join_using_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_left_join_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_left_join_nullable_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_left_right_join_nullable_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_left_right_left_join_nullable_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_right_join_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_right_join_nullable_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_right_left_join_nullable_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/direct_right_left_right_join_nullable_init.inc

@@ -6,7 +6,7 @@
 --enable_query_log
 --enable_warnings
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/partition_cond_push_init.inc

@@ -25,7 +25,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT value FROM tbl_a ORDER BY value;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT value FROM tbl_a ORDER BY value;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_3_DROP_TABLES_BACKUP= $CHILD2_3_DROP_TABLES
 let $CHILD2_3_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -51,7 +51,7 @@ let $CHILD2_3_CREATE_TABLES=
 let $CHILD2_3_SELECT_TABLES=
   SELECT value FROM tbl_a ORDER BY value;
 let $CHILD2_3_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/partition_fulltext_init.inc

@@ -28,7 +28,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -44,7 +44,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_3_DROP_TABLES_BACKUP= $CHILD2_3_DROP_TABLES
 let $CHILD2_3_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -60,7 +60,7 @@ let $CHILD2_3_CREATE_TABLES=
 let $CHILD2_3_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_3_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/partition_join_pushdown_for_single_partition_init.inc

@@ -46,7 +46,7 @@ let $CHILD2_1_CREATE_TABLES2=
 let $CHILD2_1_SELECT_TABLES2=
   SELECT value FROM tbl_b ORDER BY value2;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -72,7 +72,7 @@ let $CHILD2_2_CREATE_TABLES2=
 let $CHILD2_2_SELECT_TABLES2=
   SELECT value FROM tbl_b ORDER BY value;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_3_DROP_TABLES_BACKUP= $CHILD2_3_DROP_TABLES
 let $CHILD2_3_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a;
@@ -98,7 +98,7 @@ let $CHILD2_3_CREATE_TABLES2=
 let $CHILD2_3_SELECT_TABLES2=
   SELECT value FROM tbl_b ORDER BY value;
 let $CHILD2_3_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/partition_mrr_init.inc

@@ -40,7 +40,7 @@ let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey $STR_SEMICOLON
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a $STR_SEMICOLON
@@ -60,7 +60,7 @@ let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey $STR_SEMICOLON
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_3_DROP_TABLES_BACKUP= $CHILD2_3_DROP_TABLES
 let $CHILD2_3_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_a $STR_SEMICOLON
@@ -80,7 +80,7 @@ let $CHILD2_3_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey $STR_SEMICOLON
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_3_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/quick_mode_0_init.inc

@@ -24,7 +24,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_b;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/quick_mode_1_init.inc

@@ -24,7 +24,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_b;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/quick_mode_2_init.inc

@@ -24,7 +24,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_b;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG

storage/spider/mysql-test/spider/include/quick_mode_3_init.inc

@@ -24,7 +24,7 @@ let $CHILD2_1_CREATE_TABLES=
 let $CHILD2_1_SELECT_TABLES=
   SELECT pkey FROM tbl_a ORDER BY pkey;
 let $CHILD2_1_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $CHILD2_2_DROP_TABLES_BACKUP= $CHILD2_2_DROP_TABLES
 let $CHILD2_2_DROP_TABLES=
   DROP TABLE IF EXISTS tbl_b;
@@ -38,7 +38,7 @@ let $CHILD2_2_CREATE_TABLES=
 let $CHILD2_2_SELECT_TABLES=
   SELECT pkey FROM tbl_b ORDER BY pkey;
 let $CHILD2_2_SELECT_ARGUMENT1=
-  SELECT argument FROM mysql.general_log WHERE argument LIKE '%select %';
+  SELECT argument FROM mysql.general_log WHERE command_type != 'Execute' AND argument LIKE '%select %';
 --let $OUTPUT_CHILD_GROUP2_BACKUP= $OUTPUT_CHILD_GROUP2
 --let $OUTPUT_CHILD_GROUP2= 1
 --let $USE_GENERAL_LOG_BACKUP= $USE_GENERAL_LOG