Modified:
trunk/connector-mxj/_dev_notes.txt
trunk/connector-mxj/build.xml
trunk/connector-mxj/commercial/5-0-19/com/mysql/management/MySQL_Help.txt
trunk/connector-mxj/commercial/5-0-19/data_dir.jar
trunk/connector-mxj/commercial/5-0-19/share_dir.jar
trunk/connector-mxj/commercial/5-0-19/win_share_dir.jar
trunk/connector-mxj/resources/5-0-19/data_dir.jar
trunk/connector-mxj/resources/5-0-19/share_dir.jar
trunk/connector-mxj/resources/5-0-19/win_share_dir.jar
trunk/connector-mxj/src/ConnectorMXJObjectTestExample.java
trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java
trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java
trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java
Log:
re-added 5-0-19 supporting resources
Modified: trunk/connector-mxj/_dev_notes.txt
===================================================================
--- trunk/connector-mxj/_dev_notes.txt 2006-03-17 15:20:36 UTC (rev 20)
+++ trunk/connector-mxj/_dev_notes.txt 2006-03-17 16:10:03 UTC (rev 21)
@@ -102,6 +102,8 @@
use the "scripts/mysql_install_db" to create the "data" and "share" directories.
(use your platform of course, but it is trickier on windows)
+./scripts/mysql_install_db --no-defaults --basedir=/home/eric/dload/n/mysql-max-$MXJ_MYSQL_VERSION-linux-i686
+
cd (max)
./bin/mysql --no-defaults --verbose --help > $WORKSPACE/resources/5-0-XY/com/mysql/management/MySQL_Help.txt
cd ..
Modified: trunk/connector-mxj/build.xml
===================================================================
--- trunk/connector-mxj/build.xml 2006-03-17 15:20:36 UTC (rev 20)
+++ trunk/connector-mxj/build.xml 2006-03-17 16:10:03 UTC (rev 21)
@@ -175,7 +175,7 @@
<jar destfile="${stage-cmxj}/connector-mxj.jar">
<fileset dir="${build}" />
<fileset dir="${resources}">
- <include name="5-0-18/**" />
+ <include name="5-0-19/**" />
<include name="kill.exe" />
</fileset>
</jar>
@@ -243,7 +243,7 @@
</copy>
<copy todir="${stage-cmxj}/resources">
<fileset dir="${resources}">
- <include name="5-0-18/**" />
+ <include name="5-0-19/**" />
<include name="kill.exe" />
</fileset>
</copy>
Modified: trunk/connector-mxj/commercial/5-0-19/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-19/com/mysql/management/MySQL_Help.txt 2006-03-17 15:20:36 UTC (rev 20)
+++ trunk/connector-mxj/commercial/5-0-19/com/mysql/management/MySQL_Help.txt 2006-03-17 16:10:03 UTC (rev 21)
@@ -1,7 +1,7 @@
-./bin/mysql Ver 14.12 Distrib 5.0.19, for pc-linux-gnu (i686) using readline 5.0
+./bin/mysql Ver 14.12 Distrib 5.0.19, for pc-linux-gnu (i686) using EditLine wrapper
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
+This software comes with ABSOLUTELY NO WARRANTY. This is commercial software,
+please see the file MySQLEULA.txt for details
Usage: ./bin/mysql [OPTIONS] [database]
-?, --help Display this help and exit.
-I, --help Synonym for -?
Modified: trunk/connector-mxj/commercial/5-0-19/data_dir.jar
===================================================================
(Binary files differ)
Modified: trunk/connector-mxj/commercial/5-0-19/share_dir.jar
===================================================================
(Binary files differ)
Modified: trunk/connector-mxj/commercial/5-0-19/win_share_dir.jar
===================================================================
(Binary files differ)
Modified: trunk/connector-mxj/resources/5-0-19/data_dir.jar
===================================================================
(Binary files differ)
Modified: trunk/connector-mxj/resources/5-0-19/share_dir.jar
===================================================================
(Binary files differ)
Modified: trunk/connector-mxj/resources/5-0-19/win_share_dir.jar
===================================================================
(Binary files differ)
Modified: trunk/connector-mxj/src/ConnectorMXJObjectTestExample.java
===================================================================
--- trunk/connector-mxj/src/ConnectorMXJObjectTestExample.java 2006-03-17 15:20:36 UTC (rev 20)
+++ trunk/connector-mxj/src/ConnectorMXJObjectTestExample.java 2006-03-17 16:10:03 UTC (rev 21)
@@ -31,7 +31,9 @@
printQueryResults(conn, "SELECT VERSION()");
} finally {
try {
- conn.close();
+ if (conn != null) {
+ conn.close();
+ }
} catch (Exception e) {
e.printStackTrace();
}
Modified: trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java 2006-03-17 15:20:36 UTC (rev 20)
+++ trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java 2006-03-17 16:10:03 UTC (rev 21)
@@ -79,9 +79,9 @@
String trimToOptions(String help) {
boolean success = false;
try {
- help = trimToOptionsInner(help);
+ String trimmedHelp = trimToOptionsInner(help);
success = true;
- return help;
+ return trimmedHelp;
} finally {
if (!success) {
synchronized (err) {
Modified: trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java 2006-03-17 15:20:36 UTC (rev 20)
+++ trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java 2006-03-17 16:10:03 UTC (rev 21)
@@ -38,7 +38,7 @@
String resourceVersionDir = MysqldResourceI.DEFAULT_VERSION.replaceAll(
"\\.", "-");
- assertEquals("5-0-18", resourceVersionDir);
+ assertEquals("5-0-19", resourceVersionDir);
String sampleHelp = resourceVersionDir
+ "/com/mysql/management/MySQL_Help.txt";
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2006-03-17 15:20:36 UTC (rev 20)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResource.java 2006-03-17 16:10:03 UTC (rev 21)
@@ -186,7 +186,7 @@
private void setReadyForConnection(boolean ready) {
readyForConnections = ready;
}
-
+
public synchronized boolean isReadyForConnections() {
return readyForConnections;
}
@@ -371,10 +371,11 @@
/* called from constructor, over-ride with care */
final void setOsAndArch(String osName, String osArch) {
+ String name = osName;
if (osName.indexOf("Win") != -1) {
- osName = "Win";
+ name = "Win";
}
- this.osName = stripUnwantedChars(osName);
+ this.osName = stripUnwantedChars(name);
this.osArch = stripUnwantedChars(osArch);
}
Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java 2006-03-17 15:20:36 UTC (rev 20)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java 2006-03-17 16:10:03 UTC (rev 21)
@@ -26,7 +26,7 @@
public interface MysqldResourceI {
public static final String PORT = "port";
- public static final String DEFAULT_VERSION = "5.0.18";
+ public static final String DEFAULT_VERSION = "5.0.19";
public static final String PID_FILE = "pid-file";
| Thread |
|---|
| • Connector/MXJ commit: r21 - in trunk/connector-mxj: . commercial/5-0-19 commercial/5-0-19/com/mysql/management resources/5-0-19 src src/com/mysql/mana... | eherman | 17 Mar |
