Commits · 6a731e7024ff3a7d9f74e370159e572a4a574625 · nexedi / MariaDB

04 Feb, 2013 5 commits

Adding preliminary code to skip the test "xml". · 6a731e70

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

6a731e70

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

Adding tests for ALTER TABLE · 8d65770d

Alexander Barkov authored Feb 04, 2013

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

8d65770d

Removing iconv dependency. · 2e7a4328

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

2e7a4328

Fixing my_charset_utf8_bin to my_charset_utf8_general_ci. · db192415

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

db192415

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

2>libdoc.cpp · de0a7e13

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.

de0a7e13

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

Replacing iconv converstion routines in libdoc.cc to MariaDB routines. · c02e9c25

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

c02e9c25

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

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

381978c0

Adding an option to switch off ICONV support: · 7c862124

Alexander Barkov authored Feb 01, 2013

cmake -DCONNECT_WITH_ICONV=0

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

7c862124

Fixing to use my_interval_timer() instead of ftime(). · 8265b0a5

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

8265b0a5

ftime does not exist on FreeBSD. · 3c1daa2b

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.

3c1daa2b

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

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

31 Jan, 2013 4 commits

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

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

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

c0d41f55

Adding basic XML tests. More XML tests coming soon. · 6799015f

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

6799015f

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

30 Jan, 2013 3 commits

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

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

Adding a test suite for the CONNECT storage engine. · 62c66e12

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

62c66e12

29 Jan, 2013 11 commits
- Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong). · bf134d1c
  Olivier Bertrand authored Jan 30, 2013
  
  bf134d1c
- Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong). · 8a9e48a8
  Olivier Bertrand authored Jan 30, 2013
  
  8a9e48a8
- Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong). · 8aff0400
  Olivier Bertrand authored Jan 29, 2013
  
  8aff0400
- Removing os2def.h · 0640ba07
  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
```
  0640ba07
- Adding a comment why TranslateSQLType is exported. · 20e8c565
  Alexander Barkov authored Jan 29, 2013
```
modified:
  storage/connect/value.h
```
  20e8c565
- Removing redundant declaration of ulonglong. · cf19c126
  Alexander Barkov authored Jan 29, 2013
```
It's defined in my_global.h which is included through handler.h

modified:
  storage/connect/connect.cc
```
  cf19c126
- Fixing compilation failure caused by wrong definition of DWORD · cdb9b9fb
  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
```
  cdb9b9fb
- Compilation failed on Debian 32-bit. · 162fad94
  Alexander Barkov authored Jan 29, 2013
```
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.
```
  162fad94
- Removing more duplicate declarations. · 6d521cf6
  Alexander Barkov authored Jan 29, 2013
```
Fixing DWORD declaration to "unsigned int".
Fixing BIGINT declatation from uint64_t to longlong.
```
  6d521cf6
- Adding os.h forgotten in the previous changeset. · 2e648e4b
  Alexander Barkov authored Jan 29, 2013
```
added:
  storage/connect/os.h
```
  2e648e4b
- Moving duplicate data type declatations into os.h. · d1393c22
  Alexander Barkov authored Jan 29, 2013
```
modified:
  storage/connect/global.h
  storage/connect/inihandl.c
  storage/connect/osutil.h
```
  d1393c22
28 Jan, 2013 4 commits

Adding detection of msxml library version: · 4d417894

Alexander Barkov authored Jan 28, 2013

 msxml2, msxml3, msxml4, msxml6

modified:
  storage/connect/CMakeLists.txt
  storage/connect/domdoc.cpp

4d417894

Defining __STDC__, otherwise it does not compile on Windows · a9d1f196
Alexander Barkov authored Jan 28, 2013
```
modified:
  storage/connect/fmdlex.c
```
a9d1f196

Alexander Barkov authored Jan 28, 2013

- 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

81232ed8

Adding a possibility to disable ODBC, XML and MySQL support in CONNECT: · 83836439
Alexander Barkov authored Jan 28, 2013
```
cmake . -DCONNECT_WITH_ODBC=0 -DCONNECT_WITH_XML=0 -DCONNECT_WITH_MYSQL=0

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

24 Jan, 2013 3 commits
- Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong). · 8c9c6e9c
  Olivier Bertrand authored Jan 24, 2013
  
  8c9c6e9c
- Adding automatic LibXml2 detection for Windows · 39cba121
  Alexander Barkov authored Jan 24, 2013
```
with searching in a number of typical places.
```
  39cba121
- Making the OS specific part more readable (indentation). · 4eb04f11
  Alexander Barkov authored Jan 24, 2013
```
modified:
  storage/connect/CMakeLists.txt
```
  4eb04f11