Added:
trunk/connector-mxj/commercial/5-1-40/
trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/
trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/mysql
trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/mysqld
trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/version.txt
trunk/connector-mxj/commercial/5-1-40/Linux-i386/
trunk/connector-mxj/commercial/5-1-40/Linux-i386/mysql
trunk/connector-mxj/commercial/5-1-40/Linux-i386/mysqld
trunk/connector-mxj/commercial/5-1-40/Linux-i386/version.txt
trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/
trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/mysql
trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/mysqld
trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/version.txt
trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/
trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/mysql
trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/mysqld
trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/version.txt
trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/
trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/mysql
trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/mysqld
trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/version.txt
trunk/connector-mxj/commercial/5-1-40/SunOS-x86/
trunk/connector-mxj/commercial/5-1-40/SunOS-x86/mysql
trunk/connector-mxj/commercial/5-1-40/SunOS-x86/mysqld
trunk/connector-mxj/commercial/5-1-40/SunOS-x86/version.txt
trunk/connector-mxj/commercial/5-1-40/Win-x86/
trunk/connector-mxj/commercial/5-1-40/Win-x86/mysql.exe
trunk/connector-mxj/commercial/5-1-40/Win-x86/mysqld.exe
trunk/connector-mxj/commercial/5-1-40/Win-x86/version.txt
trunk/connector-mxj/commercial/5-1-40/com/
trunk/connector-mxj/commercial/5-1-40/com/mysql/
trunk/connector-mxj/commercial/5-1-40/com/mysql/management/
trunk/connector-mxj/commercial/5-1-40/com/mysql/management/MySQL_Help.txt
trunk/connector-mxj/commercial/5-1-40/data_dir.jar
trunk/connector-mxj/commercial/5-1-40/share_dir.jar
trunk/connector-mxj/resources/5-1-40/
trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/
trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/mysql
trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/mysqld
trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/version.txt
trunk/connector-mxj/resources/5-1-40/Linux-i386/
trunk/connector-mxj/resources/5-1-40/Linux-i386/mysql
trunk/connector-mxj/resources/5-1-40/Linux-i386/mysqld
trunk/connector-mxj/resources/5-1-40/Linux-i386/version.txt
trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/
trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/mysql
trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/mysqld
trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/version.txt
trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/
trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/mysql
trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/mysqld
trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/version.txt
trunk/connector-mxj/resources/5-1-40/SunOS-sparc/
trunk/connector-mxj/resources/5-1-40/SunOS-sparc/mysql
trunk/connector-mxj/resources/5-1-40/SunOS-sparc/mysqld
trunk/connector-mxj/resources/5-1-40/SunOS-sparc/version.txt
trunk/connector-mxj/resources/5-1-40/SunOS-x86/
trunk/connector-mxj/resources/5-1-40/SunOS-x86/mysql
trunk/connector-mxj/resources/5-1-40/SunOS-x86/mysqld
trunk/connector-mxj/resources/5-1-40/SunOS-x86/version.txt
trunk/connector-mxj/resources/5-1-40/Win-x86/
trunk/connector-mxj/resources/5-1-40/Win-x86/mysql.exe
trunk/connector-mxj/resources/5-1-40/Win-x86/mysqld.exe
trunk/connector-mxj/resources/5-1-40/Win-x86/version.txt
trunk/connector-mxj/resources/5-1-40/com/
trunk/connector-mxj/resources/5-1-40/com/mysql/
trunk/connector-mxj/resources/5-1-40/com/mysql/management/
trunk/connector-mxj/resources/5-1-40/com/mysql/management/MySQL_Help.txt
trunk/connector-mxj/resources/5-1-40/data_dir.jar
trunk/connector-mxj/resources/5-1-40/share_dir.jar
Removed:
trunk/connector-mxj/commercial/5-1-34/
trunk/connector-mxj/lib/aspectjrt.jar
trunk/connector-mxj/lib/aspectjtools.jar
trunk/connector-mxj/resources/5-1-33/
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/commercial/platform-map.properties
trunk/connector-mxj/resources/connector-mxj.properties
trunk/connector-mxj/resources/platform-map.properties
trunk/connector-mxj/src/ConnectorMXJUrlTestExample.java
trunk/connector-mxj/src/ShowUsers.java
trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java
trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java
trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java
Log:
2009-11-10 - swapped out gpl binaries for v5-1-40
- swapped out commercial binaries for v5-1-40
- made "share-dir.jar" configurable via "connector-mxj.properties"
- test robustness with URLEncoding path names
- remove aspect-j due to license issues
Modified: trunk/connector-mxj/.classpath
===================================================================
--- trunk/connector-mxj/.classpath 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/.classpath 2009-11-10 19:19:56 UTC (rev 131)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn|**/.svn/*|.svn|**/*.aj" 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="lib" path="lib/junit.jar"/>
<classpathentry kind="lib" path="lib-nodist/jmxri.jar"/>
Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/CHANGES 2009-11-10 19:19:56 UTC (rev 131)
@@ -3,6 +3,12 @@
5-0-10
+2009-11-10 - swapped out gpl binaries for v5-1-40
+ - swapped out commercial binaries for v5-1-40
+ - made "share-dir.jar" configurable via "connector-mxj.properties"
+ - test robustness with URLEncoding path names
+ - remove aspect-j due to license issues
+
2009-04-18 - swapped out gpl binaries for v5-1-33
- swapped out commercial binaries for v5-1-34
- extract mysql client binary if present.
Modified: trunk/connector-mxj/_dev_notes.txt
===================================================================
--- trunk/connector-mxj/_dev_notes.txt 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/_dev_notes.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -36,17 +36,7 @@
tag the source with the new version
-scp /tmp/cmxj-build/dist/mysql-connector-mxj-* mysqldev@stripped:/tmp/connector-mxj
-ssh -A -X mysqldev@stripped
-scp /tmp/connector-mxj/mysql-* build.mysql.com:/tmp/connector-mxj
-ssh -A -X build.mysql.com
-#scp /tmp/connector-mxj/connector-mxj-gpl-* autobuild@localhost:/home/autobuild/stage/Downloads/Connector-MXJ/
-#scp /tmp/connector-mxj/connector-mxj-commercial-* autobuild@localhost:/home/autobuild/stage/commercial/Connector-MXJ/
-cp -v /tmp/connector-mxj/mysql-connector-mxj-gpl-* /home/autobuild/stage/Downloads/Connector-MXJ/
-cp -v /tmp/connector-mxj/mysql-connector-mxj-commercial-* /home/autobuild/stage/commercial/Connector-MXJ/
-rm -rf /tmp/connector-mxj/connector-mxj-*
-
email: rebuild <www-rebuild-downloads-connector-mxj@stripped>
Cc: dev-connectors@stripped
Subject: Connector/MXJ 1.0.6-beta
@@ -62,33 +52,8 @@
UPDATING THE MYSQLD BINARIES
-download the various MySQLs:
+download the various MySQLs.
-ssh -A -X mysqldev@stripped
-cd /tmp/eric && rm *
-export MXJ_MYSQL_VERSION=5.1.33
-scp build.mysql.com:/build/stage/community/MySQL-5.1/mysql-noinstall-$MXJ_MYSQL_VERSION-win32.zip .
-scp build.mysql.com:/build/stage/community/MySQL-5.1/mysql-$MXJ_MYSQL_VERSION-linux-i686.tar.gz .
-scp build.mysql.com:/build/stage/community/MySQL-5.1/mysql-$MXJ_MYSQL_VERSION-osx10.4-powerpc.tar.gz .
-scp build.mysql.com:/build/stage/community/MySQL-5.1/mysql-$MXJ_MYSQL_VERSION-osx10.4-i686.tar.gz .
-scp build.mysql.com:/build/stage/community/MySQL-5.1/mysql-$MXJ_MYSQL_VERSION-solaris8-sparc.tar.gz .
-scp build.mysql.com:/build/stage/community/MySQL-5.1/mysql-$MXJ_MYSQL_VERSION-solaris8-i386.tar.gz .
-scp build.mysql.com:/build/stage/community/MySQL-5.1/mysql-$MXJ_MYSQL_VERSION-freebsd6.3-i386.tar.gz .
-
-export MXJ_MYSQL_VERSION=5.1.30
-scp build.mysql.com:/build/stage/commercial/5.1/mysql-enterprise-noinstall-$MXJ_MYSQL_VERSION-win32.zip .
-scp build.mysql.com:/build/stage/commercial/5.1/mysql-enterprise-$MXJ_MYSQL_VERSION-linux-i686.tar.gz .
-scp build.mysql.com:/build/stage/commercial/5.1/mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-powerpc.tar.gz .
-scp build.mysql.com:/build/stage/commercial/5.1/mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686.tar.gz .
-scp build.mysql.com:/build/stage/commercial/5.1/mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-sparc.tar.gz .
-scp build.mysql.com:/build/stage/commercial/5.1/mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-i386.tar.gz .
-scp build.mysql.com:/build/stage/commercial/5.1/mysql-enterprise-$MXJ_MYSQL_VERSION-freebsd6.3-i386.tar.gz .
-exit
-
-scp mysqldev@stripped:/tmp/eric/* .
-
-
-
In the "resources" directory create a subdirectory named "5-0-XY"
In the "commercial" directory create a subdirectory named "5-0-XY"
Create subdirectories under each of these top level directories for the
@@ -107,79 +72,84 @@
for file in $(ls *.gz); do tar xvfz $file; done;
-export MXJ_MYSQL_VERSION=5.1.33
-export MXJ_MYSQL_DIR=5-1-33
+export MXJ_MYSQL_VERSION=5.1.40
+export MXJ_MYSQL_DIR=5-1-40
# 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/ &&
+#cp mysql-$MXJ_MYSQL_VERSION-win32/bin/mysql.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-win32/bin/mysqld.exe /ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Win-x86/ &&
+cp mysql-$MXJ_MYSQL_VERSION-win32/bin/mysqld.exe ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Win-x86/ &&
+cp mysql-$MXJ_MYSQL_VERSION-win32/bin/mysql.exe ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Win-x86/ &&
echo mysql-$MXJ_MYSQL_VERSION-win32/bin/mysqld.exe > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Win-x86/version.txt &&
cp mysql-$MXJ_MYSQL_VERSION-linux-i686-glibc23/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Linux-i386/ &&
+cp mysql-$MXJ_MYSQL_VERSION-linux-i686-glibc23/bin/mysql ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Linux-i386/ &&
echo mysql-$MXJ_MYSQL_VERSION-linux-i686-glibc23/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Linux-i386/version.txt &&
cp mysql-$MXJ_MYSQL_VERSION-osx10.4-powerpc/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/ &&
+cp mysql-$MXJ_MYSQL_VERSION-osx10.4-powerpc/bin/mysql ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/ &&
echo mysql-$MXJ_MYSQL_VERSION-osx10.4-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/ &&
+cp mysql-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysql ~/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/ &&
+cp mysql-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysql ~/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-solaris8-i386/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/SunOS-x86/ &&
+cp mysql-$MXJ_MYSQL_VERSION-solaris8-i386/bin/mysql ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/SunOS-x86/ &&
echo mysql-$MXJ_MYSQL_VERSION-solaris8-i386/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/SunOS-x86/version.txt &&
cp mysql-$MXJ_MYSQL_VERSION-freebsd6.3-i386/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/FreeBSD-x86/ &&
+cp mysql-$MXJ_MYSQL_VERSION-freebsd6.3-i386/bin/mysql ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/FreeBSD-x86/ &&
echo mysql-$MXJ_MYSQL_VERSION-freebsd6.3-i386/bin/mysqld > ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/FreeBSD-x86/version.txt &&
echo YAY || echo DARN
-export MXJ_MYSQL_VERSION=5.0.66a
-export MXJ_MYSQL_DIR=5-0-66a
+export MXJ_MYSQL_VERSION=5.1.40
+export MXJ_MYSQL_DIR=5-1-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 &&
-cp mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-i386/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-x86/ &&
-echo mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-i386/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-x86/version.txt &&
-cp mysql-enterprise-$MXJ_MYSQL_VERSION-freebsd6.0-i386/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/FreeBSD-x86/ &&
-echo mysql-enterprise-$MXJ_MYSQL_VERSION-freebsd6.0-i386/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/FreeBSD-x86/version.txt &&
+#cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/ &&
+#cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-win32/bin/mysqld.exe ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/ &&
+#echo mysql-advanced-gpl-$MXJ_MYSQL_VERSION-win32/bin/mysqld-nt.exe > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/version.txt &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-win32/bin/mysqld.exe ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/ &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-win32/bin/mysql.exe ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/ &&
+echo mysql-advanced-gpl-$MXJ_MYSQL_VERSION-win32/bin/mysqld.exe > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Win-x86/version.txt &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-linux-i686-glibc23/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Linux-i386/ &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-linux-i686-glibc23/bin/mysql ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Linux-i386/ &&
+echo mysql-advanced-gpl-$MXJ_MYSQL_VERSION-linux-i686-glibc23/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Linux-i386/version.txt &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-osx10.4-powerpc/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/ &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-osx10.4-powerpc/bin/mysql ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/ &&
+echo mysql-advanced-gpl-$MXJ_MYSQL_VERSION-osx10.4-powerpc/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-ppc/version.txt &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-i386/ &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysql ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-i386/ &&
+echo mysql-advanced-gpl-$MXJ_MYSQL_VERSION-osx10.4-i686/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/Mac_OS_X-i386/version.txt &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-sparc/ &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysql ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-sparc/ &&
+echo mysql-advanced-gpl-$MXJ_MYSQL_VERSION-solaris8-sparc/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-sparc/version.txt &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-solaris8-i386/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-x86/ &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-solaris8-i386/bin/mysql ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-x86/ &&
+echo mysql-advanced-gpl-$MXJ_MYSQL_VERSION-solaris8-i386/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/SunOS-x86/version.txt &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-freebsd6.3-i386/bin/mysqld ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/FreeBSD-x86/ &&
+cp mysql-advanced-gpl-$MXJ_MYSQL_VERSION-freebsd6.3-i386/bin/mysql ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/FreeBSD-x86/ &&
+echo mysql-advanced-gpl-$MXJ_MYSQL_VERSION-freebsd6.0-i386/bin/mysqld > ~/ews-work/connector-mxj/commercial/$MXJ_MYSQL_DIR/FreeBSD-x86/version.txt &&
echo YAY || echo DARN
-export MXJ_MYSQL_VERSION=5.1.34
-export MXJ_MYSQL_DIR=5-1-34
-# 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-glibc23/bin/mysqld ~/ews-work/connector-mxj/resources/$MXJ_MYSQL_DIR/Linux-i386/
-echo mysql-$MXJ_MYSQL_VERSION-linux-i686-glibc23/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
+#cd to the appropriate directory for the platform)
-#------------------------------------------
-
(if enterprise version != community do for each version)
use the "scripts/mysql_install_db" to create the "data" and "share" directories.
(use your platform of course, but it is trickier on windows)
Agian, make sure you have the correct [enterprise/standard/max/debug] set.
for standard:
-./scripts/mysql_install_db --no-defaults --basedir=/Volumes/LaCie/mysql_downloads/5.0.67/mysql-$MXJ_MYSQL_VERSION-osx10.4-i686
-or enterprise
-./scripts/mysql_install_db --no-defaults --basedir=/Volumes/LaCie/mysql_downloads/5.0.66a/mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686
-or 5.1 beta
-./scripts/mysql_install_db --no-defaults --basedir=/Volumes/LaCie/mysql_downloads/5.1.23/mysql-$MXJ_MYSQL_VERSION-osx10.4-i686
+./scripts/mysql_install_db --no-defaults --basedir=${PWD}
+./bin/mysqld --no-defaults --basedir=${PWD} &
+mysql> select HOST, USER, PASSWORD from mysql.user;
+mysql> DELETE FROM mysql.user WHERE HOST = "hilly.local";
+
export WORKSPACE=/home/eric/ews-work/connector-mxj
#reset version variables
cd (max)
@@ -192,8 +162,8 @@
./bin/mysql --no-defaults --verbose --help > $WORKSPACE/commercial/$MXJ_MYSQL_DIR/com/mysql/management/MySQL_Help.txt
-export MXJ_MYSQL_VERSION=
-export MXJ_MYSQL_DIR=
+#export MXJ_MYSQL_VERSION=
+#export MXJ_MYSQL_DIR=
# Create the "data_dir.jar":
cd data
jar cvf $WORKSPACE/resources/$MXJ_MYSQL_DIR/data_dir.jar *
@@ -207,11 +177,12 @@
jar cvf $WORKSPACE/resources/$MXJ_MYSQL_DIR/share_dir.jar share
#jar cvf $WORKSPACE/commercial/$MXJ_MYSQL_DIR/share_dir.jar share
-# Create the "win_share_dir.jar" (eliminate the "mysql" sub-dir)
-mv share/mysql/* share/
-rmdir share/mysql
-jar cvf $WORKSPACE/resources/$MXJ_MYSQL_DIR/win_share_dir.jar share
-#jar cvf $WORKSPACE/commercial/$MXJ_MYSQL_DIR/win_share_dir.jar share
+# older versions of mysqld
+## Create the "win_share_dir.jar" (eliminate the "mysql" sub-dir)
+##mv share/mysql/* share/
+#rmdir share/mysql
+#jar cvf $WORKSPACE/resources/$MXJ_MYSQL_DIR/win_share_dir.jar share
+##jar cvf $WORKSPACE/commercial/$MXJ_MYSQL_DIR/win_share_dir.jar share
# if enterprise version == community version, copy the *dir.jar files to the
# "commercial" directory as well, alternatively repeat for enterprise.
@@ -228,8 +199,6 @@
rm -rf /tmp/test-c.mxj
re-run tests
-update user set host='127.0.0.1' where host='xyzzy';
-
don't forget to "un-ignore" the mysqld-nt.exe files, which may be ignored by
your default version control settings
Modified: trunk/connector-mxj/build.xml
===================================================================
--- trunk/connector-mxj/build.xml 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/build.xml 2009-11-10 19:19:56 UTC (rev 131)
@@ -23,8 +23,8 @@
<description>A Java Wrapper for MySQL</description>
<property name="mxj-version" value="5-0-10" />
- <property name="gpl-mysqld-version" value="5-1-33" />
- <property name="commercial-mysqld-version" value="5-1-34" />
+ <property name="gpl-mysqld-version" value="5-1-40" />
+ <property name="commercial-mysqld-version" value="5-1-40" />
<property name="src" location="src" />
<property name="misc" location="misc" />
@@ -37,6 +37,7 @@
<property name="emma.dir" value="./lib-coverage" />
<property name="emma.coverage.dir" location="${misc}/emma-results" />
<property name="junit.results" location="${misc}/junit-results" />
+ <property name="no.aspectj" value="true" />
<path id="project.build.classpath">
<fileset dir="lib">
@@ -57,7 +58,7 @@
in the "mysql-connector-mxj-gpl-${mxj-version}.jar"
set "source.only" to true to avoid inclusion of:
mysql-connector-mxj-gpl-${mxj-version}.jar
- set "no.aspectj" to true to skip building trace-logging
+ set "no.aspectj" to false to building trace-logging
clean - to removes the ${tmp} directory
@@ -124,7 +125,7 @@
<path refid="project.build.classpath" />
<pathelement location="${stage-cmxj}/${fullProdName}.jar" />
</path>
- <echo>Using CLASSPATH=${test.classpath}</echo>
+ <!-- <echo>Using CLASSPATH=${test.classpath}</echo> -->
<junit printsummary="true" haltonfailure="false">
<classpath refid="test.classpath" />
<formatter type="plain" />
Added: trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/version.txt (rev 0)
+++ trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-advanced-gpl-5.1.40-freebsd6.0-i386/bin/mysqld
Property changes on: trunk/connector-mxj/commercial/5-1-40/FreeBSD-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/commercial/5-1-40/Linux-i386/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/Linux-i386/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/Linux-i386/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/Linux-i386/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/Linux-i386/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-1-40/Linux-i386/version.txt (rev 0)
+++ trunk/connector-mxj/commercial/5-1-40/Linux-i386/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-advanced-gpl-5.1.40-linux-i686-glibc23/bin/mysqld
Property changes on: trunk/connector-mxj/commercial/5-1-40/Linux-i386/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/version.txt (rev 0)
+++ trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-advanced-gpl-5.1.40-osx10.4-i686/bin/mysqld
Property changes on: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-i386/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/version.txt (rev 0)
+++ trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-advanced-gpl-5.1.40-osx10.4-powerpc/bin/mysqld
Property changes on: trunk/connector-mxj/commercial/5-1-40/Mac_OS_X-ppc/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/version.txt (rev 0)
+++ trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-advanced-gpl-5.1.40-solaris8-sparc/bin/mysqld
Property changes on: trunk/connector-mxj/commercial/5-1-40/SunOS-sparc/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/commercial/5-1-40/SunOS-x86/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/SunOS-x86/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/SunOS-x86/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/SunOS-x86/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/SunOS-x86/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-1-40/SunOS-x86/version.txt (rev 0)
+++ trunk/connector-mxj/commercial/5-1-40/SunOS-x86/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-advanced-gpl-5.1.40-solaris8-i386/bin/mysqld
Property changes on: trunk/connector-mxj/commercial/5-1-40/SunOS-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/commercial/5-1-40/Win-x86/mysql.exe
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/Win-x86/mysql.exe
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/Win-x86/mysqld.exe
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/Win-x86/mysqld.exe
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/Win-x86/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-1-40/Win-x86/version.txt (rev 0)
+++ trunk/connector-mxj/commercial/5-1-40/Win-x86/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-advanced-gpl-5.1.40-win32/bin/mysqld.exe
Property changes on: trunk/connector-mxj/commercial/5-1-40/Win-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/commercial/5-1-40/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/commercial/5-1-40/com/mysql/management/MySQL_Help.txt (rev 0)
+++ trunk/connector-mxj/commercial/5-1-40/com/mysql/management/MySQL_Help.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1,195 @@
+./bin/mysql Ver 14.14 Distrib 5.1.40, for apple-darwin8.11.1 (i386) using readline 5.1
+Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+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.
+ --column-type-info Display column type information.
+ -c, --comments Preserve comments. Send comments to the server. The
+ default is --skip-comments (discard comments), enable
+ with --comments
+ -C, --compress Use compression in server/client protocol.
+ -#, --debug[=#] This is a non-debug version. Catch this and exit
+ --debug-check Check memory and open file usage at exit.
+ -T, --debug-info Print some debug info at exit.
+ -D, --database=name Database to use.
+ --default-character-set=name
+ Set the default character set.
+ --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 or 0 for default to, in
+ order of preference, my.cnf, $MYSQL_TCP_PORT,
+ /etc/services, built-in default (3306).
+ --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.
+ --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
+ --server-arg=name Send embedded server this as a parameter.
+ --show-warnings Show warnings after every statement.
+
+Default options are read from the following files in the given order:
+/etc/my.cnf /etc/mysql/my.cnf /usr/local/mysql/etc/my.cnf ~/.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)
+column-type-info FALSE
+comments FALSE
+compress FALSE
+debug-check FALSE
+debug-info FALSE
+database (No default value)
+default-character-set latin1
+delimiter ;
+vertical FALSE
+force FALSE
+named-commands FALSE
+ignore-spaces 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
+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
Property changes on: trunk/connector-mxj/commercial/5-1-40/com/mysql/management/MySQL_Help.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/commercial/5-1-40/data_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/data_dir.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/commercial/5-1-40/share_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/commercial/5-1-40/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 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/commercial/connector-mxj.properties 2009-11-10 19:19:56 UTC (rev 131)
@@ -1,7 +1,7 @@
# Connector/MXJ properties
# default version of mysqld to deploy
-mysql-version=5.1.34
+mysql-version=5.1.40
# amount of time that Connector/MXJ will wait between initiating a graceful
# shutdown and attempting a "kill -9"
@@ -9,3 +9,6 @@
windows-kill-command=kill.exe
#windows-mysqld-command=mysqld-nt.exe
+windows-share-dir-jar=share_dir.jar
+#windows-share-dir-jar=win_share_dir.jar
+
Modified: trunk/connector-mxj/commercial/platform-map.properties
===================================================================
--- trunk/connector-mxj/commercial/platform-map.properties 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/commercial/platform-map.properties 2009-11-10 19:19:56 UTC (rev 131)
@@ -25,6 +25,7 @@
FreeBSD-x86=FreeBSD-x86
+Windows_7-x86=Win-x86
Windows_Vista-x86=Win-x86
Windows_2003-x86=Win-x86
Windows_XP-x86=Win-x86
Deleted: trunk/connector-mxj/lib/aspectjrt.jar
===================================================================
(Binary files differ)
Deleted: trunk/connector-mxj/lib/aspectjtools.jar
===================================================================
(Binary files differ)
Added: trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/version.txt (rev 0)
+++ trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-5.1.40-freebsd6.3-i386/bin/mysqld
Property changes on: trunk/connector-mxj/resources/5-1-40/FreeBSD-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/resources/5-1-40/Linux-i386/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/Linux-i386/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/Linux-i386/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/Linux-i386/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/Linux-i386/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-1-40/Linux-i386/version.txt (rev 0)
+++ trunk/connector-mxj/resources/5-1-40/Linux-i386/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-5.1.40-linux-i686-glibc23/bin/mysqld
Property changes on: trunk/connector-mxj/resources/5-1-40/Linux-i386/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/version.txt (rev 0)
+++ trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-5.1.40-osx10.4-i686/bin/mysqld
Property changes on: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-i386/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/version.txt (rev 0)
+++ trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-5.1.40-osx10.4-powerpc/bin/mysqld
Property changes on: trunk/connector-mxj/resources/5-1-40/Mac_OS_X-ppc/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/resources/5-1-40/SunOS-sparc/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/SunOS-sparc/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/SunOS-sparc/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/SunOS-sparc/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/SunOS-sparc/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-1-40/SunOS-sparc/version.txt (rev 0)
+++ trunk/connector-mxj/resources/5-1-40/SunOS-sparc/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-5.1.40-solaris8-sparc/bin/mysqld
Property changes on: trunk/connector-mxj/resources/5-1-40/SunOS-sparc/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/resources/5-1-40/SunOS-x86/mysql
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/SunOS-x86/mysql
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/SunOS-x86/mysqld
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/SunOS-x86/mysqld
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/SunOS-x86/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-1-40/SunOS-x86/version.txt (rev 0)
+++ trunk/connector-mxj/resources/5-1-40/SunOS-x86/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-5.1.40-solaris8-i386/bin/mysqld
Property changes on: trunk/connector-mxj/resources/5-1-40/SunOS-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/resources/5-1-40/Win-x86/mysql.exe
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/Win-x86/mysql.exe
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/Win-x86/mysqld.exe
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/Win-x86/mysqld.exe
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/Win-x86/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-1-40/Win-x86/version.txt (rev 0)
+++ trunk/connector-mxj/resources/5-1-40/Win-x86/version.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1 @@
+mysql-5.1.40-win32/bin/mysqld.exe
Property changes on: trunk/connector-mxj/resources/5-1-40/Win-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/resources/5-1-40/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/resources/5-1-40/com/mysql/management/MySQL_Help.txt (rev 0)
+++ trunk/connector-mxj/resources/5-1-40/com/mysql/management/MySQL_Help.txt 2009-11-10 19:19:56 UTC (rev 131)
@@ -0,0 +1,195 @@
+./bin/mysql Ver 14.14 Distrib 5.1.40, for apple-darwin8.11.1 (i386) using readline 5.1
+Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
+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.
+ --column-type-info Display column type information.
+ -c, --comments Preserve comments. Send comments to the server. The
+ default is --skip-comments (discard comments), enable
+ with --comments
+ -C, --compress Use compression in server/client protocol.
+ -#, --debug[=#] This is a non-debug version. Catch this and exit
+ --debug-check Check memory and open file usage at exit.
+ -T, --debug-info Print some debug info at exit.
+ -D, --database=name Database to use.
+ --default-character-set=name
+ Set the default character set.
+ --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 or 0 for default to, in
+ order of preference, my.cnf, $MYSQL_TCP_PORT,
+ /etc/services, built-in default (3306).
+ --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.
+ --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
+ --server-arg=name Send embedded server this as a parameter.
+ --show-warnings Show warnings after every statement.
+
+Default options are read from the following files in the given order:
+/etc/my.cnf /etc/mysql/my.cnf /usr/local/mysql/etc/my.cnf ~/.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)
+column-type-info FALSE
+comments FALSE
+compress FALSE
+debug-check FALSE
+debug-info FALSE
+database (No default value)
+default-character-set latin1
+delimiter ;
+vertical FALSE
+force FALSE
+named-commands FALSE
+ignore-spaces 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
+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
Property changes on: trunk/connector-mxj/resources/5-1-40/com/mysql/management/MySQL_Help.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/connector-mxj/resources/5-1-40/data_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/data_dir.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/connector-mxj/resources/5-1-40/share_dir.jar
===================================================================
(Binary files differ)
Property changes on: trunk/connector-mxj/resources/5-1-40/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 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/resources/connector-mxj.properties 2009-11-10 19:19:56 UTC (rev 131)
@@ -1,7 +1,7 @@
# Connector/MXJ properties
# default version of mysqld to deploy
-mysql-version=5.1.33
+mysql-version=5.1.40
# amount of time that Connector/MXJ will wait between initiating a graceful
# shutdown and attempting a "kill -9"
@@ -9,3 +9,6 @@
windows-kill-command=kill.exe
#windows-mysqld-command=mysqld-nt.exe
+windows-share-dir-jar=share_dir.jar
+#windows-share-dir-jar=win_share_dir.jar
+
Modified: trunk/connector-mxj/resources/platform-map.properties
===================================================================
--- trunk/connector-mxj/resources/platform-map.properties 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/resources/platform-map.properties 2009-11-10 19:19:56 UTC (rev 131)
@@ -25,6 +25,7 @@
FreeBSD-x86=FreeBSD-x86
+Windows_7-x86=Win-x86
Windows_Vista-x86=Win-x86
Windows_2003-x86=Win-x86
Windows_XP-x86=Win-x86
Modified: trunk/connector-mxj/src/ConnectorMXJUrlTestExample.java
===================================================================
--- trunk/connector-mxj/src/ConnectorMXJUrlTestExample.java 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/src/ConnectorMXJUrlTestExample.java 2009-11-10 19:19:56 UTC (rev 131)
@@ -17,6 +17,7 @@
*/
import java.io.File;
+import java.net.URLEncoder;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -31,12 +32,13 @@
public static void main(String[] args) throws Exception {
File ourAppDir = new File(System.getProperty(JAVA_IO_TMPDIR));
File databaseDir = new File(ourAppDir, "test-mxj");
+ String databasePath = URLEncoder.encode(databaseDir.getPath(), "UTF-8");
int port = Integer.parseInt(System.getProperty("c-mxj_test_port",
"3336"));
String dbName = "our_test_app";
String url = "jdbc:mysql:mxj://localhost:" + port + "/" + dbName //
- + "?" + "server.basedir=" + databaseDir //
+ + "?" + "server.basedir=" + databasePath //
+ "&" + "createDatabaseIfNotExist=true"//
+ "&" + "server.initialize-user=true" //
;
Modified: trunk/connector-mxj/src/ShowUsers.java
===================================================================
--- trunk/connector-mxj/src/ShowUsers.java 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/src/ShowUsers.java 2009-11-10 19:19:56 UTC (rev 131)
@@ -17,6 +17,7 @@
*/
import java.io.File;
+import java.net.URLEncoder;
import com.mysql.management.driverlaunched.ServerLauncherSocketFactory;
@@ -24,10 +25,11 @@
public static void main(String[] args) throws Exception {
File ourAppDir = new File(System.getProperty("java.io.tmpdir"));
File databaseDir = new File(ourAppDir, "test-show-users-mxj");
+ String databasePath = URLEncoder.encode(databaseDir.getPath(), "UTF-8");
int port = 3336;
String url = "jdbc:mysql:mxj://localhost:" + port + "/mysql" //
- + "?" + "server.basedir=" + databaseDir;
+ + "?" + "server.basedir=" + databasePath;
String driver = "com.mysql.jdbc.Driver";
String user = (args.length > 0) ? args[0] : "root";
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2009-11-10 19:19:56 UTC (rev 131)
@@ -561,11 +561,12 @@
}
private String executableName() {
- if (isWindows()) {
- return connectorMxjProperties.getProperty("windows-mysqld-command",
- "mysqld.exe");
+ if (!isWindows()) {
+ return "mysqld";
}
- return "mysqld";
+ String key = "windows-mysqld-command";
+ String defaultValue = "mysqld.exe";
+ return connectorMxjProperties.getProperty(key, defaultValue);
}
private String clientExecutableName() {
@@ -654,7 +655,9 @@
String shareJar() {
String shareJar = "share_dir.jar";
if (isWindows()) {
- shareJar = "win_" + shareJar;
+ String key = "windows-share-dir-jar";
+ String defaultVal = "win_" + shareJar;
+ shareJar = connectorMxjProperties.getProperty(key, defaultVal);
}
return shareJar;
}
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java 2009-11-10 19:19:56 UTC (rev 131)
@@ -358,8 +358,13 @@
}
public void testJarName() {
+ Properties props = utils.streams().loadProperties(
+ "connector-mxj.properties", System.err);
+ String expected = props.getProperty("windows-share-dir-jar",
+ "win_share_dir.jar");
+
setSystemPropertiesToWinNT();
- assertEquals("win_share_dir.jar", mysqldResource.shareJar());
+ assertEquals(expected, mysqldResource.shareJar());
setSytemPropertiesToLinux();
assertEquals("share_dir.jar", mysqldResource.shareJar());
}
Modified: trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java 2009-11-10 19:19:56 UTC (rev 131)
@@ -18,6 +18,7 @@
package com.mysql.management.driverlaunched;
import java.io.File;
+import java.net.URLEncoder;
import java.sql.SQLException;
import com.mysql.management.MysqldResource;
@@ -76,12 +77,12 @@
public void testServerDriverLauncherFactory() throws Exception {
dataDir = new File(new Files().tmp("TestApp"), "data");
+ String safePath = URLEncoder.encode(dataDir.getPath(), "UTF-8");
port = testUtil.testPort();
- String url = "jdbc:mysql:mxj://localhost:" + port
- + "/alice_db" //
- + "?server.datadir=" + dataDir.getPath()
+ String url = "jdbc:mysql:mxj://localhost:" + port + "/alice_db" //
+ + "?server.datadir=" + safePath //
+ "&server.initialize-user=true"//
+ "&createDatabaseIfNotExist=true"//
;
Modified: trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java 2009-04-18 19:12:06 UTC (rev 130)
+++ trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java 2009-11-10 19:19:56 UTC (rev 131)
@@ -135,7 +135,10 @@
valid = fileUtil.validCononicalDir(null, defaultDir);
assertEquals(defaultDir, valid);
- File bar = new File(fileUtil.testDir(), "junkFile.txt");
+ File testDir = fileUtil.testDir();
+ assertEquals(testDir, fileUtil.validCononicalDir(testDir));
+
+ File bar = new File(testDir, "junkFile.txt");
bar.deleteOnExit();
writeToFile(bar, "junk");
| Thread |
|---|
| • Connector/MXJ commit: r131 - in trunk/connector-mxj: . commercial commercial/5-1-40 commercial/5-1-40/FreeBSD-x86 commercial/5-1-40/Linux-i386 commerc... | eherman | 10 Nov |
