Commits · 8cfa84ca875ac464f5e37be88dc521bb2dd89091 · nexedi / MariaDB

07 Feb, 2013 4 commits

Alexander Barkov authored Feb 07, 2013

Using "bool" in pure C code is not a good idea.
- Defining BOOL as "long" on Unix (this is how MS defines it)
- Replacing bool to BOOL in pure C code.

modified:
  storage/connect/global.h
  storage/connect/inihandl.c
  storage/connect/os.h
  storage/connect/osutil.c
  storage/connect/osutil.h

8cfa84ca

Fixing redundant declaration. · 48ca5c6b
Alexander Barkov authored Feb 07, 2013
```
modified:
  storage/connect/os.h
  storage/connect/osutil.h
```
48ca5c6b
Removing reduntant ODBC constants. · f3302230
Alexander Barkov authored Feb 07, 2013
```
Use "#include <sql.h>" when needed.

modified:
  storage/connect/catalog.h
```
f3302230
- Fixing TAB to 2 spaces · 30c4b0eb
Alexander Barkov authored Feb 07, 2013
```
- Fixing line endings from "\r\n" to "\n"
```
30c4b0eb

06 Feb, 2013 6 commits

Adding missing DROP TABLE. · 60c4cab3
Alexander Barkov authored Feb 06, 2013
```
Otherwise, the further tests fail on "table t1 already exists"
```
60c4cab3

Adding a test for ODBC/XLS. · 0758b2bd

Alexander Barkov authored Feb 06, 2013

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

0758b2bd

Introducing functions global_open() and global_fopen() for these purposes: · 22a8fb03

Alexander Barkov authored Feb 06, 2013

- 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

22a8fb03

Adding tests for TABLE_TYPE=FIX · 9aa88d50

Alexander Barkov authored Feb 06, 2013

added:
  mysql-test/suite/connect/r/fix.result
  mysql-test/suite/connect/std_data/boys.txt
  mysql-test/suite/connect/std_data/boyswin.txt
  mysql-test/suite/connect/std_data/dept.dat
  mysql-test/suite/connect/t/fix.test

9aa88d50

Adding basic tests for TABLE_TYPE=fmt · 06dd5ea4

Alexander Barkov authored Feb 06, 2013

      
added:
  mysql-test/suite/connect/r/fmt.result
  mysql-test/suite/connect/std_data/funny.txt
  mysql-test/suite/connect/std_data/funny2.txt
  mysql-test/suite/connect/t/fmt.test

06dd5ea4

Commenting ALTER test which changes the DBF file size. · 1b40c7c7

Alexander Barkov authored Feb 06, 2013

It does not work on Windows.

modified:
  mysql-test/suite/connect/r/dbf.result
  mysql-test/suite/connect/t/dbf.test

1b40c7c7

05 Feb, 2013 1 commit

Make possible to get ODBC DataSources name and description by: · 1830e732

Olivier Bertrand authored Feb 05, 2013

create table datasrc (
`anyname` varchar(256) flag=1,
`anyother name` varchar(256) flag=2)
engine=CONNECT table_type=ODBC option_list='info=yes';

or simply by:

create table datasrc engine=CONNECT table_type=ODBC option_list='info=yes';

then:

select * from datasrc;

Modified:
ha_connect.cc
odbconn.h
odbconn.cpp
tabodbc.h
tabodbc.cpp

1830e732

04 Feb, 2013 5 commits

Adding preliminary code to skip the test "xml". · 9d8d62ee

Alexander Barkov authored Feb 04, 2013

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

9d8d62ee

Adding tests for NULL column values. · ead2372e
Alexander Barkov authored Feb 04, 2013
```
modified:
  mysql-test/suite/connect/r/dbf.result
  mysql-test/suite/connect/t/dbf.test
```
ead2372e

Adding tests for ALTER TABLE · 49e3bb02

Alexander Barkov authored Feb 04, 2013

modified:
  mysql-test/suite/connect/r/dbf.result
  mysql-test/suite/connect/t/dbf.test

49e3bb02

Removing iconv dependency. · a38ae869

Alexander Barkov authored Feb 04, 2013

Using MariaDB in-house character set conversion routines.

modified:
  storage/connect/CMakeLists.txt
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h

a38ae869

Fixing my_charset_utf8_bin to my_charset_utf8_general_ci. · dc6e20bd

Alexander Barkov authored Feb 04, 2013

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

dc6e20bd

03 Feb, 2013 1 commit
- Translate column names to UTF-8 in ha_connect::pre_create. · e89cb7f2
  Olivier Bertrand authored Feb 03, 2013
  
  e89cb7f2
01 Feb, 2013 9 commits

2>libdoc.cpp · 9ca150aa

Olivier Bertrand authored Feb 02, 2013

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.

9ca150aa

Fixing a typo: · f1b87189
Alexander Barkov authored Feb 01, 2013
```
#ifdef defined(XXX) ->
#ifdef XXX
```
f1b87189

Replacing iconv converstion routines in libdoc.cc to MariaDB routines. · 7a8402c9

Alexander Barkov authored Feb 01, 2013

TODO: Access to Field->charset() instead of hardcoded latin1 conversion.

modified:
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h

7a8402c9

Adding tests for SMALLINT and BIGINT for DBF. · 1e976f42
Alexander Barkov authored Feb 01, 2013
```
modified:
  mysql-test/suite/connect/r/dbf.result
  mysql-test/suite/connect/t/dbf.test
```
1e976f42

Alexander Barkov authored Feb 01, 2013

- 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

dde8622c

Adding an option to switch off ICONV support: · 733ab86c

Alexander Barkov authored Feb 01, 2013

cmake -DCONNECT_WITH_ICONV=0

modified:
  storage/connect/CMakeLists.txt
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h

733ab86c

Fixing to use my_interval_timer() instead of ftime(). · f09ae60d

Alexander Barkov authored Feb 01, 2013

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

f09ae60d

ftime does not exist on FreeBSD. · 3d8ef8bf

Alexander Barkov authored Feb 01, 2013

Hiding calls for ftime() as a temporary fix.

This code should be modified to use my_time_microseconds() instead.

3d8ef8bf

Adding separate flags to disable MSXML and LIBXML2 libraries on Windows: · d1011629
Alexander Barkov authored Feb 01, 2013
```
-DCONNECT_WITH_LIBXML2=0
-DCONNECT_WITH_MSXML=0

modified:
  storage/connect/CMakeLists.txt
```
d1011629

31 Jan, 2013 4 commits

DBF type N is now BIGINT when length is > 10. · 627d046d
Olivier Bertrand authored Jan 31, 2013
```
Fix ha_connect::external_lock to use F_RDLCK, F_WRLCK, F_UNLCK.
```
627d046d

Adding OPTION_LIST='xmlsup=libxml2' to make · e8c24a73

Alexander Barkov authored Jan 31, 2013

      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

e8c24a73

Adding basic XML tests. More XML tests coming soon. · 1e3610dd

Alexander Barkov authored Jan 31, 2013

added:
  mysql-test/suite/connect/r/xml.result
  mysql-test/suite/connect/std_data/
  mysql-test/suite/connect/std_data/cp1251.xml
  mysql-test/suite/connect/std_data/latin1.xml
  mysql-test/suite/connect/std_data/nocs.xml
  mysql-test/suite/connect/std_data/xsample.xml
  mysql-test/suite/connect/t/xml.test

1e3610dd

Adding DBF stored procedures to dump the underlying DBF file structure. · 8eccf8dd
Alexander Barkov authored Jan 31, 2013
```
  
  modified:
    mysql-test/suite/connect/r/dbf.result
    mysql-test/suite/connect/t/dbf.test
```
8eccf8dd

30 Jan, 2013 3 commits

Fix incorrect DBF type setting for SORT and BIGINT. · ad41e7ee
Olivier Bertrand authored Jan 31, 2013

ad41e7ee
Adding more DBF tests for ENGINE=CONNECT. · 7af8c83d
Alexander Barkov authored Jan 30, 2013
```
modified:
  mysql-test/suite/connect/r/dbf.result
  mysql-test/suite/connect/t/dbf.test
```
7af8c83d

Adding a test suite for the CONNECT storage engine. · 8d49e7dd

Alexander Barkov authored Jan 30, 2013

added:
  mysql-test/suite/connect/
  mysql-test/suite/connect/r/
  mysql-test/suite/connect/r/dbf.result
  mysql-test/suite/connect/suite.opt
  mysql-test/suite/connect/suite.pm
  mysql-test/suite/connect/t/
  mysql-test/suite/connect/t/dbf.test

8d49e7dd

29 Jan, 2013 7 commits
- Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong). · 29df840a
  Olivier Bertrand authored Jan 30, 2013
  
  29df840a
- Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong). · 74b51d95
  Olivier Bertrand authored Jan 30, 2013
  
  74b51d95
- Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong). · 26b00be3
  Olivier Bertrand authored Jan 29, 2013
  
  26b00be3
- Removing os2def.h · c87004d8
  Alexander Barkov authored Jan 29, 2013
```
removed:
  storage/connect/os2def.h
modified:
  storage/connect/fmdlex.c
  storage/connect/maputil.cpp
  storage/connect/tabcol.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabmul.cpp
  storage/connect/tabmysql.cpp
```
  c87004d8
- Adding a comment why TranslateSQLType is exported. · a9d06e10
  Alexander Barkov authored Jan 29, 2013
```
modified:
  storage/connect/value.h
```
  a9d06e10
- Removing redundant declaration of ulonglong. · 258c6d47
  Alexander Barkov authored Jan 29, 2013
```
It's defined in my_global.h which is included through handler.h

modified:
  storage/connect/connect.cc
```
  258c6d47
- Fixing compilation failure caused by wrong definition of DWORD · 18e02f06
  Alexander Barkov authored Jan 29, 2013
```
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
```
  18e02f06