Put almost all function prototypes in header files that are

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

1 files changed, 9 insertions, 0 deletions

diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h
index 93435d7f7b3..6827a5a5ece 100644
--- a/storage/connect/odbconn.h
+++ b/storage/connect/odbconn.h
@@ -5,6 +5,14 @@
 //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"
@@ -143,6 +151,7 @@ class ODBConn : public BLOCK {
   bool BindParam(ODBCCOL *colp);
   int  GetCatInfo(CATPARM *cap);
   bool GetDataSources(PQRYRES qrp);
+  bool GetDrivers(PQRYRES qrp);
 
  public:
   // Set special options