Skip to content

Commit fdba672

Browse files
committed
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
1 parent e3d37bf commit fdba672

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

storage/connect/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ user_connect.h valblk.h value.h xindex.h xobject.h xtable.h)
3737
#
3838
# Definitions that are shared for all OSes
3939
#
40-
add_definitions( -DMARIADB -DFORCE_INIT_OF_VARS )
40+
add_definitions( -DMARIADB -DFORCE_INIT_OF_VARS -Dconnect_EXPORTS)
4141
add_definitions( -DHUGE_SUPPORT -DZIP_SUPPORT -DPIVOT_SUPPORT )
4242

4343

storage/connect/ha_connect.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6274,10 +6274,6 @@ bool ha_connect::FileExists(const char *fn, bool bf)
62746274
int n;
62756275
struct stat info;
62766276

6277-
if (check_access(ha_thd(), FILE_ACL, table->s->db.str,
6278-
NULL, NULL, 0, 0))
6279-
return true;
6280-
62816277
#if defined(__WIN__)
62826278
s= "\\";
62836279
#else // !__WIN__
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
json_udf : broken upstream

storage/connect/mysql-test/connect/r/json.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Location CHAR(16) FIELD_FORMAT='PUBLISHER:PLACE',
189189
Year int(4) FIELD_FORMAT='DATEPUB',
190190
INDEX IX(ISBN)
191191
)
192-
ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='bib0.json' LRECL=320 OPTION_LIST='Pretty=0';
192+
ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='bib0.json' LRECL=350 OPTION_LIST='Pretty=0';
193193
SHOW INDEX FROM t1;
194194
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
195195
t1 1 IX 1 ISBN A NULL NULL NULL XINDEX

storage/connect/mysql-test/connect/t/odbc_firebird.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ SET NAMES utf8;
99
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='Bad connection string';
1010

1111
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Sources;
12+
if (`select count(*)=0 from t1 where name='firebird'`) {
13+
DROP TABLE t1;
14+
skip No Firebird;
15+
}
1216
SHOW CREATE TABLE t1;
1317
SELECT * FROM t1;
1418
DROP TABLE t1;

0 commit comments

Comments
 (0)