diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 07:50:05 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 07:50:05 +0300 |
commit | 657bcf928eb1c6a80ee2c82f0dcdd59ab02927e4 (patch) | |
tree | c692f1600c06da934cf44240228516eed88c868f /storage/test_sql_discovery | |
parent | e97b785d764f85009412947600195001be01a706 (diff) | |
parent | 563daec123728f69dc56d898d1d8b198e9e2d411 (diff) | |
download | mariadb-git-657bcf928eb1c6a80ee2c82f0dcdd59ab02927e4.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/test_sql_discovery')
-rw-r--r-- | storage/test_sql_discovery/mysql-test/sql_discovery/simple.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test index 90eea753a38..a8c7ef9a6bb 100644 --- a/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test +++ b/storage/test_sql_discovery/mysql-test/sql_discovery/simple.test @@ -29,6 +29,7 @@ show warnings; set @@test_sql_discovery_statement='t1:create table t1 (a int primary key) partition by hash(id) partitions 2'; --error ER_SQL_DISCOVER_ERROR select * from t1; +--replace_result 1289 1290 "The 'partitioning' feature is disabled; you need MariaDB built with '--with-plugin-partition' to have it working" "The MariaDB server is running with the --skip-partition option so it cannot execute this statement" show warnings; set @@test_sql_discovery_statement='t1:create table t1 (a int) union=(t3,t4)'; |