Added:
trunk/connector-mxj/.fbprefs
trunk/connector-mxj/commercial/5-0-42/
trunk/connector-mxj/commercial/5-0-42/Linux-i386/
trunk/connector-mxj/commercial/5-0-42/Linux-i386/mysqld
trunk/connector-mxj/commercial/5-0-42/Linux-i386/version.txt
trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-i386/
trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-i386/mysqld
trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-i386/version.txt
trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-ppc/
trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-ppc/mysqld
trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-ppc/version.txt
trunk/connector-mxj/commercial/5-0-42/SunOS-sparc/
trunk/connector-mxj/commercial/5-0-42/SunOS-sparc/mysqld
trunk/connector-mxj/commercial/5-0-42/SunOS-sparc/version.txt
trunk/connector-mxj/commercial/5-0-42/Win-x86/
trunk/connector-mxj/commercial/5-0-42/Win-x86/mysqld-nt.exe
trunk/connector-mxj/commercial/5-0-42/Win-x86/version.txt
trunk/connector-mxj/commercial/5-0-42/com/
trunk/connector-mxj/commercial/5-0-42/com/mysql/
trunk/connector-mxj/commercial/5-0-42/com/mysql/management/
trunk/connector-mxj/commercial/5-0-42/com/mysql/management/MySQL_Help.txt
trunk/connector-mxj/commercial/5-0-42/data_dir.jar
trunk/connector-mxj/commercial/5-0-42/share_dir.jar
trunk/connector-mxj/commercial/5-0-42/win_share_dir.jar
trunk/connector-mxj/findbugs-exclude.xml
trunk/connector-mxj/resources/5-0-41/
trunk/connector-mxj/resources/5-0-41/Linux-i386/
trunk/connector-mxj/resources/5-0-41/Linux-i386/mysqld
trunk/connector-mxj/resources/5-0-41/Linux-i386/version.txt
trunk/connector-mxj/resources/5-0-41/Mac_OS_X-i386/
trunk/connector-mxj/resources/5-0-41/Mac_OS_X-i386/mysqld
trunk/connector-mxj/resources/5-0-41/Mac_OS_X-i386/version.txt
trunk/connector-mxj/resources/5-0-41/Mac_OS_X-ppc/
trunk/connector-mxj/resources/5-0-41/Mac_OS_X-ppc/mysqld
trunk/connector-mxj/resources/5-0-41/Mac_OS_X-ppc/version.txt
trunk/connector-mxj/resources/5-0-41/SunOS-sparc/
trunk/connector-mxj/resources/5-0-41/SunOS-sparc/mysqld
trunk/connector-mxj/resources/5-0-41/SunOS-sparc/version.txt
trunk/connector-mxj/resources/5-0-41/Win-x86/
trunk/connector-mxj/resources/5-0-41/Win-x86/mysqld-nt.exe
trunk/connector-mxj/resources/5-0-41/Win-x86/version.txt
trunk/connector-mxj/resources/5-0-41/com/
trunk/connector-mxj/resources/5-0-41/com/mysql/
trunk/connector-mxj/resources/5-0-41/com/mysql/management/
trunk/connector-mxj/resources/5-0-41/com/mysql/management/MySQL_Help.txt
trunk/connector-mxj/resources/5-0-41/data_dir.jar
trunk/connector-mxj/resources/5-0-41/share_dir.jar
trunk/connector-mxj/resources/5-0-41/win_share_dir.jar
Removed:
trunk/connector-mxj/commercial/5-0-40/
trunk/connector-mxj/resources/5-0-37/
trunk/connector-mxj/src/com/mysql/management/util/PatchedStandardSocketFactory.java
Modified:
trunk/connector-mxj/.classpath
trunk/connector-mxj/CHANGES
trunk/connector-mxj/_dev_notes.txt
trunk/connector-mxj/build.xml
trunk/connector-mxj/commercial/connector-mxj.properties
trunk/connector-mxj/resources/connector-mxj.properties
trunk/connector-mxj/src/ConnectorMXJObjectTestExample.java
trunk/connector-mxj/src/TestDb.java
trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java
trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java
trunk/connector-mxj/src/com/mysql/management/util/DefaultsMap.java
trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java
trunk/connector-mxj/src/com/mysql/management/util/ListToString.java
trunk/connector-mxj/src/com/mysql/management/util/Shell.java
Log:
2007-05-27 - swapped out gpl binaries for v5.0.41
- swapped out commercial binaries for v5.0.42
- updated build.xml version in preperation for 5.0.7-beta tag
- performed code review/polish prior to release candidate:
- removed references to File.deleteOnExit, print warning instead
- fixed where versionString.trim() was ignored (Thanks FindBugs!)
- portFile now contains a new-line to be consistent with pidFile
- errors reading portFile now stacktrace(err) ... was System.err
- added main(String[]) to com/mysql/management/AllTestsSuite.java
- removed obsolete PatchedStandardSocketFactory java file
- clarified code in DefaultsMap.entrySet()
- removed obsolete field SimpleMysqldDynamicMBean.lastInvocation
Modified: trunk/connector-mxj/.classpath
===================================================================
--- trunk/connector-mxj/.classpath 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/.classpath 2007-05-27 15:19:56 UTC (rev 96)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="commercial"/>
+ <classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip"/>
<classpathentry combineaccessrules="false" kind="src" path="/sun-jmx-ri-1_2_1"/>
Added: trunk/connector-mxj/.fbprefs
===================================================================
--- trunk/connector-mxj/.fbprefs 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/.fbprefs 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1,132 @@
+#FindBugs User Preferences
+#Sun May 27 13:08:53 CEST 2007
+detectorBCPMethodReturnCheck=BCPMethodReturnCheck|false
+detectorBadAppletConstructor=BadAppletConstructor|false
+detectorBadResultSetAccess=BadResultSetAccess|true
+detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true
+detectorBadUseOfReturnValue=BadUseOfReturnValue|true
+detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true
+detectorCalledMethods=CalledMethods|true
+detectorCheckCalls=CheckCalls|false
+detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true
+detectorCloneIdiom=CloneIdiom|true
+detectorComparatorIdiom=ComparatorIdiom|true
+detectorConfusedInheritance=ConfusedInheritance|true
+detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true
+detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true
+detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true
+detectorDroppedException=DroppedException|true
+detectorDumbMethodInvocations=DumbMethodInvocations|true
+detectorDumbMethods=DumbMethods|true
+detectorDuplicateBranches=DuplicateBranches|true
+detectorEmptyZipFileEntry=EmptyZipFileEntry|true
+detectorEqStringTest=EqStringTest|false
+detectorFindBadCast=FindBadCast|false
+detectorFindBadCast2=FindBadCast2|true
+detectorFindBadEqualsImplementation=FindBadEqualsImplementation|false
+detectorFindBadForLoop=FindBadForLoop|true
+detectorFindBugsSummaryStats=FindBugsSummaryStats|true
+detectorFindCircularDependencies=FindCircularDependencies|false
+detectorFindDeadLocalStores=FindDeadLocalStores|true
+detectorFindDoubleCheck=FindDoubleCheck|true
+detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true
+detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true
+detectorFindFinalizeInvocations=FindFinalizeInvocations|true
+detectorFindFloatEquality=FindFloatEquality|true
+detectorFindFloatMath=FindFloatMath|false
+detectorFindHEmismatch=FindHEmismatch|true
+detectorFindInconsistentSync2=FindInconsistentSync2|true
+detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true
+detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true
+detectorFindMaskedFields=FindMaskedFields|true
+detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true
+detectorFindNakedNotify=FindNakedNotify|true
+detectorFindNonSerializableStoreIntoSession=FindNonSerializableStoreIntoSession|true
+detectorFindNonSerializableValuePassedToWriteObject=FindNonSerializableValuePassedToWriteObject|true
+detectorFindNonShortCircuit=FindNonShortCircuit|true
+detectorFindNullDeref=FindNullDeref|true
+detectorFindOpenStream=FindOpenStream|true
+detectorFindPuzzlers=FindPuzzlers|true
+detectorFindRefComparison=FindRefComparison|true
+detectorFindReturnRef=FindReturnRef|true
+detectorFindRunInvocations=FindRunInvocations|true
+detectorFindSelfComparison=FindSelfComparison|true
+detectorFindSelfComparison2=FindSelfComparison2|true
+detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true
+detectorFindSpinLoop=FindSpinLoop|true
+detectorFindSqlInjection=FindSqlInjection|true
+detectorFindTwoLockWait=FindTwoLockWait|true
+detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true
+detectorFindUnconditionalWait=FindUnconditionalWait|true
+detectorFindUninitializedGet=FindUninitializedGet|true
+detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true
+detectorFindUnreleasedLock=FindUnreleasedLock|true
+detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|false
+detectorFindUnsyncGet=FindUnsyncGet|true
+detectorFindUselessControlFlow=FindUselessControlFlow|true
+detectorHugeSharedStringConstants=HugeSharedStringConstants|true
+detectorIDivResultCastToDouble=IDivResultCastToDouble|true
+detectorIncompatMask=IncompatMask|true
+detectorInefficientMemberAccess=InefficientMemberAccess|false
+detectorInefficientToArray=InefficientToArray|true
+detectorInfiniteLoop=InfiniteLoop|true
+detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true
+detectorInfiniteRecursiveLoop2=InfiniteRecursiveLoop2|false
+detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true
+detectorInitializationChain=InitializationChain|true
+detectorInstantiateStaticClass=InstantiateStaticClass|true
+detectorInvalidJUnitTest=InvalidJUnitTest|true
+detectorIteratorIdioms=IteratorIdioms|true
+detectorLazyInit=LazyInit|true
+detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true
+detectorLockedFields=LockedFields|false
+detectorMethodReturnCheck=MethodReturnCheck|true
+detectorMethods=Methods|true
+detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true
+detectorMutableLock=MutableLock|true
+detectorMutableStaticFields=MutableStaticFields|true
+detectorNaming=Naming|true
+detectorNoteAnnotationRetention=NoteAnnotationRetention|true
+detectorNoteCheckReturnValue=NoteCheckReturnValue|true
+detectorNoteCheckReturnValueAnnotations=NoteCheckReturnValueAnnotations|true
+detectorNoteJCIPAnnotation=NoteJCIPAnnotation|true
+detectorNoteNonNullAnnotations=NoteNonNullAnnotations|true
+detectorNoteNonnullReturnValues=NoteNonnullReturnValues|true
+detectorNoteSuppressedWarnings=NoteSuppressedWarnings|true
+detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true
+detectorNumberConstructor=NumberConstructor|true
+detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true
+detectorPublicSemaphores=PublicSemaphores|false
+detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true
+detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true
+detectorRedundantInterfaces=RedundantInterfaces|true
+detectorResolveAllReferences=ResolveAllReferences|false
+detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true
+detectorSerializableIdiom=SerializableIdiom|true
+detectorStartInConstructor=StartInConstructor|true
+detectorStaticCalendarDetector=StaticCalendarDetector|false
+detectorStringConcatenation=StringConcatenation|true
+detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true
+detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true
+detectorSwitchFallthrough=SwitchFallthrough|true
+detectorTestASM=TestASM|false
+detectorTestingGround=TestingGround|false
+detectorTrainFieldStoreTypes=TrainFieldStoreTypes|true
+detectorTrainNonNullAnnotations=TrainNonNullAnnotations|true
+detectorTrainUnconditionalDerefParams=TrainUnconditionalDerefParams|true
+detectorURLProblems=URLProblems|true
+detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true
+detectorUnnecessaryMath=UnnecessaryMath|true
+detectorUnreadFields=UnreadFields|true
+detectorUseObjectEquals=UseObjectEquals|false
+detectorUselessSubclassMethod=UselessSubclassMethod|false
+detectorVarArgsProblems=VarArgsProblems|true
+detectorVolatileUsage=VolatileUsage|true
+detectorWaitInLoop=WaitInLoop|true
+detectorWrongMapIterator=WrongMapIterator|true
+detectorXMLFactoryBypass=XMLFactoryBypass|true
+detector_threshold=2
+effort=default
+excludefilter0=findbugs-exclude.xml
+filter_settings=Medium|PERFORMANCE,CORRECTNESS,I18N,MT_CORRECTNESS,BAD_PRACTICE,MALICIOUS_CODE,STYLE|false
+filter_settings_neg=|
Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/CHANGES 2007-05-27 15:19:56 UTC (rev 96)
@@ -1,6 +1,19 @@
# Changelog
# $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
+2007-05-27 - swapped out gpl binaries for v5.0.41
+ - swapped out commercial binaries for v5.0.42
+ - updated build.xml version in preperation for 5.0.7-beta tag
+ - performed code review/polish prior to release candidate:
+ - removed references to File.deleteOnExit, print warning instead
+ - fixed where versionString.trim() was ignored (Thanks FindBugs!)
+ - portFile now contains a new-line to be consistent with pidFile
+ - errors reading portFile now stacktrace(err) ... was System.err
+ - added main(String[]) to com/mysql/management/AllTestsSuite.java
+ - removed obsolete PatchedStandardSocketFactory java file
+ - clarified code in DefaultsMap.entrySet()
+ - removed obsolete field SimpleMysqldDynamicMBean.lastInvocation
+
2007-05-25 - added new connection property "initialize-user" which, if set to
"true" will remove the default, un-passworded anonymous and "root"
users, and create the user/password from the connection url
Modified: trunk/connector-mxj/_dev_notes.txt
===================================================================
--- trunk/connector-mxj/_dev_notes.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/_dev_notes.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -92,40 +92,41 @@
#------------------------------------------
for file in $(ls *.zip); do unzip $file; done;
- for file in $(ls *.gz); do tar xvf $file; done;
+ for file in $(ls *.gz); do tar xvfz $file; done;
-export MXJ_MYSQL_VERSION=5.0.37
-export MXJ_MYSQL_DIR=5-0-37
-# Make sure you have the correct [enterprise/standard/max/debug] set.
+export MXJ_MYSQL_VERSION=5.0.41
+export MXJ_MYSQL_DIR=5-0-41
+# Make sure you have the correct (enterprise/standard/max/debug) set.
-cp mysql-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Win-x86/
-echo mysql-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Win-x86/version.txt
-cp mysql-$MXJ_MYSQL_VERSION-linux-i686/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Linux-i386/
-echo mysql-$MXJ_MYSQL_VERSION-linux-i686/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Linux-i386/version.txt
-cp mysql-$MXJ_MYSQL_VERSION-osx10.3-powerpc/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/
-echo mysql-$MXJ_MYSQL_VERSION-osx10.3-powerpc/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/version.txt
-cp mysql-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-i386/
-echo mysql-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-i386/version.txt
-cp mysql-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/SunOS-sparc/
-echo mysql-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/SunOS-sparc/version.txt
+cp mysql-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Win-x86/ &&
+echo mysql-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Win-x86/version.txt &&
+cp mysql-$MXJ_MYSQL_VERSION-linux-i686/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Linux-i386/ &&
+echo mysql-$MXJ_MYSQL_VERSION-linux-i686/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Linux-i386/version.txt &&
+cp mysql-$MXJ_MYSQL_VERSION-osx10.3-powerpc/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/ &&
+echo mysql-$MXJ_MYSQL_VERSION-osx10.3-powerpc/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/version.txt &&
+cp mysql-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-i386/ &&
+echo mysql-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-i386/version.txt &&
+cp mysql-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/SunOS-sparc/ &&
+echo mysql-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/SunOS-sparc/version.txt &&
+echo YAY || echo DARN
+export MXJ_MYSQL_VERSION=5.0.42
+export MXJ_MYSQL_DIR=5-0-42
+# Make sure you have the correct (enterprise/standard/max/debug) set.
-export MXJ_MYSQL_VERSION=5.0.40
-export MXJ_MYSQL_DIR=5-0-40
-# Make sure you have the correct [enterprise/standard/max/debug] set.
+cp mysql-enterprise-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/ &&
+echo mysql-enterprise-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/version.txt &&
+cp mysql-enterprise-$MXJ_MYSQL_VERSION-linux-i686/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Linux-i386/ &&
+echo mysql-enterprise-$MXJ_MYSQL_VERSION-linux-i686/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Linux-i386/version.txt &&
+cp mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.3-powerpc/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/ &&
+echo mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.3-powerpc/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/version.txt &&
+cp mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-i386/ &&
+echo mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-i386/version.txt &&
+cp mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-sparc/ &&
+echo mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-sparc/version.txt &&
+echo YAY || echo DARN
-cp mysql-enterprise-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/
-echo mysql-enterprise-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/version.txt
-cp mysql-enterprise-$MXJ_MYSQL_VERSION-linux-i686/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Linux-i386/
-echo mysql-enterprise-$MXJ_MYSQL_VERSION-linux-i686/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Linux-i386/version.txt
-cp mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.3-powerpc/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/
-echo mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.3-powerpc/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/version.txt
-cp mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-i386/
-echo mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-i386/version.txt
-cp mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-sparc/
-echo mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-sparc/version.txt
-
export MXJ_MYSQL_VERSION=5.1.15-beta
export MXJ_MYSQL_DIR=5-1-15
# Make sure you have the correct [enterprise/standard/max/debug] set.
@@ -150,12 +151,13 @@
Agian, make sure you have the correct [enterprise/standard/max/debug] set.
for standard:
-./scripts/mysql_install_db --no-defaults --basedir=/home/eric/dload/mysqld/mysql-standard-$MXJ_MYSQL_VERSION-linux-i686
+./scripts/mysql_install_db --no-defaults --basedir=/home/eric/dload/mysql/mysql-$MXJ_MYSQL_VERSION-osx10.4-i686
or enterprise
-./scripts/mysql_install_db --no-defaults --basedir=/home/eric/dload/mysqld/mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686
+./scripts/mysql_install_db --no-defaults --basedir=/home/eric/dload/mysql/mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686
or 5.1 beta
-./scripts/mysql_install_db --no-defaults --basedir=/home/eric/dload/mysqld/mysql-$MXJ_MYSQL_VERSION-osx10.4-i686
+./scripts/mysql_install_db --no-defaults --basedir=/home/eric/dload/mysql/mysql-$MXJ_MYSQL_VERSION-osx10.4-i686
+export WORKSPACE=/home/eric/ews-work/connector-mxj
#reset version variables
cd (max)
mkdir -vp $WORKSPACE/resources/$MXJ_MYSQL_DIR/com/mysql/management
@@ -193,8 +195,12 @@
# cp $WORKSPACE/resources/$MXJ_MYSQL_DIR/*.jar $WORKSPACE/commercial/$MXJ_MYSQL_DIR
-Update the default version in "resources/connector-mxj.properties"
-Update the default version in "commercial/connector-mxj.properties"
+Update the default version in:
+vi $WORKSPACE/resources/connector-mxj.properties
+
+Update the default version in
+vi $WORKSPACE/commercial/connector-mxj.properties
+
Update the version dirs build.xml
rm -rf /tmp/test-c.mxj
re-run tests
Modified: trunk/connector-mxj/build.xml
===================================================================
--- trunk/connector-mxj/build.xml 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/build.xml 2007-05-27 15:19:56 UTC (rev 96)
@@ -22,10 +22,10 @@
<project name="MySQL JMX" basedir="." default="usage">
<description>A Java Wrapper for MySQL</description>
- <property name="mxj-version" value="5-0-pre7-beta" />
- <property name="gpl-mysqld-version" value="5-0-37" />
- <!-- property name="gpl-mysqld-version" value="5-1-15" / -->
- <property name="commercial-mysqld-version" value="5-0-40" />
+ <property name="mxj-version" value="5-0-7-beta" />
+ <property name="gpl-mysqld-version" value="5-0-41" />
+ <!-- property name="gpl-mysqld-version" value="5-1-18" / -->
+ <property name="commercial-mysqld-version" value="5-0-42" />
<property name="src" location="src" />
<property name="misc" location="misc" />
Added: trunk/connector-mxj/commercial/5-0-42/Linux-i386/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-0-42/Linux-i386/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-0-42/Linux-i386/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-42/Linux-i386/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/commercial/5-0-42/Linux-i386/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.42-linux-i686/bin/mysqld
Added: trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-i386/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-i386/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-i386/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-i386/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-i386/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.42-osx10.4-i686/bin/mysqld
Added: trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-ppc/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-ppc/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-ppc/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-ppc/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/commercial/5-0-42/Mac_OS_X-ppc/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.42-osx10.3-powerpc/bin/mysqld
Added: trunk/connector-mxj/commercial/5-0-42/SunOS-sparc/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-0-42/SunOS-sparc/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-0-42/SunOS-sparc/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-42/SunOS-sparc/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/commercial/5-0-42/SunOS-sparc/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.42-solaris8-sparc/bin/mysqld
Added: trunk/connector-mxj/commercial/5-0-42/Win-x86/mysqld-nt.exe
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-0-42/Win-x86/mysqld-nt.exe
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-0-42/Win-x86/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-42/Win-x86/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/commercial/5-0-42/Win-x86/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.42-win32/bin/mysqld-nt.exe
Added: trunk/connector-mxj/commercial/5-0-42/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-42/com/mysql/management/MySQL_Help.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/commercial/5-0-42/com/mysql/management/MySQL_Help.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1,183 @@
+./bin/mysql Ver 14.12 Distrib 5.0.42, for apple-darwin8.5.1 (i686) using EditLine wrapper
+Copyright (C) 2002 MySQL AB
+This is commercial software, and use of this software is governed
+by your applicable license agreement with MySQL
+Usage: ./bin/mysql [OPTIONS] [database]
+ -?, --help Display this help and exit.
+ -I, --help Synonym for -?
+ --auto-rehash Enable automatic rehashing. One doesn't need to use
+ 'rehash' to get table and field completion, but startup
+ and reconnecting may take a longer time. Disable with
+ --disable-auto-rehash.
+ -A, --no-auto-rehash
+ No automatic rehashing. One has to use 'rehash' to get
+ table and field completion. This gives a quicker start of
+ mysql and disables rehashing on reconnect. WARNING:
+ options deprecated; use --disable-auto-rehash instead.
+ -B, --batch Don't use history file. Disable interactive behavior.
+ (Enables --silent)
+ --character-sets-dir=name
+ Directory where character sets are.
+ --default-character-set=name
+ Set the default character set.
+ -C, --compress Use compression in server/client protocol.
+ -#, --debug[=#] This is a non-debug version. Catch this and exit
+ -D, --database=name Database to use.
+ --delimiter=name Delimiter to be used.
+ -e, --execute=name Execute command and quit. (Disables --force and history
+ file)
+ -E, --vertical Print the output of a query (rows) vertically.
+ -f, --force Continue even if we get an sql error.
+ -G, --named-commands
+ Enable named commands. Named commands mean this program's
+ internal commands; see mysql> help . When enabled, the
+ named commands can be used from any line of the query,
+ otherwise only from the first line, before an enter.
+ Disable with --disable-named-commands. This option is
+ disabled by default.
+ -g, --no-named-commands
+ Named commands are disabled. Use \* form only, or use
+ named commands only in the beginning of a line ending
+ with a semicolon (;) Since version 10.9 the client now
+ starts with this option ENABLED by default! Disable with
+ '-G'. Long format commands still work from the first
+ line. WARNING: option deprecated; use
+ --disable-named-commands instead.
+ -i, --ignore-spaces Ignore space after function names.
+ --local-infile Enable/disable LOAD DATA LOCAL INFILE.
+ -b, --no-beep Turn off beep on error.
+ -h, --host=name Connect to host.
+ -H, --html Produce HTML output.
+ -X, --xml Produce XML output
+ --line-numbers Write line numbers for errors.
+ -L, --skip-line-numbers
+ Don't write line number for errors. WARNING: -L is
+ deprecated, use long version of this option instead.
+ -n, --unbuffered Flush buffer after each query.
+ --column-names Write column names in results.
+ -N, --skip-column-names
+ Don't write column names in results. WARNING: -N is
+ deprecated, use long version of this options instead.
+ -O, --set-variable=name
+ Change the value of a variable. Please note that this
+ option is deprecated; you can set variables directly with
+ --variable-name=value.
+ --sigint-ignore Ignore SIGINT (CTRL-C)
+ -o, --one-database Only update the default database. This is useful for
+ skipping updates to other database in the update log.
+ --pager[=name] Pager to use to display results. If you don't supply an
+ option the default pager is taken from your ENV variable
+ PAGER. Valid pagers are less, more, cat [> filename],
+ etc. See interactive help (\h) also. This option does not
+ work in batch mode. Disable with --disable-pager. This
+ option is disabled by default.
+ --no-pager Disable pager and print to stdout. See interactive help
+ (\h) also. WARNING: option deprecated; use
+ --disable-pager instead.
+ -p, --password[=name]
+ Password to use when connecting to server. If password is
+ not given it's asked from the tty.
+ -P, --port=# Port number to use for connection.
+ --prompt=name Set the mysql prompt to this value.
+ --protocol=name The protocol of connection (tcp,socket,pipe,memory).
+ -q, --quick Don't cache result, print it row by row. This may slow
+ down the server if the output is suspended. Doesn't use
+ history file.
+ -r, --raw Write fields without conversion. Used with --batch.
+ --reconnect Reconnect if the connection is lost. Disable with
+ --disable-reconnect. This option is enabled by default.
+ -s, --silent Be more silent. Print results with a tab as separator,
+ each row on new line.
+ -S, --socket=name Socket file to use for connection.
+ --ssl Enable SSL for connection (automatically enabled with
+ other flags). Disable with --skip-ssl.
+ --ssl-ca=name CA file in PEM format (check OpenSSL docs, implies
+ --ssl).
+ --ssl-capath=name CA directory (check OpenSSL docs, implies --ssl).
+ --ssl-cert=name X509 cert in PEM format (implies --ssl).
+ --ssl-cipher=name SSL cipher to use (implies --ssl).
+ --ssl-key=name X509 key in PEM format (implies --ssl).
+ --ssl-verify-server-cert
+ Verify server's "Common Name" in its cert against
+ hostname used when connecting. This option is disabled by
+ default.
+ -t, --table Output in table format.
+ -T, --debug-info Print some debug info at exit.
+ --tee=name Append everything into outfile. See interactive help (\h)
+ also. Does not work in batch mode. Disable with
+ --disable-tee. This option is disabled by default.
+ --no-tee Disable outfile. See interactive help (\h) also. WARNING:
+ option deprecated; use --disable-tee instead
+ -u, --user=name User for login if not current user.
+ -U, --safe-updates Only allow UPDATE and DELETE that uses keys.
+ -U, --i-am-a-dummy Synonym for option --safe-updates, -U.
+ -v, --verbose Write more. (-v -v -v gives the table output format).
+ -V, --version Output version information and exit.
+ -w, --wait Wait and retry if connection is down.
+ --connect_timeout=# Number of seconds before connection timeout.
+ --max_allowed_packet=#
+ Max packet length to send to, or receive from server
+ --net_buffer_length=#
+ Buffer for TCP/IP and socket communication
+ --select_limit=# Automatic limit for SELECT when using --safe-updates
+ --max_join_size=# Automatic limit for rows in a join when using
+ --safe-updates
+ --secure-auth Refuse client connecting to server if it uses old
+ (pre-4.1.1) protocol
+ --show-warnings Show warnings after every statement.
+
+Default options are read from the following files in the given order:
+/etc/my.cnf ~/.my.cnf /usr/local/mysql/etc/my.cnf
+The following groups are read: mysql client
+The following options may be given as the first argument:
+--print-defaults Print the program argument list and exit
+--no-defaults Don't read default options from any options file
+--defaults-file=# Only read default options from the given file #
+--defaults-extra-file=# Read this file after the global files are read
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+auto-rehash TRUE
+character-sets-dir (No default value)
+default-character-set latin1
+compress FALSE
+database (No default value)
+delimiter ;
+vertical FALSE
+force FALSE
+named-commands FALSE
+local-infile FALSE
+no-beep FALSE
+host (No default value)
+html FALSE
+xml FALSE
+line-numbers TRUE
+unbuffered FALSE
+column-names TRUE
+sigint-ignore FALSE
+port 0
+prompt mysql>
+quick FALSE
+raw FALSE
+reconnect TRUE
+socket (No default value)
+ssl FALSE
+ssl-ca (No default value)
+ssl-capath (No default value)
+ssl-cert (No default value)
+ssl-cipher (No default value)
+ssl-key (No default value)
+ssl-verify-server-cert FALSE
+table FALSE
+debug-info FALSE
+user (No default value)
+safe-updates FALSE
+i-am-a-dummy FALSE
+connect_timeout 0
+max_allowed_packet 16777216
+net_buffer_length 16384
+select_limit 1000
+max_join_size 1000000
+secure-auth FALSE
+show-warnings FALSE
Added: trunk/connector-mxj/commercial/5-0-42/data_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-0-42/data_dir.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-0-42/share_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-0-42/share_dir.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-0-42/win_share_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-0-42/win_share_dir.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/connector-mxj/commercial/connector-mxj.properties
===================================================================
--- trunk/connector-mxj/commercial/connector-mxj.properties 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/commercial/connector-mxj.properties 2007-05-27 15:19:56 UTC (rev 96)
@@ -1,5 +1,5 @@
# Connector/MXJ properties
# default version of mysqld to deploy
-mysql-version=5.0.40
+mysql-version=5.0.42
Added: trunk/connector-mxj/findbugs-exclude.xml
===================================================================
--- trunk/connector-mxj/findbugs-exclude.xml 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/findbugs-exclude.xml 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1,7 @@
+<FindBugsFilter>
+ <!-- We do not care warnings in about test files -->
+ <Match>
+ <Class name="~.*Test.*" />
+ </Match>
+
+</FindBugsFilter>
Added: trunk/connector-mxj/resources/5-0-41/Linux-i386/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-0-41/Linux-i386/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-0-41/Linux-i386/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-41/Linux-i386/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/resources/5-0-41/Linux-i386/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-5.0.41-linux-i686/bin/mysqld
Added: trunk/connector-mxj/resources/5-0-41/Mac_OS_X-i386/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-0-41/Mac_OS_X-i386/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-0-41/Mac_OS_X-i386/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-41/Mac_OS_X-i386/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/resources/5-0-41/Mac_OS_X-i386/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-5.0.41-osx10.4-i686/bin/mysqld
Added: trunk/connector-mxj/resources/5-0-41/Mac_OS_X-ppc/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-0-41/Mac_OS_X-ppc/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-0-41/Mac_OS_X-ppc/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-41/Mac_OS_X-ppc/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/resources/5-0-41/Mac_OS_X-ppc/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-5.0.41-osx10.3-powerpc/bin/mysqld
Added: trunk/connector-mxj/resources/5-0-41/SunOS-sparc/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-0-41/SunOS-sparc/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-0-41/SunOS-sparc/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-41/SunOS-sparc/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/resources/5-0-41/SunOS-sparc/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-5.0.41-solaris8-sparc/bin/mysqld
Added: trunk/connector-mxj/resources/5-0-41/Win-x86/mysqld-nt.exe
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-0-41/Win-x86/mysqld-nt.exe
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-0-41/Win-x86/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-41/Win-x86/version.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/resources/5-0-41/Win-x86/version.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1 @@
+mysql-5.0.41-win32/bin/mysqld-nt.exe
Added: trunk/connector-mxj/resources/5-0-41/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-41/com/mysql/management/MySQL_Help.txt 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/resources/5-0-41/com/mysql/management/MySQL_Help.txt 2007-05-27 15:19:56 UTC (rev 96)
@@ -0,0 +1,183 @@
+./bin/mysql Ver 14.12 Distrib 5.0.41, for apple-darwin8.5.1 (i686) using readline 5.0
+Copyright (C) 2002 MySQL AB
+This software comes with ABSOLUTELY NO WARRANTY. This is free software,
+and you are welcome to modify and redistribute it under the GPL license
+Usage: ./bin/mysql [OPTIONS] [database]
+ -?, --help Display this help and exit.
+ -I, --help Synonym for -?
+ --auto-rehash Enable automatic rehashing. One doesn't need to use
+ 'rehash' to get table and field completion, but startup
+ and reconnecting may take a longer time. Disable with
+ --disable-auto-rehash.
+ -A, --no-auto-rehash
+ No automatic rehashing. One has to use 'rehash' to get
+ table and field completion. This gives a quicker start of
+ mysql and disables rehashing on reconnect. WARNING:
+ options deprecated; use --disable-auto-rehash instead.
+ -B, --batch Don't use history file. Disable interactive behavior.
+ (Enables --silent)
+ --character-sets-dir=name
+ Directory where character sets are.
+ --default-character-set=name
+ Set the default character set.
+ -C, --compress Use compression in server/client protocol.
+ -#, --debug[=#] This is a non-debug version. Catch this and exit
+ -D, --database=name Database to use.
+ --delimiter=name Delimiter to be used.
+ -e, --execute=name Execute command and quit. (Disables --force and history
+ file)
+ -E, --vertical Print the output of a query (rows) vertically.
+ -f, --force Continue even if we get an sql error.
+ -G, --named-commands
+ Enable named commands. Named commands mean this program's
+ internal commands; see mysql> help . When enabled, the
+ named commands can be used from any line of the query,
+ otherwise only from the first line, before an enter.
+ Disable with --disable-named-commands. This option is
+ disabled by default.
+ -g, --no-named-commands
+ Named commands are disabled. Use \* form only, or use
+ named commands only in the beginning of a line ending
+ with a semicolon (;) Since version 10.9 the client now
+ starts with this option ENABLED by default! Disable with
+ '-G'. Long format commands still work from the first
+ line. WARNING: option deprecated; use
+ --disable-named-commands instead.
+ -i, --ignore-spaces Ignore space after function names.
+ --local-infile Enable/disable LOAD DATA LOCAL INFILE.
+ -b, --no-beep Turn off beep on error.
+ -h, --host=name Connect to host.
+ -H, --html Produce HTML output.
+ -X, --xml Produce XML output
+ --line-numbers Write line numbers for errors.
+ -L, --skip-line-numbers
+ Don't write line number for errors. WARNING: -L is
+ deprecated, use long version of this option instead.
+ -n, --unbuffered Flush buffer after each query.
+ --column-names Write column names in results.
+ -N, --skip-column-names
+ Don't write column names in results. WARNING: -N is
+ deprecated, use long version of this options instead.
+ -O, --set-variable=name
+ Change the value of a variable. Please note that this
+ option is deprecated; you can set variables directly with
+ --variable-name=value.
+ --sigint-ignore Ignore SIGINT (CTRL-C)
+ -o, --one-database Only update the default database. This is useful for
+ skipping updates to other database in the update log.
+ --pager[=name] Pager to use to display results. If you don't supply an
+ option the default pager is taken from your ENV variable
+ PAGER. Valid pagers are less, more, cat [> filename],
+ etc. See interactive help (\h) also. This option does not
+ work in batch mode. Disable with --disable-pager. This
+ option is disabled by default.
+ --no-pager Disable pager and print to stdout. See interactive help
+ (\h) also. WARNING: option deprecated; use
+ --disable-pager instead.
+ -p, --password[=name]
+ Password to use when connecting to server. If password is
+ not given it's asked from the tty.
+ -P, --port=# Port number to use for connection.
+ --prompt=name Set the mysql prompt to this value.
+ --protocol=name The protocol of connection (tcp,socket,pipe,memory).
+ -q, --quick Don't cache result, print it row by row. This may slow
+ down the server if the output is suspended. Doesn't use
+ history file.
+ -r, --raw Write fields without conversion. Used with --batch.
+ --reconnect Reconnect if the connection is lost. Disable with
+ --disable-reconnect. This option is enabled by default.
+ -s, --silent Be more silent. Print results with a tab as separator,
+ each row on new line.
+ -S, --socket=name Socket file to use for connection.
+ --ssl Enable SSL for connection (automatically enabled with
+ other flags). Disable with --skip-ssl.
+ --ssl-ca=name CA file in PEM format (check OpenSSL docs, implies
+ --ssl).
+ --ssl-capath=name CA directory (check OpenSSL docs, implies --ssl).
+ --ssl-cert=name X509 cert in PEM format (implies --ssl).
+ --ssl-cipher=name SSL cipher to use (implies --ssl).
+ --ssl-key=name X509 key in PEM format (implies --ssl).
+ --ssl-verify-server-cert
+ Verify server's "Common Name" in its cert against
+ hostname used when connecting. This option is disabled by
+ default.
+ -t, --table Output in table format.
+ -T, --debug-info Print some debug info at exit.
+ --tee=name Append everything into outfile. See interactive help (\h)
+ also. Does not work in batch mode. Disable with
+ --disable-tee. This option is disabled by default.
+ --no-tee Disable outfile. See interactive help (\h) also. WARNING:
+ option deprecated; use --disable-tee instead
+ -u, --user=name User for login if not current user.
+ -U, --safe-updates Only allow UPDATE and DELETE that uses keys.
+ -U, --i-am-a-dummy Synonym for option --safe-updates, -U.
+ -v, --verbose Write more. (-v -v -v gives the table output format).
+ -V, --version Output version information and exit.
+ -w, --wait Wait and retry if connection is down.
+ --connect_timeout=# Number of seconds before connection timeout.
+ --max_allowed_packet=#
+ Max packet length to send to, or receive from server
+ --net_buffer_length=#
+ Buffer for TCP/IP and socket communication
+ --select_limit=# Automatic limit for SELECT when using --safe-updates
+ --max_join_size=# Automatic limit for rows in a join when using
+ --safe-updates
+ --secure-auth Refuse client connecting to server if it uses old
+ (pre-4.1.1) protocol
+ --show-warnings Show warnings after every statement.
+
+Default options are read from the following files in the given order:
+/etc/my.cnf ~/.my.cnf /usr/local/mysql/etc/my.cnf
+The following groups are read: mysql client
+The following options may be given as the first argument:
+--print-defaults Print the program argument list and exit
+--no-defaults Don't read default options from any options file
+--defaults-file=# Only read default options from the given file #
+--defaults-extra-file=# Read this file after the global files are read
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+auto-rehash TRUE
+character-sets-dir (No default value)
+default-character-set latin1
+compress FALSE
+database (No default value)
+delimiter ;
+vertical FALSE
+force FALSE
+named-commands FALSE
+local-infile FALSE
+no-beep FALSE
+host (No default value)
+html FALSE
+xml FALSE
+line-numbers TRUE
+unbuffered FALSE
+column-names TRUE
+sigint-ignore FALSE
+port 0
+prompt mysql>
+quick FALSE
+raw FALSE
+reconnect TRUE
+socket (No default value)
+ssl FALSE
+ssl-ca (No default value)
+ssl-capath (No default value)
+ssl-cert (No default value)
+ssl-cipher (No default value)
+ssl-key (No default value)
+ssl-verify-server-cert FALSE
+table FALSE
+debug-info FALSE
+user (No default value)
+safe-updates FALSE
+i-am-a-dummy FALSE
+connect_timeout 0
+max_allowed_packet 16777216
+net_buffer_length 16384
+select_limit 1000
+max_join_size 1000000
+secure-auth FALSE
+show-warnings FALSE
Added: trunk/connector-mxj/resources/5-0-41/data_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-0-41/data_dir.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-0-41/share_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-0-41/share_dir.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-0-41/win_share_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-0-41/win_share_dir.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/connector-mxj/resources/connector-mxj.properties
===================================================================
--- trunk/connector-mxj/resources/connector-mxj.properties 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/resources/connector-mxj.properties 2007-05-27 15:19:56 UTC (rev 96)
@@ -1,6 +1,6 @@
# Connector/MXJ properties
# default version of mysqld to deploy
-mysql-version=5.0.37
-# mysql-version=5.1.15
+mysql-version=5.0.41
+# mysql-version=5.1.18
Modified: trunk/connector-mxj/src/ConnectorMXJObjectTestExample.java
===================================================================
--- trunk/connector-mxj/src/ConnectorMXJObjectTestExample.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/ConnectorMXJObjectTestExample.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -26,9 +26,9 @@
import com.mysql.management.util.QueryUtil;
public class ConnectorMXJObjectTestExample {
- public static String DRIVER = "com.mysql.jdbc.Driver";
+ public static final String DRIVER = "com.mysql.jdbc.Driver";
- public static String JAVA_IO_TMPDIR = "java.io.tmpdir";
+ public static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
public static void main(String[] args) throws Exception {
File ourAppDir = new File(System.getProperty(JAVA_IO_TMPDIR));
Modified: trunk/connector-mxj/src/TestDb.java
===================================================================
--- trunk/connector-mxj/src/TestDb.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/TestDb.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -94,7 +94,7 @@
for (Iterator it2 = row.entrySet().iterator(); it2.hasNext();) {
final Map.Entry entry = (Map.Entry) it2.next();
if (printMetaData) {
- out.print(row + " " + entry.getKey() + ": ");
+ out.print(entry.getKey() + ": ");
}
out.println(entry.getValue());
}
Modified: trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/com/mysql/management/AllTestsSuite.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -48,4 +48,9 @@
return suite;
}
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.main(new String[] { AllTestsSuite.class
+ .getName() });
+ }
}
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -203,7 +203,7 @@
setShell(exec(threadName, mysqldArgs, out, err, true));
reportPid();
- utils.files().writeString(portFile, portStr);
+ utils.files().writeString(portFile, portStr + utils.str().newLine());
boolean ready = canConnectToServer(port, killDelay);
setReadyForConnection(ready);
@@ -241,7 +241,7 @@
conn.close();
}
} catch (Exception e) {
- e.printStackTrace();
+ e.printStackTrace(err);
}
}
utils.threads().pause(100);
@@ -319,13 +319,17 @@
+ pidFile);
} else {
utils.threads().pause(150);
- System.gc();
- utils.threads().pause(150);
- pidFile.deleteOnExit();
pidFile.delete();
pid = null;
- portFile.deleteOnExit();
portFile.delete();
+
+ utils.threads().pause(150);
+ if (pidFile.exists()) {
+ printMessage(pidFile + " still exits.");
+ }
+ if (portFile.exists()) {
+ printMessage(portFile + " still exits.");
+ }
}
setReadyForConnection(false);
@@ -428,7 +432,7 @@
} else {
versionString = mysqlVersionString;
}
- versionString.trim();
+ versionString = versionString.trim();
}
public synchronized void setVersion(String mysqlVersionString) {
@@ -644,7 +648,7 @@
String portStr = utils.files().asString(portFile).trim();
return Integer.parseInt(portStr);
} catch (Exception e) {
- e.printStackTrace();
+ e.printStackTrace(err);
}
}
return 0;
Modified: trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -83,7 +83,7 @@
private Str str;
- Object[] lastInvocation;
+ // private Object[] lastInvocation;
/**
* Directs output generated by MySQL to Standard Out and Standard Error.
@@ -207,7 +207,7 @@
*/
public synchronized Object invoke(String methodName, Object args[],
String types[]) throws ReflectionException {
- lastInvocation = new Object[] { methodName, args, types };
+ // lastInvocation = new Object[] { methodName, args, types };
clearMBeanInfo();
Modified: trunk/connector-mxj/src/com/mysql/management/util/DefaultsMap.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/DefaultsMap.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/com/mysql/management/util/DefaultsMap.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -86,8 +86,8 @@
public Set entrySet() {
Set entries = new LinkedHashSet();
- for (Iterator iter = keySet().iterator(); iter.hasNext();) {
- Object key = iter.next();
+ for (Iterator iter = original.entrySet().iterator(); iter.hasNext();) {
+ Object key = ((Map.Entry) iter.next()).getKey();
entries.add(new MapEntry(key, get(key)));
}
return entries;
Modified: trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -30,12 +30,25 @@
* @version $Id: FilesTest.java,v 1.1 2005/08/30 18:20:23 eherman Exp $
*/
public class FilesTest extends TestCase {
- Files fileUtil;
+ private Files fileUtil;
+ private File foo;
+
+ private File defaultDir;
+
protected void setUp() {
fileUtil = new Files();
}
+ protected void tearDown() throws Exception {
+ if (foo != null) {
+ fileUtil.deleteTree(foo);
+ }
+ if (defaultDir != null) {
+ fileUtil.deleteTree(defaultDir);
+ }
+ }
+
public void testTempDir() throws Exception {
String property = System.getProperty("java.io.tmpdir");
assertNotNull(property);
@@ -46,7 +59,7 @@
}
public void testDeleteTree() throws FileNotFoundException {
- File foo = new File(fileUtil.testDir(), "foo");
+ foo = new File(fileUtil.testDir(), "foo");
File bar = new File(foo, "bar");
bar.mkdirs();
assertEquals(true, bar.exists());
@@ -101,9 +114,9 @@
}
public void testValidCononicalDir() throws Exception {
- File foo = fileUtil.tmp("foo");
+ foo = fileUtil.tmp("foo");
File cononicalFoo = foo.getCanonicalFile();
- File defaultDir = fileUtil.tmp("defaultDir");
+ defaultDir = fileUtil.tmp("defaultDir");
File valid = fileUtil.validCononicalDir(foo);
assertEquals(cononicalFoo, valid);
Modified: trunk/connector-mxj/src/com/mysql/management/util/ListToString.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ListToString.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/com/mysql/management/util/ListToString.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -53,14 +53,14 @@
*/
public String toString(Object[] objs) {
if (objs == null) {
- return String.valueOf(null);
+ return String.valueOf((Object) null);
}
return toString(Arrays.asList(objs));
}
public String toString(Map map) {
if (map == null) {
- return String.valueOf(null);
+ return String.valueOf((Object) null);
}
return toString(map.entrySet());
}
@@ -70,7 +70,7 @@
* "a", "b", null, and new Integer(1) would return: {[a][b][null][1]}
*
* @param objs
- * collection
+ * collection
* @param prefix
* @param separator
* @param postfix
Deleted: trunk/connector-mxj/src/com/mysql/management/util/PatchedStandardSocketFactory.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/PatchedStandardSocketFactory.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/com/mysql/management/util/PatchedStandardSocketFactory.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -1,297 +0,0 @@
-/*
- Copyright (C) 2002-2007 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License as
- published by the Free Software Foundation.
-
- There are special exceptions to the terms and conditions of the GPL
- as it is applied to this software. View the full text of the
- exception in file EXCEPTIONS-CONNECTOR-J in the directory of this
- software distribution.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-
- */
-package com.mysql.management.util;
-// TODO: FIXME: remove this class when Connector/J 5.0.6 ships
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.Properties;
-
-import com.mysql.jdbc.SocketFactory;
-
-/**
- * Socket factory for vanilla TCP/IP sockets (the standard)
- *
- * @author Mark Matthews
- */
-public class PatchedStandardSocketFactory implements SocketFactory {
- // ~ Instance fields
- // --------------------------------------------------------
-
- /** The hostname to connect to */
- protected String host = null;
-
- /** The port number to connect to */
- protected int port = 3306;
-
- /** The underlying TCP/IP socket to use */
- protected Socket rawSocket = null;
-
- // ~ Methods
- // ----------------------------------------------------------------
-
- /**
- * Called by the driver after issuing the MySQL protocol handshake and
- * reading the results of the handshake.
- *
- * @throws SocketException
- * if a socket error occurs
- * @throws IOException
- * if an I/O error occurs
- *
- * @return The socket to use after the handshake
- */
- public Socket afterHandshake() throws SocketException, IOException {
- return this.rawSocket;
- }
-
- /**
- * Called by the driver before issuing the MySQL protocol handshake. Should
- * return the socket instance that should be used during the handshake.
- *
- * @throws SocketException
- * if a socket error occurs
- * @throws IOException
- * if an I/O error occurs
- *
- * @return the socket to use before the handshake
- */
- public Socket beforeHandshake() throws SocketException, IOException {
- return this.rawSocket;
- }
-
- /**
- * @see com.mysql.jdbc.SocketFactory#createSocket(Properties)
- */
- public Socket connect(String hostname, int portNumber, Properties props)
- throws SocketException, IOException {
-
- if (props != null) {
- this.host = hostname;
-
- this.port = portNumber;
-
- Method connectWithTimeoutMethod = null;
- Method socketBindMethod = null;
- Class socketAddressClass = null;
-
- String localSocketHostname = props
- .getProperty("localSocketAddress");
-
- String connectTimeoutStr = props.getProperty("connectTimeout");
-
- int connectTimeout = 0;
-
- boolean wantsTimeout = (connectTimeoutStr != null
- && connectTimeoutStr.length() > 0 && !connectTimeoutStr
- .equals("0"));
-
- boolean wantsLocalBind = (localSocketHostname != null && localSocketHostname
- .length() > 0);
-
- if (wantsTimeout || wantsLocalBind) {
-
- if (connectTimeoutStr != null) {
- try {
- connectTimeout = Integer.parseInt(connectTimeoutStr);
- } catch (NumberFormatException nfe) {
- throw new SocketException("Illegal value '"
- + connectTimeoutStr + "' for connectTimeout");
- }
- }
-
- try {
- // Have to do this with reflection, otherwise older JVMs
- // croak
- socketAddressClass = Class
- .forName("java.net.SocketAddress");
-
- connectWithTimeoutMethod = Socket.class.getMethod(
- "connect", new Class[] { socketAddressClass,
- Integer.TYPE });
-
- socketBindMethod = Socket.class.getMethod("bind",
- new Class[] { socketAddressClass });
-
- } catch (NoClassDefFoundError noClassDefFound) {
- // ignore, we give a better error below if needed
- } catch (NoSuchMethodException noSuchMethodEx) {
- // ignore, we give a better error below if needed
- } catch (Throwable catchAll) {
- // ignore, we give a better error below if needed
- }
-
- if (wantsLocalBind && socketBindMethod == null) {
- throw new SocketException(
- "Can't specify \"localSocketAddress\" on JVMs older than 1.4");
- }
-
- if (wantsTimeout && connectWithTimeoutMethod == null) {
- throw new SocketException(
- "Can't specify \"connectTimeout\" on JVMs older than 1.4");
- }
- }
-
- if (this.host != null) {
- if (!(wantsLocalBind || wantsTimeout)) {
- InetAddress[] possibleAddresses = InetAddress
- .getAllByName(this.host);
-
- Throwable caughtWhileConnecting = null;
-
- // Need to loop through all possible addresses, in case
- // someone has IPV6 configured (SuSE, for example...)
-
- for (int i = 0; i < possibleAddresses.length; i++) {
- try {
- rawSocket = new Socket(possibleAddresses[i], port);
-
- break;
- } catch (Exception ex) {
- caughtWhileConnecting = ex;
- }
- }
-
- if (rawSocket == null) {
- unwrapExceptionToProperClassAndThrowIt(caughtWhileConnecting);
- }
- } else {
- // must explicitly state this due to classloader issues
- // when running on older JVMs :(
- try {
-
- InetAddress[] possibleAddresses = InetAddress
- .getAllByName(this.host);
-
- Throwable caughtWhileConnecting = null;
-
- Object localSockAddr = null;
-
- Class inetSocketAddressClass = null;
-
- Constructor addrConstructor = null;
-
- try {
- inetSocketAddressClass = Class
- .forName("java.net.InetSocketAddress");
-
- addrConstructor = inetSocketAddressClass
- .getConstructor(new Class[] {
- InetAddress.class, Integer.TYPE });
-
- if (wantsLocalBind) {
- localSockAddr = addrConstructor
- .newInstance(new Object[] {
- InetAddress
- .getByName(localSocketHostname),
- new Integer(0 /*
- * use ephemeral
- * port
- */) });
-
- }
- } catch (Throwable ex) {
- unwrapExceptionToProperClassAndThrowIt(ex);
- }
-
- // Need to loop through all possible addresses, in case
- // someone has IPV6 configured (SuSE, for example...)
-
- for (int i = 0; i < possibleAddresses.length; i++) {
-
- try {
- rawSocket = new Socket();
-
- Object sockAddr = addrConstructor
- .newInstance(new Object[] {
- possibleAddresses[i],
- new Integer(port) });
- // bind to the local port, null is 'ok', it
- // means
- // use the ephemeral port
- socketBindMethod.invoke(rawSocket,
- new Object[] { localSockAddr });
-
- connectWithTimeoutMethod.invoke(rawSocket,
- new Object[] { sockAddr,
- new Integer(connectTimeout) });
-
- break;
- } catch (Exception ex) {
- rawSocket = null;
-
- caughtWhileConnecting = ex;
- }
- }
-
- if (rawSocket == null) {
- unwrapExceptionToProperClassAndThrowIt(caughtWhileConnecting);
- }
-
- } catch (Throwable t) {
- unwrapExceptionToProperClassAndThrowIt(t);
- }
- }
-
- try {
- this.rawSocket.setTcpNoDelay(true);
- } catch (Exception ex) {
- /* Ignore */
- ;
- }
-
- return this.rawSocket;
- }
- }
-
- throw new SocketException("Unable to create socket");
- }
-
- private void unwrapExceptionToProperClassAndThrowIt(
- Throwable caughtWhileConnecting) throws SocketException,
- IOException {
- if (caughtWhileConnecting instanceof InvocationTargetException) {
-
- // Replace it with the target, don't use 1.4 chaining as this still
- // needs to run on older VMs
- caughtWhileConnecting = ((InvocationTargetException) caughtWhileConnecting)
- .getTargetException();
- }
-
- if (caughtWhileConnecting instanceof SocketException) {
- throw (SocketException) caughtWhileConnecting;
- }
-
- if (caughtWhileConnecting instanceof IOException) {
- throw (IOException) caughtWhileConnecting;
- }
-
- throw new SocketException(caughtWhileConnecting.toString());
- }
-}
Modified: trunk/connector-mxj/src/com/mysql/management/util/Shell.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/Shell.java 2007-05-25 18:44:06 UTC (rev 95)
+++ trunk/connector-mxj/src/com/mysql/management/util/Shell.java 2007-05-27 15:19:56 UTC (rev 96)
@@ -100,11 +100,12 @@
this.me = new Thread(this, name);
/* Think of this just as if this were an extension of Thread */
/*
- * Don't try to .start() this thread here in the constructor. The
- * RULE is: you must not allow any other thread to obtain a
- * reference to a partly-constructed object. Since we pass a 'this'
- * pointer in, if we were to start the other thread, that very RULE
- * could be violated.
+ * To avoid mysterious NullPointerExceptions, don't try to .start()
+ * this thread here in the constructor. The RULE is: we must not
+ * allow any other thread to obtain a reference to a
+ * partly-constructed object. Since we pass a 'this' pointer in, if
+ * we were to start the other thread, that very RULE could be
+ * violated.
*/
this.args = args;
this.out = out;
| Thread |
|---|
| • Connector/MXJ commit: r96 - in trunk/connector-mxj: . commercial commercial/5-0-42 commercial/5-0-42/Linux-i386 commercial/5-0-42/Mac_OS_X-i386 commer... | eherman | 27 May |
