diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 15:06:17 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 21:00:56 +0100 |
| commit | 1f020299f816263e347c852eb2a494b5ef1cbf0d (patch) | |
| tree | 96613eea5c79139da3d78caee4547296188e8253 /sql/sql_prepare.cc | |
| parent | f1134d567695990dc7d62b6c25e4b9aa8de439e0 (diff) | |
| download | mariadb-git-1f020299f816263e347c852eb2a494b5ef1cbf0d.tar.gz | |
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)
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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: |