diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-04-14 11:50:34 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-04-14 11:50:34 +0400 |
| commit | 9d734cdd61e4174589031431138bed2f85472a58 (patch) | |
| tree | 820e10b38bf67f9be5326d13de60b4e72c87cb35 /storage | |
| parent | f130a5ea3c1cc504acecbad7615fb27c6e28dbfa (diff) | |
| parent | 767d8d8335f9d45efb86c77a9efa0b42aff1eb27 (diff) | |
| download | mariadb-git-9d734cdd61e4174589031431138bed2f85472a58.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into 10.3
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/spider/mysql-test/spider/r/spider3_fixes.result | 8 | ||||
| -rw-r--r-- | storage/spider/mysql-test/spider/t/spider3_fixes.test | 10 | ||||
| -rw-r--r-- | storage/spider/spd_table.cc | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/storage/spider/mysql-test/spider/r/spider3_fixes.result b/storage/spider/mysql-test/spider/r/spider3_fixes.result index d6aec25bfc1..7a80e102462 100644 --- a/storage/spider/mysql-test/spider/r/spider3_fixes.result +++ b/storage/spider/mysql-test/spider/r/spider3_fixes.result @@ -200,6 +200,14 @@ id 5000 10000 connection master_1; +# +# MDEV-28225 Disallow user to create Spider temporary table +# +connection master_1; +CREATE TEMPORARY TABLE t1 ( +a INT +) ENGINE=Spider; +ERROR HY000: Table storage engine 'SPIDER' does not support the create option 'TEMPORARY' deinit connection master_1; diff --git a/storage/spider/mysql-test/spider/t/spider3_fixes.test b/storage/spider/mysql-test/spider/t/spider3_fixes.test index 13fa6f5fa39..73126d6d348 100644 --- a/storage/spider/mysql-test/spider/t/spider3_fixes.test +++ b/storage/spider/mysql-test/spider/t/spider3_fixes.test @@ -264,6 +264,16 @@ if ($USE_CHILD_GROUP2) } +--echo # +--echo # MDEV-28225 Disallow user to create Spider temporary table +--echo # +--connection master_1 +--error ER_ILLEGAL_HA_CREATE_OPTION +CREATE TEMPORARY TABLE t1 ( + a INT +) ENGINE=Spider; + + --echo --echo deinit --disable_warnings diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index ca3b7fa08ed..20347c4ebad 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -6878,7 +6878,7 @@ int spider_db_init( spider_hton_ptr = spider_hton; spider_hton->state = SHOW_OPTION_YES; - spider_hton->flags = HTON_NO_FLAGS; + spider_hton->flags = HTON_TEMPORARY_NOT_SUPPORTED; #ifdef HTON_CAN_READ_CONNECT_STRING_IN_PARTITION spider_hton->flags |= HTON_CAN_READ_CONNECT_STRING_IN_PARTITION; #endif |