Fixed small bug - SQLGetInfo returned a bit wrong value for SQL_DRIVE…

…R_NAME info type. And completely wrong on *nix
mariadb-corporation · May 24, 2016 · f347cea · f347cea
1 parent fbd517e
commit f347cea
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/ma_connection.c b/ma_connection.c
@@ -1094,7 +1094,7 @@ SQLRETURN MADB_DbcGetInfo(MADB_Dbc *Dbc, SQLUSMALLINT InfoType, SQLPOINTER InfoV
   case SQL_DRIVER_NAME:
     SLen= (SQLSMALLINT)MADB_SetString(isWChar ? &Dbc->charset : NULL,
                                      (void *)InfoValuePtr, BUFFER_CHAR_LEN(BufferLength, isWChar), 
-                                     isWChar ? "maodbcu.dll" : "maodbca.dll", SQL_NTS, &Dbc->Error);
+                                     MADB_DRIVER_NAME, SQL_NTS, &Dbc->Error);
     break;
   case SQL_DRIVER_ODBC_VER:
     {

diff --git a/ma_info.c b/ma_info.c
@@ -118,10 +118,10 @@ SQLRETURN MADB_GetTypeInfo(SQLHSTMT StatementHandle,
 {
   MADB_Stmt *Stmt= (MADB_Stmt *)StatementHandle;
   SQLRETURN ret;
-  my_bool isFirst= TRUE;
-  char StmtStr[5120];
-  char *p= StmtStr;
-  int i;
+  my_bool   isFirst= TRUE;
+  char      StmtStr[5120];
+  char      *p= StmtStr;
+  int       i;
   MADB_TypeInfo *TypeInfo= TypeInfoV3;
 
   if (Stmt->Connection->Environment->OdbcVersion == SQL_OV_ODBC2)

diff --git a/ma_platform_posix.h b/ma_platform_posix.h
@@ -35,6 +35,7 @@
 
 //#define HAVE_UNICODE
 
+#define MADB_DRIVER_NAME "libmaodbc.so"
 #define CP_UTF8          65001
 
 #define _strdup strdup

diff --git a/ma_platform_win32.h b/ma_platform_win32.h
@@ -35,4 +35,6 @@
 
 #include <windows.h>
 
+#define MADB_DRIVER_NAME "maodbc.dll"
+
 #endif /*_ma_platform_x_h_ */