1. 15 Feb, 2013 4 commits
  2. 14 Feb, 2013 5 commits
  3. 13 Feb, 2013 4 commits
  4. 12 Feb, 2013 5 commits
    • Olivier Bertrand's avatar
      Fix bug on readonly table option not recognized · c5233703
      Olivier Bertrand authored
      in TABDEF::Define line 104
      
      Modified:
      reldef.cpp
      
      Add a warning on alter in check_if_incompatible_data.
      
      Modified:
      ha_connect.cc
      
      c5233703
    • Olivier Bertrand's avatar
      Add a test on table types in ha_connect::create · 5fc2a7da
      Olivier Bertrand authored
      - The plan was to provide a default type (DOS) when the table type
      was unspecified, wring, or not supported.
      - However, this is not possible here because create is called after
      the FRM file was generated.
      - Currently, this is flagged as an error and the create aborts.
      
      Modified:
      ha_connect.cc
      
      5fc2a7da
    • Olivier Bertrand's avatar
      Fix a bug causing all tests to fail. · 83b7fb0f
      Olivier Bertrand authored
      In mycat.cc line 308
      + correc typo in plgdbsem
      
      Modified:
      mycat.cc
      plgdbsem.h
      
      83b7fb0f
    • Olivier Bertrand's avatar
      All use of a character to represent table types or · 88c76f3b
      Olivier Bertrand authored
      catalog functions have been changed:
      
      Table_types are now internally represented be enum TABTYPE.
      Catalog function names are internally translated to a uint.
      
      The function GetTypeID was modified accordingly and a new
      function GetFuncID was implemented in mycat.cc.
      
      Modified:
      ha_connect.cc
      odbccat.h
      odbconn.cpp
      tabodbc.cpp
      tabfmt.cpp
      tabmysql.h
      tabmysql.cpp
      tabwmi.cpp
      mycat.h
      mycat.cc
      plgdbsem.h
      reldef.h
      tabdos.cpp
      rcmsg.h
      
      88c76f3b
    • Alexander Barkov's avatar
      Changing maximum possible column length for DBF tables from 11 to 10. · b91386c2
      Alexander Barkov authored
      There is actually one extra byte for the 11th character, however it seems
      to be meant for the '\0' terminating byte in the DBF specifications.
      Also, the third party software (e.g. OpenOffice) do not correctly open
      tables with column length=11.
      
      modified:
        mysql-test/suite/connect/r/dbf.result
        mysql-test/suite/connect/t/dbf.test
        storage/connect/ha_connect.cc
      b91386c2
  5. 11 Feb, 2013 6 commits
    • Alexander Barkov's avatar
      Fixing ini.test failure on Linux: · 2adf52b8
      Alexander Barkov authored
      No need to print "\n" before the very first section.
      
      modified:
        storage/connect/inihandl.c
      2adf52b8
    • Alexander Barkov's avatar
      Fixing vec.test failure on Windows. · 237eda72
      Alexander Barkov authored
         
      - The "spath" column does not get replaces with $MYSQLD_DATADIR,
      because it does not include the drive letter part, e.g. C:\.
      Removing excluding spath from the "SELECT ... FROM dir1" query
      
      - Warnings return slightly different text on Linux and Windows.
        Linux has extra "/./" part:
          DATADIR/./test/t1vec1
      
      "--replace_result $MYSQLD_DATADIR DATADIR/" does not help.
      
      Using --replace_regex instead.
      
      modified:
        mysql-test/suite/connect/r/vec.result
        mysql-test/suite/connect/t/vec.test
      237eda72
    • Alexander Barkov's avatar
      Adding test for ENGINE=VEC · 49028611
      Alexander Barkov authored
      added:
        mysql-test/suite/connect/r/vec.result
        mysql-test/suite/connect/t/vec.test
      modified:
        storage/connect/plgdbutl.cpp
      49028611
    • Alexander Barkov's avatar
      Adding a test which crashed in ealier versions (dbf01.sql from Bar) · 63127233
      Alexander Barkov authored
      modified:
        mysql-test/suite/connect/r/dbf.result
        mysql-test/suite/connect/t/dbf.test
      63127233
    • Alexander Barkov's avatar
      Fixing test failure cause by recent changes in ODBC catalogue functions. · 204086bd
      Alexander Barkov authored
      modified:
        mysql-test/suite/connect/r/odbc_xls.result
        mysql-test/suite/connect/t/odbc_xls.test
      204086bd
    • Alexander Barkov's avatar
      Fixing compilation problems on Unix: · ebf2da00
      Alexander Barkov authored
      1. Conflicting declarations:
      
      In file included from /usr/include/sql.h:19:0,
           from <path>/storage/connect/odbconn.h:15,
           from <path>/storage/connect/ha_connect.cc:117:
      /usr/include/sqltypes.h:98:23: error: conflicting declaration
        ‘typedef unsigned int DWORD’
      
      os.h and unixODBC's sqltypes.h (included from sql.h) have conflicting
      declarations, because unixODBC for some reasons incorrectly defines
      DWORD as "unsigned int", while we define DWORD as "unsigned long"
      (which is the Microsoft way).
      
      We should never include os.h and odbconn.h from the same file.
      Inside tabodbc.cpp DWORD must be seen as sql.h defines it.
      In all other files DWORD must be seen as os.h defines it.
      
      Fix:
      Moving ODBC catalog function prototypes into a separate file odbccat.h.
      Fixing ha_connect.cc to include odbccat.h instead of odbcon.h
      
      2. Use of ambiguous overloaded function in myconn.cpp:
      There's no a method SetValue(const char *fmt, int i);
      There's only a method SetValue(char *fmt, int i);
      
      Fixing the call accordingly:
      
      -    crp->Kdata->SetValue((fmt) ? fmt : "", i);
      +    crp->Kdata->SetValue((fmt) ? fmt : (char*) "", i);
      
      Note, this is a quick hack. The correct fix would be to change
      the method prototype to have the "fmt" argument as "const char *".
      However, it is tightly related to about 300 other places where
      "char*" is used instead of "const char *". We'll need to fix
      all of them gradually (in separate changes).
      
      
      added:
        storage/connect/odbccat.h
      modified:
        storage/connect/ha_connect.cc
        storage/connect/myconn.cpp
        storage/connect/odbconn.h
        storage/connect/tabodbc.cpp
      ebf2da00
  6. 10 Feb, 2013 1 commit
    • Olivier Bertrand's avatar
      Bug fixed: Column charset were not handled on read. · f6ca3b05
      Olivier Bertrand authored
      Modified: ha_connect.cc (MakeRecord)
      
      Moved PlgAllocResult to plgdbutl.cpp
      Modified:
      mycat.cpp
      plgdbutl.cpp
      
      Continuing implementing the "catalog" tables (ex "info").
      Already existing were the ODBC data source table and the
      WMI column info table.
      
      The common way to handle them was modified to enable each
      table types to send personalized data.
      
      Now takes care of all existing catalog functions for table
      types that can retrieve and use such information.
      
      Modified:
      ha_connect.cc
      odbconn.cpp
      tabodbc.h
      tabodbc.cpp
      tabfmt.h
      tabfmt.cpp
      tabmysql.h
      tabmysql.cpp
      tabwmi.h
      tabwmi.cpp
      myconn.h
      myconn.cpp
      filamdbf.cpp
      plgdbsem.h
      reldef.h
      reldef.cpp
      tabdos.h
      tabdos.cpp
      tabfix.h
      xtable.h
      table.cpp
      
      f6ca3b05
  7. 09 Feb, 2013 2 commits
    • Olivier Bertrand's avatar
      No commit message · b93db097
      Olivier Bertrand authored
      No commit message
      b93db097
    • Olivier Bertrand's avatar
      Put almost all function prototypes in header files that are · 82e746ea
      Olivier Bertrand authored
      included by the program using them.
      
      Continuing implementing the "catalog" tables (ex "info").
      Already existing were the ODBC data source table and the
      WMI column info table.
      
      A common way to handle them will permit to develop many
      other such tables. Implemented:
      
      The ODBC column catalog table.
      The ODBC tables catalog table.
      The ODBC drivers catalog table.
      
      The INFO table option is replaced by the CATFUNC string option
      whode first letter specifies the information to retrieve:
      C: Columns (of a table)
      T: Tables  (of a database)
      S: Data sources
      D: Drivers
      
      Modified:
      ha_connect.cc
      odbconn.cpp
      odbconn.h
      tabodbc.h
      tabodbc.cpp
      rcmsg.c
      tabfmt.h
      tabmysql.cpp
      tabwmi.cpp
      tabwmi.h
      resource.h
      myconn.h
      filamdbf.h
      connect.cc
      connect.h
      
      Added:
      myutil.h
      82e746ea
  8. 08 Feb, 2013 9 commits
    • Alexander Barkov's avatar
      Removing double new-line markers when doing LOAD_FILE('example.ini'). · 6bd0f5da
      Alexander Barkov authored
      The libary to handle INI files on Windows XP adds an extra empty
      line before sections name.
      
      Newer versions of Windows do not.
      Unix replacement implementation also do not.
      
      modified:
        mysql-test/suite/connect/r/ini.result
        mysql-test/suite/connect/t/ini.test
      6bd0f5da
    • Alexander Barkov's avatar
      Adding a test for TABLE_TYPE=DIR · d0f6e9a8
      Alexander Barkov authored
      added:
        mysql-test/suite/connect/r/dir.result
        mysql-test/suite/connect/t/dir.test
      d0f6e9a8
    • Alexander Barkov's avatar
      Adding tests for TABLE_TYPE=INI · 516e8af8
      Alexander Barkov authored
      added:
        mysql-test/suite/connect/r/ini.result
        mysql-test/suite/connect/std_data/contact.ini
        mysql-test/suite/connect/t/ini.test
      516e8af8
    • Alexander Barkov's avatar
      Adding REPLACE(xxx, '\r\n','\n'), not to fail on Windows. · 3dd08e1f
      Alexander Barkov authored
      pending merges:
        Alexander Barkov 2013-02-08 Adding tests for TABLE_TYPE=CSV
      3dd08e1f
    • Alexander Barkov's avatar
      Adding tests for TABLE_TYPE=CSV · ec838d56
      Alexander Barkov authored
      ec838d56
    • Alexander Barkov's avatar
      Adding tests for TABLE_TYPE=CSV · 9cfc2e23
      Alexander Barkov authored
      added:
        mysql-test/suite/connect/r/csv.result
        mysql-test/suite/connect/std_data/people.csv
        mysql-test/suite/connect/t/csv.test
      9cfc2e23
    • Alexander Barkov's avatar
      Adding a test for TABLE_TYPE=BIN · dd9ee7d1
      Alexander Barkov authored
      added:
        mysql-test/suite/connect/r/bin.result
        mysql-test/suite/connect/std_data/Testbal.dat
        mysql-test/suite/connect/t/bin.test
      dd9ee7d1
    • Olivier Bertrand's avatar
      1) Fix bug on strange sprintf · ec2112f3
      Olivier Bertrand authored
      2) Fix bug on bad sprintf
      3) Fix bug on cast from pointer to int
      
      4) Begin implementing the "info" tables.
      Already existing were the ODBC sata source table and the
      WMI column info table.
      
      A common way to handle them will permit to develop many
      other such tables. Implemented:
      
      The ODBC column info table.
      
      Modified:
      ha_connect.cc  (4)
      odbconn.cpp    (4)
      tabodbc.h      (4)
      tabodbc.cpp    (4)
      tabsys.h       (3)
      rcmsg.c        (4)
      tabfmt.cpp     (2)
      tabtbl.cpp     (1)
      resource.h     (4)
      mycat.h        (4)
      ec2112f3
    • Olivier Bertrand's avatar
      1) Fix bug on strange sprintf · 2809803e
      Olivier Bertrand authored
      2) Fix bug on bad sprintf
      3) Fix bug on cast from pointer to int
      
      4) Begin implementing the "info" tables.
      Already existing were the ODBC sata source table and the
      WMI column info table.
      
      A common way to handle them will permit to develop many
      other such tables. Implemented:
      
      The ODBC column info table.
      
      Modified:
      ha_connect.cc  (4)
      odbconn.cpp    (4)
      tabodbc.h      (4)
      tabodbc.cpp    (4)
      tabsys.h       (3)
      rcmsg.c        (4)
      tabfmt.cpp     (2)
      tabtbl.cpp     (1)
      resource.h     (4)
      mycat.h        (4)
      2809803e
  9. 07 Feb, 2013 4 commits
    • Olivier Bertrand's avatar
      1) Fix bug on strange sprintf · 38edf74a
      Olivier Bertrand authored
      2) Fix bug on bad sprintf
      3) Fix bug on cast from pointer to int
      
      4) Begin implementing the "info" tables.
      Already existing were the ODBC sata source table and the
      WMI column info table.
      
      A common way to handle them will permit to develop many
      other such tables. Implemented:
      
      The ODBC column info table.
      
      Modified:
      ha_connect.cc  (4)
      odbconn.cpp    (4)
      tabodbc.h      (4)
      tabodbc.cpp    (4)
      tabsys.h       (3)
      rcmsg.c        (4)
      tabfmt.cpp     (2)
      tabtbl.cpp     (1)
      resource.h     (4)
      mycat.h        (4)
      38edf74a
    • Alexander Barkov's avatar
      Fixing "unused label" warning. · 7f08277b
      Alexander Barkov authored
      modified:
        storage/connect/CMakeLists.txt
        storage/connect/tabmul.cpp
      7f08277b
    • Alexander Barkov's avatar
      Fixing a warning: · 2787dcb0
      Alexander Barkov authored
      > deleting object of polymorphic class type ‘CATALOG’ which
      > has non-virtual destructor might cause undefined behaviour
      > [-Wdelete-non-virtual-dtor]
      
      Classes whose instances are destroyed using "delete"
      should have virtual destructors.
      
      modified:
        storage/connect/catalog.h
      2787dcb0
    • Alexander Barkov's avatar
      Fixing a warning: · 03259f85
      Alexander Barkov authored
      Changing result type for the method from "char*" instead of "const char*".
      
      modified:
        storage/connect/odbconn.h
      03259f85