diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-18 13:01:19 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-18 13:01:19 +0200 |
| commit | b0998583f8e7331245597a7bf9a878cf6c7fa969 (patch) | |
| tree | 9beb25da065c03bc89f295d4a1fc274af0b6c034 /storage/oqgraph | |
| parent | c669e764d86a5b575df41d287947816878e21697 (diff) | |
| parent | 1abc476f0b4fe60cb268fc68cefd9b5a479983ac (diff) | |
| download | mariadb-git-st-10.7-merge.tar.gz | |
Merge 10.6 into 10.7st-10.7-merge
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/ha_oqgraph.cc | 2 | ||||
| -rw-r--r-- | storage/oqgraph/mysql-test/oqgraph/invalid_operations.result | 11 | ||||
| -rw-r--r-- | storage/oqgraph/mysql-test/oqgraph/invalid_operations.test | 13 |
3 files changed, 25 insertions, 1 deletions
diff --git a/storage/oqgraph/ha_oqgraph.cc b/storage/oqgraph/ha_oqgraph.cc index 39d10699d32..9bc4b3339dd 100644 --- a/storage/oqgraph/ha_oqgraph.cc +++ b/storage/oqgraph/ha_oqgraph.cc @@ -194,7 +194,7 @@ static int oqgraph_init(void *p) hton->discover_table_structure= oqgraph_discover_table_structure; hton->close_connection = oqgraph_close_connection; - hton->drop_table= [](handlerton *, const char*) { return 0; }; + hton->drop_table= [](handlerton *, const char*) { return -1; }; oqgraph_init_done= TRUE; return 0; diff --git a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result index 49639c278d0..930d65afc53 100644 --- a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result +++ b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result @@ -30,3 +30,14 @@ update graph set origid=123; ERROR HY000: Table 'graph' is read only DROP TABLE graph_base; DROP TABLE graph; +# +# End of 10.0 tests +# +# +# MDEV-25373 DROP TABLE doesn't raise error while dropping non-existing table in MariaDB 10.5.9 when OQGraph SE is loaded to the server +# +drop table foobar; +ERROR 42S02: Unknown table 'test.foobar' +# +# End of 10.5 tests +# diff --git a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test index cab99ec5018..24351cc9998 100644 --- a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test +++ b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test @@ -48,3 +48,16 @@ update graph set origid=123; DROP TABLE graph_base; DROP TABLE graph; +--echo # +--echo # End of 10.0 tests +--echo # + +--echo # +--echo # MDEV-25373 DROP TABLE doesn't raise error while dropping non-existing table in MariaDB 10.5.9 when OQGraph SE is loaded to the server +--echo # +--error 1051 +drop table foobar; + +--echo # +--echo # End of 10.5 tests +--echo # |