5 files changed, 10 insertions, 10 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 4d1ee88c8a1..905f660c016 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -114,7 +114,7 @@
 #include "global.h"
 #include "plgdbsem.h"
 #if defined(ODBC_SUPPORT)
-#include "odbconn.h"
+#include "odbccat.h"
 #endif   // ODBC_SUPPORT
 #if defined(MYSQL_SUPPORT)
 #include "myconn.h"
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index b4347f11094..027d37b86c6 100644
--- a/storage/connect/myconn.cpp
+++ b/storage/connect/myconn.cpp
@@ -208,7 +208,7 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
     crp->Kdata->SetValue(fld, i);
 
     crp = crp->Next;                       // New
-    crp->Kdata->SetValue((fmt) ? fmt : "", i);
+    crp->Kdata->SetValue((fmt) ? fmt : (char*) "", i);
 
     crp = crp->Next;                       // New (charset)
     fld = myc.GetCharField(2);
diff --git a/storage/connect/odbccat.h b/storage/connect/odbccat.h
new file mode 100644
index 00000000000..617c7d613a8
--- /dev/null
+++ b/storage/connect/odbccat.h
@@ -0,0 +1,7 @@
+/***********************************************************************/
+/*  ODBC catalog function prototypes.                                  */
+/***********************************************************************/
+PQRYRES ODBCDataSources(PGLOBAL g, bool info);
+PQRYRES MyODBCCols(PGLOBAL g, char *dsn, char *tab, bool info);
+PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *tabpat, bool info);
+PQRYRES ODBCDrivers(PGLOBAL g, bool info);
diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h
index 6827a5a5ece..f2312a4461f 100644
--- a/storage/connect/odbconn.h
+++ b/storage/connect/odbconn.h
@@ -5,14 +5,6 @@
 //nclude <windowsx.h>                          /* Message crackers     */
 
 /***********************************************************************/
-/*  Catalog function prototypes.                                       */
-/***********************************************************************/
-PQRYRES ODBCDataSources(PGLOBAL g, bool info);
-PQRYRES MyODBCCols(PGLOBAL g, char *dsn, char *tab, bool info);
-PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *tabpat, bool info);
-PQRYRES ODBCDrivers(PGLOBAL g, bool info);
-
-/***********************************************************************/
 /*  Included C-definition files required by the interface.             */
 /***********************************************************************/
 #include "block.h"
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp
index 55475852a62..276834b4e5e 100644
--- a/storage/connect/tabodbc.cpp
+++ b/storage/connect/tabodbc.cpp
@@ -66,6 +66,7 @@
 #include "plgdbsem.h"
 #include "xtable.h"
 #include "tabodbc.h"
+#include "odbccat.h"
 #include "tabmul.h"
 #include "reldef.h"
 #include "tabcol.h"