Merge branch 'master' into 2.0 + version bump to 2.0.8

mariadb-corporation · Jun 12, 2015 · 0ba0fc5 · 0ba0fc5
2 parents aaab313 + 0591b92
commit 0ba0fc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,9 +22,9 @@ cmake_minimum_required(VERSION 2.8)
 
 SET(MARIADB_ODBC_VERSION_MAJOR 2)
 SET(MARIADB_ODBC_VERSION_MINOR 0)
-SET(MARIADB_ODBC_VERSION_PATCH 7)
+SET(MARIADB_ODBC_VERSION_PATCH 8)
 
-SET(MARIADB_ODBC_VERSION "02.00.0007")
+SET(MARIADB_ODBC_VERSION "02.00.0008")
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/ma_odbc_version.h.in
                ${CMAKE_SOURCE_DIR}/ma_odbc_version.h)

diff --git a/ma_statement.c b/ma_statement.c
@@ -2207,7 +2207,7 @@ SQLRETURN MADB_StmtGetData(SQLHSTMT StatementHandle,
      // memset(TargetValuePtr, 0, MIN((size_t)BufferLength, (SrcLength+1) * sizeof(SQLWCHAR) ));
       if (Stmt->stmt->fields[Offset].max_length)
         Length= MADB_SetString(&Stmt->Connection->charset, TargetValuePtr, BufferLength / sizeof(SQLWCHAR),
-                                   ClientValue, Stmt->stmt->fields[i].max_length - Stmt->CharOffset[Offset], &Stmt->Error);
+                                   ClientValue, Stmt->stmt->fields[Offset].max_length - Stmt->CharOffset[Offset], &Stmt->Error);
 
       if (Length > BufferLength / sizeof(SQLWCHAR)) {
         if (StrLen_or_IndPtr)
@@ -2657,7 +2657,7 @@ SQLRETURN MADB_StmtTables(MADB_Stmt *Stmt, char *CatalogName, SQLSMALLINT NameLe
   else
   {
     init_dynamic_string(&StmtStr, "SELECT TABLE_SCHEMA AS TABLE_CAT, NULL AS TABLE_SCHEM, TABLE_NAME, "
-                                  "TABLE_TYPE ,"
+                                  "if(TABLE_TYPE='BASE TABLE','TABLE',TABLE_TYPE) AS TABLE_TYPE ,"
                                   "TABLE_COMMENT AS REMARKS FROM INFORMATION_SCHEMA.TABLES WHERE 1=1 ",
                                   8192, 512);
     if (Stmt->Options.MetadataId== SQL_TRUE)