From 1f020299f816263e347c852eb2a494b5ef1cbf0d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 15 Mar 2019 15:06:17 +0100 Subject: 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) --- sql/sql_prepare.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/sql_prepare.cc') diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index f99dc237cd0..fa9fc6fb9f8 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2530,6 +2530,7 @@ static bool check_prepared_statement(Prepared_statement *stmt) case SQLCOM_ALTER_DB_UPGRADE: case SQLCOM_CHECKSUM: case SQLCOM_CREATE_USER: + case SQLCOM_ALTER_USER: case SQLCOM_RENAME_USER: case SQLCOM_DROP_USER: case SQLCOM_CREATE_ROLE: -- cgit v1.2.1