 | | | bk commit - MyODBC 3.51 (1.460) | bk commit - MyODBC 3.51 (1.460) 2005-02-16 - By pharvey@(protected)
Back
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@(protected)
ChangeSet
1.460 05/02/16 11:37:48 peterh@(protected) +3 -0
- rpm now uses new myodbcinst options
- myodbcinst now returns proper exit code
- rpm no longer tries to create sample dsn (avoids hidden gui dependency
during install)
scripts/myodbc3.spec.sh
1.14 05/02/16 11:37:47 peterh@(protected) +10 -9
- rpm now uses new myodbcinst options
- myodbcinst now returns proper exit code
- rpm no longer tries to create sample dsn (avoids hidden gui dependency
during install)
myodbcinst/myodbcinst.c
1.36 05/02/16 11:37:47 peterh@(protected) +19 -19
- rpm now uses new myodbcinst options
- myodbcinst now returns proper exit code
- rpm no longer tries to create sample dsn (avoids hidden gui dependency
during install)
ChangeLog
1.32 05/02/16 11:37:47 peterh@(protected) +5 -2
- rpm now uses new myodbcinst options
- myodbcinst now returns proper exit code
- rpm no longer tries to create sample dsn (avoids hidden gui dependency
during install)
# 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
--- 1.31/ChangeLog 2005-02-11 19:00:37 -08:00
+++ 1.32/ChangeLog 2005-02-16 11:37:47 -08:00
@@ -10,8 +10,11 @@
-- resources for last thread now freed
-- rolled back a fix for CR (force v3) as it messed up MS
Access (wants v2)
--- tweeked RPM pre/post install scripts
-
+-- Tweeked binary rpm spec. No longer tries to create a sample
+ DSN upon install.
+-- Tweeked myodbcinst. Was exiting with error when should have
+ been success.
+
-- ---- ---- ---- ---- ---- ---- ---- ---- --
28-Jan-2005 (3.51.11): pharvey@(protected)
-- ---- ---- ---- ---- ---- ---- ---- ---- --
--- 1.35/myodbcinst/myodbcinst.c 2005-02-11 19:00:37 -08:00
+++ 1.36/myodbcinst/myodbcinst.c 2005-02-16 11:37:47 -08:00
@@ -324,7 +324,7 @@
exit( 1 );
}
- return !nReturn;
+ return ( !nReturn );
}
/*!
@@ -407,7 +407,7 @@
int doQueryDataSource()
{
- int nReturn;
+ int bReturn;
char * psz;
switch ( cObjectSub )
@@ -416,26 +416,26 @@
if ( pszName )
return doQueryDataSourceName( ODBC_BOTH_DSN );
else
- nReturn = MYODBCUtilGetDataSourceNames( szBuffer, nBuffer,
ODBC_BOTH_DSN );
+ bReturn = MYODBCUtilGetDataSourceNames( szBuffer, nBuffer,
ODBC_BOTH_DSN );
break;
case 'u':
if ( pszName )
return doQueryDataSourceName( ODBC_USER_DSN );
else
- nReturn = MYODBCUtilGetDataSourceNames( szBuffer, nBuffer,
ODBC_USER_DSN );
+ bReturn = MYODBCUtilGetDataSourceNames( szBuffer, nBuffer,
ODBC_USER_DSN );
break;
case 's':
if ( pszName )
return doQueryDataSourceName( ODBC_SYSTEM_DSN );
else
- nReturn = MYODBCUtilGetDataSourceNames( szBuffer, nBuffer,
ODBC_SYSTEM_DSN );
+ bReturn = MYODBCUtilGetDataSourceNames( szBuffer, nBuffer,
ODBC_SYSTEM_DSN );
break;
default:
fprintf( stderr, "[%s][%d][ERROR] Invalid object type qualifier
specified.\n", __FILE__, __LINE__ );
return 0;
}
- if ( !nReturn )
+ if ( !bReturn )
{
doPrintInstallerError( __FILE__, __LINE__ );
return 0;
@@ -616,7 +616,7 @@
int doAddDataSource()
{
- int nReturn = 1;
+ int bReturn = 1;
switch ( cObjectSub )
{
@@ -629,7 +629,7 @@
fprintf( stderr, "[%s][%d][ERROR] Failed to set config mode.\n
", __FILE__, __LINE__ );
return 0;
}
- nReturn = doConfigDataSource( ODBC_ADD_DSN );
+ bReturn = doConfigDataSource( ODBC_ADD_DSN );
SQLSetConfigMode( (UWORD)ODBC_BOTH_DSN );
break;
case 's':
@@ -639,7 +639,7 @@
fprintf( stderr, "[%s][%d][ERROR] Failed to set config mode.\n
", __FILE__, __LINE__ );
return 0;
}
- nReturn = doConfigDataSource( ODBC_ADD_DSN );
+ bReturn = doConfigDataSource( ODBC_ADD_DSN );
SQLSetConfigMode( (UWORD)ODBC_BOTH_DSN );
break;
default:
@@ -647,7 +647,7 @@
return 0;
}
- return nReturn;
+ return bReturn;
}
int doEdit()
@@ -673,7 +673,7 @@
int doEditDataSource()
{
- int nReturn = 1;
+ int bReturn = 1;
switch ( cObjectSub )
{
@@ -686,7 +686,7 @@
fprintf( stderr, "[%s][%d][ERROR] Failed to set config mode.\n
", __FILE__, __LINE__ );
return 0;
}
- nReturn = doConfigDataSource( ODBC_CONFIG_DSN );
+ bReturn = doConfigDataSource( ODBC_CONFIG_DSN );
SQLSetConfigMode( ODBC_BOTH_DSN );
break;
case 's':
@@ -696,7 +696,7 @@
fprintf( stderr, "[%s][%d][ERROR] Failed to set config mode.\n
", __FILE__, __LINE__ );
return 0;
}
- nReturn = doConfigDataSource( ODBC_CONFIG_DSN );
+ bReturn = doConfigDataSource( ODBC_CONFIG_DSN );
SQLSetConfigMode( ODBC_BOTH_DSN );
break;
default:
@@ -704,7 +704,7 @@
return 0;
}
- return nReturn;
+ return bReturn;
}
int doRemove()
@@ -753,12 +753,12 @@
int doRemoveDataSource()
{
- int nReturn = 1;
+ int bReturn = 1;
switch ( cObjectSub )
{
case '\0':
- nReturn = doRemoveDataSourceName();
+ bReturn = doRemoveDataSourceName();
break;
case 'u':
if ( !SQLSetConfigMode( ODBC_USER_DSN ) )
@@ -767,7 +767,7 @@
fprintf( stderr, "[%s][%d][ERROR] Failed to set config mode.\n
", __FILE__, __LINE__ );
return 0;
}
- nReturn = doRemoveDataSourceName();
+ bReturn = doRemoveDataSourceName();
SQLSetConfigMode( ODBC_BOTH_DSN );
case 's':
if ( !SQLSetConfigMode( ODBC_SYSTEM_DSN ) )
@@ -776,14 +776,14 @@
fprintf( stderr, "[%s][%d][ERROR] Failed to set config mode.\n
", __FILE__, __LINE__ );
return 0;
}
- nReturn = doRemoveDataSourceName();
+ bReturn = doRemoveDataSourceName();
SQLSetConfigMode( ODBC_BOTH_DSN );
default:
fprintf( stderr, "[%s][%d][ERROR] Missing or invalid object sub
-type specified.\n", __FILE__, __LINE__ );
return 0;
}
- return nReturn;
+ return bReturn;
}
/*!
--- 1.13/scripts/myodbc3.spec.sh 2005-02-11 19:00:37 -08:00
+++ 1.14/scripts/myodbc3.spec.sh 2005-02-16 11:37:47 -08:00
@@ -5,7 +5,7 @@
#
%define myodbc_version @(protected)@
-# %define release 2
+%define release 2
Name: MyODBC
Summary: An ODBC 3.51 driver for MySQL
@@ -61,18 +61,19 @@
make PREFIX=$RPM_BUILD_ROOT install
#
-# REGISTER DRIVER (and create sample dsn)
+# REGISTER DRIVER
+# Registering a sample DSN using myodbcinst here is not a good idea as it
results
+# in a call to ConfigDSN() and this invokes the GUI stuff - probably not
what we
+# want as current login may not have access to a default X server.
+#
+# Hard-coded path here makes this package non-relocatable.
#
%post
-myodbcinst -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=%{prefix}/lib/libmyodbc3.so
;SETUP=%{prefix}/lib/libmyodbc3S.so"
-# Doing the following will cause the setup lib to get loaded and that will
-# cause problems in a GUI-less environment and when someone "su'd" to another
-# user (say; root) and that user has no access X server. Reimplement use of
-# unixODBC odbcinst command for this in future (or enhance myodbcinst).
-# myodbcinst -a -ss -t"DSN=MyDSN;DRIVER=MySQL ODBC 3.51 Driver;SERVER
=localhost;UID=root"
+myodbcinst -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP
=/usr/lib/libmyodbc3S.so"
#
-# DEREGISTER DRIVER (orphan any related DSNs)
+# DEREGISTER DRIVER
+# We simply orphan any related DSNs.
#
%preun
myodbcinst -r -d -n"MySQL ODBC 3.51 Driver"
--
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe: http://lists.mysql.com/myodbc?unsub=mysql@(protected)
Earn $52 per hosting referral at Lunarpages.
|
|
|