bk commit - MyODBC 3.51 (1.344)

Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'pharvey'. When 'pharvey' does a push, they will
be propogaged to the main repository and within 2 hours after the push
into the public repository. 

For more information on how to access the public repository see:
http://www.mysql.com/products/myodbc/faq_2.html#Development_source

You can also browse the changes from public repository:
Complete repository: http://mysql.bkbits.net:8080/myodbc3/
This changeset     : http://mysql.bkbits.net:8080/myodbc3/cset@xxxxx

ChangeSet
  1.344 04/08/01 10:26:21 peterh@xxxxxxxxx +2 -0
  enhancements based upon testing on Linux

  myodbcinst/myodbcinst.c
    1.7 04/08/01 10:26:20 peterh@xxxxxxxxx +23 -0
    enhancements based upon testing on Linux

  myodbcinst/Makefile.unix
    1.1 04/08/01 10:24:48 peterh@xxxxxxxxx +7 -0

  myodbcinst/Makefile.unix
    1.0 04/08/01 10:24:48 peterh@xxxxxxxxx +0 -0
    BitKeeper file 
/home/pharvey/SandBox/MySQL/myodbc-3.51/myodbcinst/Makefile.unix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: peterh
# Host: thinkpad.peterharvey.org
# Root: /home/pharvey/SandBox/MySQL/myodbc-3.51
--- New file ---
+++ myodbcinst/Makefile.unix    04/08/01 10:24:48
all:
        gcc -D_UNIX_ -c myodbcinst.c
        gcc myodbcinst.o -o myodbcinst -L/usr/local/lib -lodbc -lodbcinst

clean:
        rm *.o



--- 1.6/myodbcinst/myodbcinst.c Sat Jul 31 20:57:17 2004
+++ 1.7/myodbcinst/myodbcinst.c Sun Aug  1 10:26:20 2004
@@ -25,6 +25,10 @@
 
 #ifdef _UNIX_
   #include <odbcinst.h>
+  #include <stdio.h>
+
+  #define FALSE 0
+  #define TRUE 1
 #endif
 
 /*! Our syntax. This is likely to expand over time. */
@@ -113,6 +117,25 @@
   {
     doInstallerError();
     printf( "[%s][%d][ERROR] Failed to register driver. The most likely reason 
for this is that you do not have write privs. to 
~/Library/ODBC/odbcinst.ini.\n", __FILE__, __LINE__ );
+    return 0;
+  }
+
+  printf( "[%s][%d][INFO] Driver registered. Usage count is %d. Location 
\"%s\" \n", __FILE__, __LINE__, nUsageCount, szLoc );
+  return 1;
+}
+#endif
+
+#ifdef _UNIX_    
+int doRegisterDriver()
+{
+  char  szLoc[1024];
+  WORD  nLocLen;
+  DWORD nUsageCount;
+
+  if ( !SQLInstallDriverEx( "MySQL ODBC 3.51 
Driver\0Driver=libmyodbc3.so\0\0", 0, szLoc, 1023, &nLocLen, 
ODBC_INSTALL_COMPLETE, &nUsageCount ) )
+  {
+    doInstallerError();
+    printf( "[%s][%d][ERROR] Failed to register driver\n", __FILE__, __LINE__ 
);
     return 0;
   }
 

-- 
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe:    http://lists.mysql.com/myodbc?unsub=gcdmo-myodbc@xxxxxxxxxxx