List:Commits« Previous MessageNext Message »
From:eherman Date:August 6 2007 2:41pm
Subject:Connector/MXJ commit: r104 - in trunk/connector-mxj: . commercial commercial/5-0-46 commercial/5-0-46/Linux-i386 commercial/5-0-46/Mac_OS_X-i386 comme...
View as plain text  
Added:
   trunk/connector-mxj/commercial/5-0-46/
   trunk/connector-mxj/commercial/5-0-46/Linux-i386/
   trunk/connector-mxj/commercial/5-0-46/Linux-i386/mysqld
   trunk/connector-mxj/commercial/5-0-46/Linux-i386/version.txt
   trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/
   trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/mysqld
   trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/version.txt
   trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/
   trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/mysqld
   trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/version.txt
   trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/
   trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/mysqld
   trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/version.txt
   trunk/connector-mxj/commercial/5-0-46/SunOS-x86/
   trunk/connector-mxj/commercial/5-0-46/SunOS-x86/mysqld
   trunk/connector-mxj/commercial/5-0-46/SunOS-x86/version.txt
   trunk/connector-mxj/commercial/5-0-46/Win-x86/
   trunk/connector-mxj/commercial/5-0-46/Win-x86/mysqld-nt.exe
   trunk/connector-mxj/commercial/5-0-46/Win-x86/version.txt
   trunk/connector-mxj/commercial/5-0-46/com/
   trunk/connector-mxj/commercial/5-0-46/com/mysql/
   trunk/connector-mxj/commercial/5-0-46/com/mysql/management/
   trunk/connector-mxj/commercial/5-0-46/com/mysql/management/MySQL_Help.txt
   trunk/connector-mxj/commercial/5-0-46/data_dir.jar
   trunk/connector-mxj/commercial/5-0-46/share_dir.jar
   trunk/connector-mxj/commercial/5-0-46/win_share_dir.jar
   trunk/connector-mxj/resources/5-0-45/
   trunk/connector-mxj/resources/5-0-45/Linux-i386/
   trunk/connector-mxj/resources/5-0-45/Linux-i386/mysqld
   trunk/connector-mxj/resources/5-0-45/Linux-i386/version.txt
   trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/
   trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/mysqld
   trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/version.txt
   trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/
   trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/mysqld
   trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/version.txt
   trunk/connector-mxj/resources/5-0-45/SunOS-sparc/
   trunk/connector-mxj/resources/5-0-45/SunOS-sparc/mysqld
   trunk/connector-mxj/resources/5-0-45/SunOS-sparc/version.txt
   trunk/connector-mxj/resources/5-0-45/Win-x86/
   trunk/connector-mxj/resources/5-0-45/Win-x86/mysqld-nt.exe
   trunk/connector-mxj/resources/5-0-45/Win-x86/version.txt
   trunk/connector-mxj/resources/5-0-45/com/
   trunk/connector-mxj/resources/5-0-45/com/mysql/
   trunk/connector-mxj/resources/5-0-45/com/mysql/management/
   trunk/connector-mxj/resources/5-0-45/com/mysql/management/MySQL_Help.txt
   trunk/connector-mxj/resources/5-0-45/data_dir.jar
   trunk/connector-mxj/resources/5-0-45/share_dir.jar
   trunk/connector-mxj/resources/5-0-45/win_share_dir.jar
Removed:
   trunk/connector-mxj/commercial/5-0-42/
   trunk/connector-mxj/resources/5-0-41/
Modified:
   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/lib/aspectjrt.jar
   trunk/connector-mxj/lib/aspectjtools.jar
   trunk/connector-mxj/misc/LICENSE.commercial.txt
   trunk/connector-mxj/resources/connector-mxj.properties
   trunk/connector-mxj/resources/platform-map.properties
Log:
2007-08-06 - swapped out gpl binaries for v5.0.45
           - swapped out commercial binaries for v5.0.46
           - lib/aspectj*.jar for version 1.5.3 jars
           - update the Connector/MXJ version to 5-0-8-beta


Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/CHANGES	2007-08-06 14:32:23 UTC (rev 104)
@@ -1,6 +1,11 @@
 # Changelog
 # $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
 
+2007-08-06 - swapped out gpl binaries for v5.0.45
+           - swapped out commercial binaries for v5.0.46
+	   - lib/aspectj*.jar for version 1.5.3 jars
+	   - update the Connector/MXJ version to 5-0-8-beta
+
 2007-07-09 - Changed embedded doc files to point to published docs at:
              http://dev.mysql.com/doc/refman/5.0/en/connector-mxj.html
 	     

Modified: trunk/connector-mxj/_dev_notes.txt
===================================================================
--- trunk/connector-mxj/_dev_notes.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/_dev_notes.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -68,19 +68,20 @@
 ssh mysqldev@stripped
 cd /tmp/eric
 rm *
-export MXJ_MYSQL_VERSION=5.0.41
+export MXJ_MYSQL_VERSION=5.0.45
 scp build.mysql.com:/build/stage/community/MySQL-5.0/mysql-noinstall-$MXJ_MYSQL_VERSION-win32.zip .
 scp build.mysql.com:/build/stage/community/MySQL-5.0/mysql-$MXJ_MYSQL_VERSION-linux-i686.tar.gz .
 scp build.mysql.com:/build/stage/community/MySQL-5.0/mysql-$MXJ_MYSQL_VERSION-osx10.3-powerpc.tar.gz .
 scp build.mysql.com:/build/stage/community/MySQL-5.0/mysql-$MXJ_MYSQL_VERSION-osx10.4-i686.tar.gz .
 scp build.mysql.com:/build/stage/community/MySQL-5.0/mysql-$MXJ_MYSQL_VERSION-solaris8-sparc.tar.gz .
 
-export MXJ_MYSQL_VERSION=5.0.42
+export MXJ_MYSQL_VERSION=5.0.46
 scp build.mysql.com:/build/stage/commercial/5.0/mysql-enterprise-noinstall-$MXJ_MYSQL_VERSION-win32.zip .
 scp build.mysql.com:/build/stage/commercial/5.0/mysql-enterprise-$MXJ_MYSQL_VERSION-linux-i686.tar.gz .
 scp build.mysql.com:/build/stage/commercial/5.0/mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.3-powerpc.tar.gz .
 scp build.mysql.com:/build/stage/commercial/5.0/mysql-enterprise-$MXJ_MYSQL_VERSION-osx10.4-i686.tar.gz .
 scp build.mysql.com:/build/stage/commercial/5.0/mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-sparc.tar.gz .
+scp build.mysql.com:/build/stage/commercial/5.0/mysql-enterprise-$MXJ_MYSQL_VERSION-solaris8-i386.tar.gz .
 exit
 
 scp mysqldev@stripped:/tmp/eric/* .
@@ -91,7 +92,7 @@
 In the "commercial" directory create a subdirectory named "5-0-XY"
 Create subdirectories under each of these top level directories for the 
  platforms: 
- mkdir Linux-i386; mkdir SunOS-sparc; mkdir Mac_OS_X-ppc;mkdir Win-x86; mkdir Mac_OS_X-i386
+ mkdir Linux-i386; mkdir SunOS-sparc; mkdir Mac_OS_X-ppc;mkdir Win-x86; mkdir Mac_OS_X-i386; mkdir SunOS-x86
 
 
 from each, extract the "/bin/mysqld" (for win32: /bin/mysqld-nt.exe")
@@ -105,8 +106,8 @@
  for file in $(ls *.gz); do tar xvfz $file; done;
 
 
-export MXJ_MYSQL_VERSION=5.0.41
-export MXJ_MYSQL_DIR=5-0-41
+export MXJ_MYSQL_VERSION=5.0.45
+export MXJ_MYSQL_DIR=5-0-45
 # 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/ &&
@@ -121,8 +122,8 @@
 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
+export MXJ_MYSQL_VERSION=5.0.46
+export MXJ_MYSQL_DIR=5-0-46
 # 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/ &&
@@ -135,6 +136,8 @@
 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 &&
 echo YAY || echo DARN
 
 export MXJ_MYSQL_VERSION=5.1.15-beta

Modified: trunk/connector-mxj/build.xml
===================================================================
--- trunk/connector-mxj/build.xml	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/build.xml	2007-08-06 14:32:23 UTC (rev 104)
@@ -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-pre8-beta" />
-	<property name="gpl-mysqld-version" value="5-0-41" />
+	<property name="mxj-version" value="5-0-8-beta" />
+	<property name="gpl-mysqld-version" value="5-0-45" />
 	<!-- property name="gpl-mysqld-version" value="5-1-18" / -->
-	<property name="commercial-mysqld-version" value="5-0-42" />
+	<property name="commercial-mysqld-version" value="5-0-46" />
 
 	<property name="src" location="src" />
 	<property name="misc" location="misc" />

Added: trunk/connector-mxj/commercial/5-0-46/Linux-i386/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/Linux-i386/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/commercial/5-0-46/Linux-i386/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-46/Linux-i386/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/5-0-46/Linux-i386/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.46-linux-i686/bin/mysqld


Property changes on: trunk/connector-mxj/commercial/5-0-46/Linux-i386/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.46-osx10.4-i686/bin/mysqld


Property changes on: trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-i386/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.46-osx10.3-powerpc/bin/mysqld


Property changes on: trunk/connector-mxj/commercial/5-0-46/Mac_OS_X-ppc/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.46-solaris8-sparc/bin/mysqld


Property changes on: trunk/connector-mxj/commercial/5-0-46/SunOS-sparc/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/commercial/5-0-46/SunOS-x86/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/SunOS-x86/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/commercial/5-0-46/SunOS-x86/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-46/SunOS-x86/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/5-0-46/SunOS-x86/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.46-solaris8-i386/bin/mysqld


Property changes on: trunk/connector-mxj/commercial/5-0-46/SunOS-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/commercial/5-0-46/Win-x86/mysqld-nt.exe
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/Win-x86/mysqld-nt.exe
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/commercial/5-0-46/Win-x86/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-46/Win-x86/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/5-0-46/Win-x86/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-enterprise-5.0.46-win32/bin/mysqld-nt.exe


Property changes on: trunk/connector-mxj/commercial/5-0-46/Win-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/commercial/5-0-46/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-46/com/mysql/management/MySQL_Help.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/5-0-46/com/mysql/management/MySQL_Help.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1,183 @@
+./bin/mysql  Ver 14.12 Distrib 5.0.46, 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


Property changes on: trunk/connector-mxj/commercial/5-0-46/com/mysql/management/MySQL_Help.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/commercial/5-0-46/data_dir.jar
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/data_dir.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/commercial/5-0-46/share_dir.jar
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/share_dir.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/commercial/5-0-46/win_share_dir.jar
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/commercial/5-0-46/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-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/connector-mxj.properties	2007-08-06 14:32:23 UTC (rev 104)
@@ -1,5 +1,5 @@
 # Connector/MXJ properties
 
 # default version of mysqld to deploy
-mysql-version=5.0.42
+mysql-version=5.0.46
 

Modified: trunk/connector-mxj/commercial/platform-map.properties
===================================================================
--- trunk/connector-mxj/commercial/platform-map.properties	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/commercial/platform-map.properties	2007-08-06 14:32:23 UTC (rev 104)
@@ -19,8 +19,8 @@
 
 SunOS-sparc=SunOS-sparc
 Solaris-sparc=SunOS-sparc
-#SunOS-x86=
-#Solaris-x86=
+SunOS-x86=SunOS-x86
+Solaris-x86=SunOS-x86
 
 FreeBSD-x86=FreeBSD-x86
 

Modified: trunk/connector-mxj/lib/aspectjrt.jar
===================================================================
(Binary files differ)

Modified: trunk/connector-mxj/lib/aspectjtools.jar
===================================================================
(Binary files differ)

Modified: trunk/connector-mxj/misc/LICENSE.commercial.txt
===================================================================
--- trunk/connector-mxj/misc/LICENSE.commercial.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/misc/LICENSE.commercial.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -2,4 +2,4 @@
 
   This software product is not publicly available software.  This software
   product is MySQL commercial software and use of this software is governed by
-  your applicable license agreement with MySQL.
\ No newline at end of file
+  your applicable license agreement with MySQL.

Added: trunk/connector-mxj/resources/5-0-45/Linux-i386/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/resources/5-0-45/Linux-i386/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/resources/5-0-45/Linux-i386/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-45/Linux-i386/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/resources/5-0-45/Linux-i386/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-5.0.45-linux-i686/bin/mysqld


Property changes on: trunk/connector-mxj/resources/5-0-45/Linux-i386/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-5.0.45-osx10.4-i686/bin/mysqld


Property changes on: trunk/connector-mxj/resources/5-0-45/Mac_OS_X-i386/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-5.0.45-osx10.3-powerpc/bin/mysqld


Property changes on: trunk/connector-mxj/resources/5-0-45/Mac_OS_X-ppc/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/resources/5-0-45/SunOS-sparc/mysqld
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/resources/5-0-45/SunOS-sparc/mysqld
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/resources/5-0-45/SunOS-sparc/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-45/SunOS-sparc/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/resources/5-0-45/SunOS-sparc/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-5.0.45-solaris8-sparc/bin/mysqld


Property changes on: trunk/connector-mxj/resources/5-0-45/SunOS-sparc/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/resources/5-0-45/Win-x86/mysqld-nt.exe
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/resources/5-0-45/Win-x86/mysqld-nt.exe
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/resources/5-0-45/Win-x86/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-45/Win-x86/version.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/resources/5-0-45/Win-x86/version.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1 @@
+mysql-5.0.45-win32/bin/mysqld-nt.exe


Property changes on: trunk/connector-mxj/resources/5-0-45/Win-x86/version.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/resources/5-0-45/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-45/com/mysql/management/MySQL_Help.txt	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/resources/5-0-45/com/mysql/management/MySQL_Help.txt	2007-08-06 14:32:23 UTC (rev 104)
@@ -0,0 +1,183 @@
+./bin/mysql  Ver 14.12 Distrib 5.0.45, 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


Property changes on: trunk/connector-mxj/resources/5-0-45/com/mysql/management/MySQL_Help.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: trunk/connector-mxj/resources/5-0-45/data_dir.jar
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/resources/5-0-45/data_dir.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/resources/5-0-45/share_dir.jar
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/resources/5-0-45/share_dir.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/connector-mxj/resources/5-0-45/win_share_dir.jar
===================================================================
(Binary files differ)


Property changes on: trunk/connector-mxj/resources/5-0-45/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-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/resources/connector-mxj.properties	2007-08-06 14:32:23 UTC (rev 104)
@@ -1,6 +1,6 @@
 # Connector/MXJ properties
 
 # default version of mysqld to deploy
-mysql-version=5.0.41
-# mysql-version=5.1.18
+mysql-version=5.0.45
+# mysql-version=5.1.20
 

Modified: trunk/connector-mxj/resources/platform-map.properties
===================================================================
--- trunk/connector-mxj/resources/platform-map.properties	2007-07-09 07:52:26 UTC (rev 103)
+++ trunk/connector-mxj/resources/platform-map.properties	2007-08-06 14:32:23 UTC (rev 104)
@@ -19,8 +19,8 @@
 
 SunOS-sparc=SunOS-sparc
 Solaris-sparc=SunOS-sparc
-#SunOS-x86=
-#Solaris-x86=
+SunOS-x86=SunOS-x86
+Solaris-x86=SunOS-x86
 
 FreeBSD-x86=FreeBSD-x86
 

Thread
Connector/MXJ commit: r104 - in trunk/connector-mxj: . commercial commercial/5-0-46 commercial/5-0-46/Linux-i386 commercial/5-0-46/Mac_OS_X-i386 comme...eherman6 Aug