diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 18:13:01 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 21:23:35 +0100 |
| commit | fdba672b6fa9f27a2fdbfd03c82c5da725d4204c (patch) | |
| tree | 2f07e742003c8c23b8a0ecadb87fbaa3140432e2 /storage/connect/mysql-test/connect/r | |
| parent | e3d37bfebf818fba7d65fbd89f721dae4864bc0c (diff) | |
| download | mariadb-git-fdba672b6fa9f27a2fdbfd03c82c5da725d4204c.tar.gz | |
Post-merge fixes for Connect engine
1. define connect_EXPORTS, this causes the engine to use MariaDB
versions for timestamp<->struct tm conversion instead of
TZ-dependent libc versions.
2. remove check_access() that was removed once, but re-appeared
during a complex merge.
3. disable a totally broken test
4. update test results
5. skip odbc_firebird test when no firebird DSN is available
Diffstat (limited to 'storage/connect/mysql-test/connect/r')
| -rw-r--r-- | storage/connect/mysql-test/connect/r/json.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/mysql-test/connect/r/json.result b/storage/connect/mysql-test/connect/r/json.result index aa6b04c58c7..6a9d5172bfd 100644 --- a/storage/connect/mysql-test/connect/r/json.result +++ b/storage/connect/mysql-test/connect/r/json.result @@ -189,7 +189,7 @@ Location CHAR(16) FIELD_FORMAT='PUBLISHER:PLACE', Year int(4) FIELD_FORMAT='DATEPUB', INDEX IX(ISBN) ) -ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='bib0.json' LRECL=320 OPTION_LIST='Pretty=0'; +ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='bib0.json' LRECL=350 OPTION_LIST='Pretty=0'; SHOW INDEX FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 1 IX 1 ISBN A NULL NULL NULL XINDEX |