bk commit - MyODBC 3.51 (1.508)

[pharvey]

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@ style="color:#666">stripped

ChangeSet
  1.508 05/09/13 11:47:36 pharvey@stripped +3 -0
  - switch to more reliable define for sparc

  util/MYODBCUtilReadDataSourceStr.c
    1.13 05/09/13 11:47:36 pharvey@stripped +1 -1
    - switch to more reliable define for sparc

  setup/MYODBCSetupDataSourceDialog.cpp
    1.35 05/09/13 11:47:36 pharvey@stripped +4 -5
    - switch to more reliable define for sparc

  scripts/scripts.vpj
    1.1 05/09/12 10:25:09 pharvey@stripped +75 -0

  scripts/scripts.vpj
    1.0 05/09/12 10:25:09 pharvey@stripped +0 -0
    BitKeeper file /home/pharvey/SandBox/MySQL/myodbc-3.51/scripts/scripts.vpj

# 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:	pharvey
# Host:	mercury.codebydesign.com
# Root:	/home/pharvey/SandBox/MySQL/myodbc-3.51

--- 1.34/setup/MYODBCSetupDataSourceDialog.cpp	2005-09-12 23:55:36 -07:00
+++ 1.35/setup/MYODBCSetupDataSourceDialog.cpp	2005-09-13 11:47:36 -07:00
@@ -357,9 +357,10 @@
     ppushbuttonTest = new QPushButton( "&Test", this );
     playoutButtons->addWidget( ppushbuttonTest );
     ppushbuttonDiagnostics = new QPushButton( "&Diagnostics >>", this );
+// connecting to the database causes core on sparc for some reason (ld issue?)
 #ifndef __sparc
-    ppushbuttonTest
-    ppushbuttonDiagnostics
+    ppushbuttonTest->hide();
+    ppushbuttonDiagnostics->hide();
 #endif
 #if QT_VERSION >= 0x040000
     ppushbuttonDiagnostics->setCheckable( TRUE );
@@ -421,15 +422,13 @@
         ptab3->ptab3c->pcheckboxForceUseOfForwardOnlyCursors->setChecked( nOptions & (1 << 21) ? TRUE : FALSE );  
     }
 
-#ifndef __SPARC__
     connect( ppushbuttonTest, SIGNAL(clicked()), SLOT(slotTest()) );
-#endif
     connect( ppushbuttonDiagnostics, SIGNAL(toggled(bool)), SLOT(slotToggleGuru(bool)) );
     connect( ppushbuttonHelp, SIGNAL(clicked()), SLOT(slotHelp()) );
     connect( ppushbuttonOk, SIGNAL(clicked()), SLOT(slotOk()) );
     connect( ppushbuttonCancel, SIGNAL(clicked()), SLOT(reject()) );
 
-#ifndef __SPARC__
+#ifndef __sparc
     connect( ptab1, SIGNAL(signalRequestDatabaseNames()), SLOT(slotLoadDatabaseNames()) );
 #endif
 

--- 1.12/util/MYODBCUtilReadDataSourceStr.c	2005-02-01 22:06:00 -08:00
+++ 1.13/util/MYODBCUtilReadDataSourceStr.c	2005-09-13 11:47:36 -07:00
@@ -20,7 +20,7 @@
 
 #include "MYODBCUtil.h"
 
-#if defined(__APPLE__) || defined(WIN32) || defined(__SPARC__)
+#if defined(__APPLE__) || defined(WIN32) || defined(__sparc)
 char *strndup( const char *s, size_t n )
 {
     size_t nAvail;
--- New file ---
+++ scripts/scripts.vpj	05/09/12 10:25:09
<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
<Project
	Version="10.0"
	VendorName="SlickEdit"
	WorkingDir=".">
	<Config
		Name="Release"
		OutputFile=""
		CompilerConfigName="Latest Version">
		<Menu>
			<Target
				Name="Compile"
				MenuCaption="&amp;Compile"
				CaptureOutputWith="ProcessBuffer"
				SaveOption="SaveCurrent"
				RunFromDir="%rw">
				<Exec/>
			</Target>
			<Target
				Name="Build"
				MenuCaption="&amp;Build"
				CaptureOutputWith="ProcessBuffer"
				SaveOption="SaveWorkspaceFiles"
				RunFromDir="%rw">
				<Exec/>
			</Target>
			<Target
				Name="Rebuild"
				MenuCaption="&amp;Rebuild"
				CaptureOutputWith="ProcessBuffer"
				SaveOption="SaveWorkspaceFiles"
				RunFromDir="%rw">
				<Exec/>
			</Target>
			<Target
				Name="Debug"
				MenuCaption="&amp;Debug"
				SaveOption="SaveNone"
				RunFromDir="%rw">
				<Exec/>
			</Target>
			<Target
				Name="Execute"
				MenuCaption="E&amp;xecute"
				SaveOption="SaveNone"
				RunFromDir="%rw">
				<Exec CmdLine='"scripts.exe"'/>
			</Target>
		</Menu>
	</Config>
	<Files>
		<Folder
			Name="Source Files"
			Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl"/>
		<Folder
			Name="Header Files"
			Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
			<F N="make_binary_distribution.sh"/>
			<F N="make_win_src_distribution.sh"/>
			<F N="makerpm.sh"/>
			<F N="myodbc3.spec.sh"/>
		</Folder>
		<Folder
			Name="Resource Files"
			Filters="*.ico;*.cur;*.dlg"/>
		<Folder
			Name="Bitmaps"
			Filters="*.bmp"/>
		<Folder
			Name="Other Files"
			Filters="">
			<F N="Makefile.am"/>
		</Folder>
	</Files>
</Project>