diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-28 10:55:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-28 10:55:46 +0100 |
| commit | cd0734d6bde05906b0dcecd2e90d0bbb056a88c7 (patch) | |
| tree | a9aeed495322435b13346bf768b0cda46cc1c444 /storage/connect | |
| parent | 70e567f576319fc98ff76552fe2e688aeb46fa2c (diff) | |
| download | mariadb-git-cd0734d6bde05906b0dcecd2e90d0bbb056a88c7.tar.gz | |
after-merge: enable tests
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/mysql-test/connect/disabled.def | 2 | ||||
| -rw-r--r-- | storage/connect/mysql-test/connect/r/grant2.result | 2 | ||||
| -rw-r--r-- | storage/connect/mysql-test/connect/r/infoschema2-9739.result | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/storage/connect/mysql-test/connect/disabled.def b/storage/connect/mysql-test/connect/disabled.def index bf1542f4b1d..827ed58b835 100644 --- a/storage/connect/mysql-test/connect/disabled.def +++ b/storage/connect/mysql-test/connect/disabled.def @@ -10,7 +10,6 @@ # ############################################################################## infoschema-9739 : Crashes with MariaDB 10.0 -infoschema2-9739 : Temporary until recording result with MariaDB 10.0 jdbc : Variable settings depend on machine configuration jdbc_new : Variable settings depend on machine configuration jdbc_oracle : Variable settings depend on machine configuration @@ -22,4 +21,3 @@ mongo_c : Need MongoDB running and its C Driver installed mongo_java_2 : Need MongoDB running and its Java Driver installed mongo_java_3 : Need MongoDB running and its Java Driver installed tbl_thread : Bug MDEV-9844,10179,14214 03/01/2018 OB Option THREAD removed -vcol : Different error code on different versions diff --git a/storage/connect/mysql-test/connect/r/grant2.result b/storage/connect/mysql-test/connect/r/grant2.result index acefe6df659..0259dd74cdc 100644 --- a/storage/connect/mysql-test/connect/r/grant2.result +++ b/storage/connect/mysql-test/connect/r/grant2.result @@ -622,7 +622,7 @@ test.t1 optimize status OK OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize Error Access denied for user 'user'@'localhost' (using password: NO) -test.t1 optimize Error Can't lock file (errno: 122 "Internal (unspecified) error in handler") +test.t1 optimize Error Got error 122 'This operation requires the FILE privilege' from CONNECT test.t1 optimize error Corrupt DROP TABLE t1; # Testing SQLCOM_ALTER_TABLE (adding columns) diff --git a/storage/connect/mysql-test/connect/r/infoschema2-9739.result b/storage/connect/mysql-test/connect/r/infoschema2-9739.result index 807d9a608f0..7d8a6839ea5 100644 --- a/storage/connect/mysql-test/connect/r/infoschema2-9739.result +++ b/storage/connect/mysql-test/connect/r/infoschema2-9739.result @@ -8,5 +8,5 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE Warnings: Warning 1286 Unknown storage engine 'InnoDB' Warning 1286 Unknown storage engine 'InnoDB' -Warning 1105 +Warning 1296 Got error 174 'File t1.xml not found' from CONNECT drop table t1; |