post-merge: --ps-protocol fixes

Includes:

MDEV-17302 Add support for ALTER USER command in prepared statement

and

MDEV-17673 main.cte_recursive fails in bb-10.4-ps branch in --ps

  Set correct SELECT_LEX linkage for recursive CTEs.
  Do not delegate this job to TABLE_LIST::set_as_with_table,
  because it is only run on prepare, while With_element::move_anchors_ahead
  is run both on prepare and execute (fix by Igor)

4 files changed, 15 insertions, 12 deletions

diff --git a/mysql-test/extra/rpl_tests/create_recursive_construct.inc b/mysql-test/extra/rpl_tests/create_recursive_construct.inc
index b7405aa4c7f..e0648b66e3d 100644
--- a/mysql-test/extra/rpl_tests/create_recursive_construct.inc
+++ b/mysql-test/extra/rpl_tests/create_recursive_construct.inc
@@ -296,7 +296,9 @@ if ($CRC_RET_stmt_sidef) {
   --echo
   --echo Invoking $CRC_RET_desc.
   if ($CRC_create) {
+    --disable_ps_protocol
     --eval $CRC_create
+    --enable_ps_protocol
   }
 
   --echo * binlog_format = STATEMENT: expect $CRC_ARG_expected_number_of_warnings warnings.
diff --git a/mysql-test/r/show_explain_ps.result b/mysql-test/r/show_explain_ps.result
index 71c8f117fa2..38f368ec4f5 100644
--- a/mysql-test/r/show_explain_ps.result
+++ b/mysql-test/r/show_explain_ps.result
@@ -31,12 +31,11 @@ count(*)
 set debug_dbug='';
 select event_name
 from
-performance_schema.events_stages_history_long
+performance_schema.events_stages_history_long join
+performance_schema.threads using (thread_id)
 where
 event_name like '%show explain' and
-thread_id in(select thread_id
-from performance_schema.events_statements_history_long
-where EVENT_NAME='statement/sql/show_explain');
+processlist_id=$thr1;
 event_name
 stage/sql/show explain
 drop table t0;
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
index 17cb9e7b4e1..8bd3919af91 100644
--- a/mysql-test/suite/innodb/t/innodb-index.test
+++ b/mysql-test/suite/innodb/t/innodb-index.test
@@ -1166,7 +1166,9 @@ DROP TABLE t;
 CREATE TABLE t (a INT) ENGINE=INNODB;
 -- remove_file $MYSQL_DATA_DIR/test/t.frm
 -- move_file $MYSQL_DATA_DIR/test/t.fr_ $MYSQL_DATA_DIR/test/t.frm
+--enable_prepare_warnings
 SHOW CREATE TABLE t;
+--disable_prepare_warnings
 DROP TABLE t;
 
 --disable_query_log
diff --git a/mysql-test/t/show_explain_ps.test b/mysql-test/t/show_explain_ps.test
index b43cd559e09..13cd1538143 100644
--- a/mysql-test/t/show_explain_ps.test
+++ b/mysql-test/t/show_explain_ps.test
@@ -49,12 +49,12 @@ reap;
 
 set debug_dbug='';
 
-select event_name
-from
-performance_schema.events_stages_history_long
-where
-  event_name like '%show explain' and
-  thread_id in(select thread_id
-               from performance_schema.events_statements_history_long
-               where EVENT_NAME='statement/sql/show_explain');
+evalp select event_name
+        from
+        performance_schema.events_stages_history_long join
+        performance_schema.threads using (thread_id)
+        where
+          event_name like '%show explain' and
+          processlist_id=$thr1;
+
 drop table t0;