Currently only for ASCII data.
TODO: add tests for extended letters (e.g. Latin1, Cyrillic, etc).
added:
mysql-test/suite/connect/r/odbc_xls.result
mysql-test/suite/connect/std_data/contacts.xls
mysql-test/suite/connect/t/odbc_xls.test
- Removing duplicate code to generate error message text
- In the future they will most likely check secure_file_priv directory.
modified:
storage/connect/filamdbf.cpp
storage/connect/filamfix.cpp
storage/connect/filamtxt.cpp
storage/connect/filamvct.cpp
storage/connect/libdoc.cpp
storage/connect/maputil.cpp
storage/connect/plgdbsem.h
storage/connect/plgdbutl.cpp
storage/connect/tabfmt.cpp
storage/connect/tabmul.cpp
storage/connect/tabxml.cpp
storage/connect/xindex.cpp
It's incomplete, because CONNECT engine allows
to create the table even if libxml2 is not compiled.
Asked Olivier to reject CREATE TABLE in such cases.
modified:
mysql-test/suite/connect/t/xml.test
Using MariaDB in-house character set conversion routines.
modified:
storage/connect/CMakeLists.txt
storage/connect/tabodbc.cpp
storage/connect/tabodbc.h
The formed required strings.lib in Windows.
The latter is an exported symbol from mysqld and does not need strings.lib.
modified:
storage/connect/ha_connect.cc
storage/connect/libdoc.cpp
2>D:\CommonSource\mariadb-10.0\include\my_pthread.h(120) : warning C4005: '_REENTRANT' : redéfinition de macro
2> D:\Libxml\include\libxml/xmlexports.h(77) : voir la définition précédente de '_REENTRANT'
2>.\libdoc.cpp(378) : error C2664: 'strlen' : impossible de convertir le paramètre 1 de 'xmlChar *' en 'const char *'
2> Les types pointés n'ont aucun rapport entre eux ; conversion nécessitant reinterpret_cast, cast de style C ou cast de style fonction
2>.\libdoc.cpp(379) : error C2664: 'copy_and_convert' : impossible de convertir le paramètre 4 de 'xmlChar *' en 'const char *'
2> Les types pointés n'ont aucun rapport entre eux ; conversion nécessitant reinterpret_cast, cast de style C ou cast de style fonction
2>
Fix for that.
- LIBXML2_SUPPORT is defined if LibXml2 is found
- DOMDOC_SUPPORT is defined if msxml is found
- XML_SUPPORT is defined if either of them are found
NOXML2 was removed
modified:
storage/connect/CMakeLists.txt
storage/connect/global.h
storage/connect/ha_connect.cc
storage/connect/plgdbutl.cpp
storage/connect/plgxml.cpp
The later is not portable (e.g. it does not exist on FreeBSD)
modified:
storage/connect/ha_connect.cc
storage/connect/user_connect.cc
storage/connect/user_connect.h
sure the tests work in a similar way on Windows
when both DOMDOC and LIBXML2 are compiled.
Tests with DOMDOC will go into a separate *.test file.
modified:
mysql-test/suite/connect/r/xml.result
mysql-test/suite/connect/t/xml.test
storage/connect/CMakeLists.txt
in unixODBC headers on 64-bit platforms.
Moving function definitions from value.cpp to odbconn.cpp.
Changing scope of GetSQLType and GetSQLCType from public to static.
modified:
storage/connect/odbconn.cpp
storage/connect/value.cpp
storage/connect/value.h
Fixing DWORD definition once again as "unsigned long",
which is the way how MS defines it.
modified:
@ storage/connect/os.h
Changing DWORD defitition
@ storage/connect/tabodbc.cpp
Moving "#define NODW" to proper place.
- without ODBC: adding a few "#ifdef CONNECT_SUPPORT"
- with ODBC on Linux: conflicting definitions for DWORD
in sql.h (unixODBC) vs global.h.
Using "typedef unsigned int DWORD", as this is how MS SQK defines it
and matches unixODBC definition.
Removing sqlutil.h. value.cpp now uses sql.h and sqlext.h instead.
removed:
storage/connect/sqlutil.h
modified:
storage/connect/global.h
storage/connect/value.cpp
storage/connect/value.h
