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
MariaDB · Nov 19, 2015 · fdba672 · fdba672
1 parent e3d37bf
commit fdba672
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
@@ -37,7 +37,7 @@ user_connect.h valblk.h value.h xindex.h xobject.h xtable.h)
 #
 # Definitions that are shared for all OSes
 #
-add_definitions( -DMARIADB -DFORCE_INIT_OF_VARS )
+add_definitions( -DMARIADB -DFORCE_INIT_OF_VARS -Dconnect_EXPORTS)
 add_definitions( -DHUGE_SUPPORT -DZIP_SUPPORT -DPIVOT_SUPPORT )
 
 

diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
@@ -6274,10 +6274,6 @@ bool ha_connect::FileExists(const char *fn, bool bf)
     int   n;
     struct stat info;
 
-    if (check_access(ha_thd(), FILE_ACL, table->s->db.str,
-                     NULL, NULL, 0, 0))
-      return true;
-
 #if defined(__WIN__)
     s= "\\";
 #else   // !__WIN__

diff --git a/storage/connect/mysql-test/connect/disabled.def b/storage/connect/mysql-test/connect/disabled.def
@@ -0,0 +1 @@
+json_udf : broken upstream
diff --git 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		

diff --git a/storage/connect/mysql-test/connect/t/odbc_firebird.test b/storage/connect/mysql-test/connect/t/odbc_firebird.test
@@ -9,6 +9,10 @@ SET NAMES utf8;
 CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='Bad connection string';
 
 CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Sources;
+if (`select count(*)=0 from t1 where name='firebird'`) {
+  DROP TABLE t1;
+  skip No Firebird;
+}
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 DROP TABLE t1;