mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post-merge fixes for Connect engine

Browse source 
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
This commit is contained in:
Sergei Golubchik 2015-11-19 18:13:01 +01:00
parent e3d37bfebf
commit fdba672b6f
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/connect/CMakeLists.txt
View file

@ -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 )

4
storage/connect/ha_connect.cc
View file

@ -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__

1
storage/connect/mysql-test/connect/disabled.def Normal file
View file

@ -0,0 +1 @@
json_udf : broken upstream

2
storage/connect/mysql-test/connect/r/json.result
View file

@ -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

4
storage/connect/mysql-test/connect/t/odbc_firebird.test
View file

@ -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;