List:Commits« Previous MessageNext Message »
From:eherman Date:December 25 2005 10:27pm
Subject:Connector/MXJ commit: r10 - in trunk/connector-mxj: . commercial commercial/5-0-17 commercial/5-0-17/Linux-i386 commercial/5-0-17/Mac OS X-ppc commerc...
View as plain text  
Added:
   trunk/connector-mxj/commercial/5-0-17/
   trunk/connector-mxj/commercial/5-0-17/Linux-i386/
   trunk/connector-mxj/commercial/5-0-17/Linux-i386/mysqld
   trunk/connector-mxj/commercial/5-0-17/Linux-i386/version.txt
   trunk/connector-mxj/commercial/5-0-17/Mac OS X-ppc/
   trunk/connector-mxj/commercial/5-0-17/Mac OS X-ppc/mysqld
   trunk/connector-mxj/commercial/5-0-17/Mac OS X-ppc/version.txt
   trunk/connector-mxj/commercial/5-0-17/SunOS-sparc/
   trunk/connector-mxj/commercial/5-0-17/SunOS-sparc/mysqld
   trunk/connector-mxj/commercial/5-0-17/SunOS-sparc/version.txt
   trunk/connector-mxj/commercial/5-0-17/Win-x86/
   trunk/connector-mxj/commercial/5-0-17/Win-x86/mysqld-nt.exe
   trunk/connector-mxj/commercial/5-0-17/Win-x86/version.txt
   trunk/connector-mxj/commercial/5-0-17/com/
   trunk/connector-mxj/commercial/5-0-17/com/mysql/
   trunk/connector-mxj/commercial/5-0-17/com/mysql/management/
   trunk/connector-mxj/commercial/5-0-17/com/mysql/management/MySQL_Help.txt
   trunk/connector-mxj/commercial/5-0-17/data_dir.jar
   trunk/connector-mxj/commercial/5-0-17/share_dir.jar
   trunk/connector-mxj/commercial/5-0-17/win_share_dir.jar
   trunk/connector-mxj/resources/5-0-17/
   trunk/connector-mxj/resources/5-0-17/Linux-i386/
   trunk/connector-mxj/resources/5-0-17/Linux-i386/mysqld
   trunk/connector-mxj/resources/5-0-17/Linux-i386/version.txt
   trunk/connector-mxj/resources/5-0-17/Mac OS X-ppc/
   trunk/connector-mxj/resources/5-0-17/Mac OS X-ppc/mysqld
   trunk/connector-mxj/resources/5-0-17/Mac OS X-ppc/version.txt
   trunk/connector-mxj/resources/5-0-17/SunOS-sparc/
   trunk/connector-mxj/resources/5-0-17/SunOS-sparc/mysqld
   trunk/connector-mxj/resources/5-0-17/SunOS-sparc/version.txt
   trunk/connector-mxj/resources/5-0-17/Win-x86/
   trunk/connector-mxj/resources/5-0-17/Win-x86/mysqld-nt.exe
   trunk/connector-mxj/resources/5-0-17/Win-x86/version.txt
   trunk/connector-mxj/resources/5-0-17/com/
   trunk/connector-mxj/resources/5-0-17/com/mysql/
   trunk/connector-mxj/resources/5-0-17/com/mysql/management/
   trunk/connector-mxj/resources/5-0-17/com/mysql/management/MySQL_Help.txt
   trunk/connector-mxj/resources/5-0-17/data_dir.jar
   trunk/connector-mxj/resources/5-0-17/share_dir.jar
   trunk/connector-mxj/resources/5-0-17/win_share_dir.jar
Removed:
   trunk/connector-mxj/src/com/mysql/management/util/AcceptanceTest.java
Modified:
   trunk/connector-mxj/_dev_notes.txt
   trunk/connector-mxj/src/com/mysql/management/AcceptanceTest.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
   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/jmx/AcceptanceTest.java
   trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBean.java
   trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java
   trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBean.java
   trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java
   trunk/connector-mxj/src/com/mysql/management/util/AllTestsSuite.java
   trunk/connector-mxj/src/com/mysql/management/util/Files.java
   trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java
   trunk/connector-mxj/src/com/mysql/management/util/PlatformTest.java
   trunk/connector-mxj/src/com/mysql/management/util/ProcessUtil.java
   trunk/connector-mxj/src/com/mysql/management/util/ProcessUtilTest.java
   trunk/connector-mxj/src/com/mysql/management/util/ShellTest.java
Log:
added 5.0.17 binaries, improved tests

Modified: trunk/connector-mxj/_dev_notes.txt
===================================================================
--- trunk/connector-mxj/_dev_notes.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/_dev_notes.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -61,7 +61,7 @@
 (look in previous version for a hint)
 
 from each, extract the "/bin/mysqld" (for win32: /bin/mysqld-nt.exe")
-place the mysqld files in each of the platform directories, and update the 
+place the mysqld files in each of the platform directories
 create a "version.txt" to describe the binary.
 
 
@@ -79,9 +79,10 @@
 
 Create the "win_share_dir.jar" (eliminate the "mysql" sub-dir)
 cd share
-cd mysql mv * ..
+cd mysql 
+mv * ..
 cd ..
-rd mysql
+rmdir mysql
 cd ..
 jar cvf $WORKSPACE/resources/5-0-XY/win_share_dir.jar share
 

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


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

Added: trunk/connector-mxj/commercial/5-0-17/Linux-i386/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-17/Linux-i386/version.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/commercial/5-0-17/Linux-i386/version.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1 @@
+mysql-pro-5.0.17-linux-i686/bin/mysqld

Added: trunk/connector-mxj/commercial/5-0-17/Mac OS X-ppc/mysqld
===================================================================
(Binary files differ)


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

Added: trunk/connector-mxj/commercial/5-0-17/Mac OS X-ppc/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-17/Mac OS X-ppc/version.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/commercial/5-0-17/Mac OS X-ppc/version.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1 @@
+mysql-pro-5.0.17-osx10.3-powerpc/bin/mysqld

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


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

Added: trunk/connector-mxj/commercial/5-0-17/SunOS-sparc/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-17/SunOS-sparc/version.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/commercial/5-0-17/SunOS-sparc/version.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1 @@
+mysql-pro-5.0.17-solaris9-sparc/bin/mysqld

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


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

Added: trunk/connector-mxj/commercial/5-0-17/Win-x86/version.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-17/Win-x86/version.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/commercial/5-0-17/Win-x86/version.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1 @@
+mysql-pro-5.0.17-win32/bin/mysqld-nt.exe

Added: trunk/connector-mxj/commercial/5-0-17/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/commercial/5-0-17/com/mysql/management/MySQL_Help.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/commercial/5-0-17/com/mysql/management/MySQL_Help.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1,984 @@
+bin/mysqld  Ver 5.0.17-pro for apple-darwin7.9.0 on powerpc (MySQL Pro (Commercial))
+Copyright (C) 2000 MySQL AB, by Monty and others
+This software comes with ABSOLUTELY NO WARRANTY. This is commercial software,
+please see the file MySQLEULA.txt for details
+
+Starts the MySQL database server
+
+Usage: bin/mysqld [OPTIONS]
+
+Default options are read from the following files in the given order:
+/etc/my.cnf ~/.my.cnf 
+The following groups are read: mysqld server mysqld-5.0
+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
+
+  -?, --help          Display this help and exit.
+  --abort-slave-event-count=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  -a, --ansi          Use ANSI SQL syntax instead of MySQL syntax. This mode
+                      will also set transaction isolation level 'serializable'.
+  --allow-suspicious-udfs 
+                      Allows use of UDFs consisting of only one symbol xxx()
+                      without corresponding xxx_init() or xxx_deinit(). That
+                      also means that one can load any function from any
+                      library, for example exit() from libc.so
+  --auto-increment-increment[=#] 
+                      Auto-increment columns are incremented by this
+  --auto-increment-offset[=#] 
+                      Offset added to Auto-increment columns. Used when
+                      auto-increment-increment != 1
+  --automatic-sp-privileges 
+                      Creating and dropping stored procedures alters ACLs.
+                      Disable with --skip-automatic-sp-privileges.
+  -b, --basedir=name  Path to installation directory. All paths are usually
+                      resolved relative to this.
+  --bdb               Enable Berkeley DB (if this version of MySQL supports
+                      it). Disable with --skip-bdb (will save memory).
+  --big-tables        Allow big result sets by saving all temporary sets on
+                      file (Solves most 'table full' errors).
+  --bind-address=name IP address to bind to.
+  --binlog-do-db=name Tells the master it should log updates for the specified
+                      database, and exclude all others not explicitly
+                      mentioned.
+  --binlog-ignore-db=name 
+                      Tells the master that updates to the given database
+                      should not be logged tothe binary log.
+  --bootstrap         Used by mysql installation scripts.
+  --character-set-client-handshake 
+                      Don't use client side character set value sent during
+                      handshake.
+  -C, --character-set-server=name 
+                      Set the default character set.
+  --character-sets-dir=name 
+                      Directory where character sets are.
+  -r, --chroot=name   Chroot mysqld daemon during startup.
+  --collation-server=name 
+                      Set the default collation.
+  --completion-type=# Default completion type.
+  --concurrent-insert[=#] 
+                      Use concurrent insert with MyISAM. Disable with
+                      --concurrent-insert=0
+  --console           Write error output on screen; Don't remove the console
+                      window on windows.
+  --core-file         Write core on errors.
+  -h, --datadir=name  Path to the database root.
+  -C, --default-character-set=name 
+                      Set the default character set (deprecated option, use
+                      --character-set-server instead).
+  --default-collation=name 
+                      Set the default collation (deprecated option, use
+                      --collation-server instead).
+  --default-storage-engine=name 
+                      Set the default storage engine (table type) for tables.
+  --default-table-type=name 
+                      (deprecated) Use --default-storage-engine.
+  --default-time-zone=name 
+                      Set the default time zone.
+  --delay-key-write[=name] 
+                      Type of DELAY_KEY_WRITE.
+  --delay-key-write-for-all-tables 
+                      Don't flush key buffers between writes for any MyISAM
+                      table (Deprecated option, use --delay-key-write=all
+                      instead).
+  --disconnect-slave-event-count=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --enable-locking    Deprecated option, use --external-locking instead.
+  --enable-pstack     Print a symbolic stack trace on failure.
+  --engine-condition-pushdown 
+                      Push supported query conditions to the storage engine.
+  -T, --exit-info[=#] Used for debugging;  Use at your own risk!
+  --external-locking  Use system (external) locking.  With this option enabled
+                      you can run myisamchk to test (not repair) tables while
+                      the MySQL server is running.
+  --flush             Flush tables to disk between SQL commands.
+  --gdb               Set up signals usable for debugging
+  --init-connect=name Command(s) that are executed for each new connection
+  --init-file=name    Read SQL commands from this file at startup.
+  --init-rpl-role=name 
+                      Set the replication role.
+  --init-slave=name   Command(s) that are executed when a slave connects to
+                      this master
+  --innodb            Enable InnoDB (if this version of MySQL supports it).
+                      Disable with --skip-innodb (will save memory).
+  --innodb_checksums  Enable InnoDB checksums validation (enabled by default).
+                      Disable with --skip-innodb-checksums.
+  --innodb_data_file_path=name 
+                      Path to individual files and their sizes.
+  --innodb_data_home_dir=name 
+                      The common part for InnoDB table spaces.
+  --innodb_doublewrite 
+                      Enable InnoDB doublewrite buffer (enabled by default).
+                      Disable with --skip-innodb-doublewrite.
+  --innodb_fast_shutdown[=#] 
+                      Speeds up the shutdown process of the InnoDB storage
+                      engine. Possible values are 0, 1 (faster) or 2 (fastest -
+                      crash-like).
+  --innodb_file_per_table 
+                      Stores each InnoDB table to an .ibd file in the database
+                      dir.
+  --innodb_flush_log_at_trx_commit[=#] 
+                      Set to 0 (write and flush once per second), 1 (write and
+                      flush at each commit) or 2 (write at commit, flush once
+                      per second).
+  --innodb_flush_method=name 
+                      With which method to flush data.
+  --innodb_locks_unsafe_for_binlog 
+                      Force InnoDB not to use next-key locking. Instead use
+                      only row-level locking
+  --innodb_log_arch_dir=name 
+                      Where full logs should be archived.
+  --innodb_log_archive[=#] 
+                      Set to 1 if you want to have logs archived.
+  --innodb_log_group_home_dir=name 
+                      Path to InnoDB log files.
+  --innodb_max_dirty_pages_pct=# 
+                      Percentage of dirty pages allowed in bufferpool.
+  --innodb_max_purge_lag=# 
+                      Desired maximum length of the purge queue (0 = no limit)
+  --innodb_status_file 
+                      Enable SHOW INNODB STATUS output in the
+                      innodb_status.<pid> file
+  --innodb_table_locks 
+                      Enable InnoDB locking in LOCK TABLES
+  --innodb_support_xa Enable InnoDB support for the XA two-phase commit
+  --isam              Obsolete. ISAM storage engine is no longer supported.
+  -L, --language=name Client error messages in given language. May be given as
+                      a full path.
+  --local-infile      Enable/disable LOAD DATA LOCAL INFILE (takes values 1|0).
+  -l, --log[=name]    Log connections and queries to file.
+  --log-bin[=name]    Log update queries in binary format. Optional (but
+                      strongly recommended to avoid replication problems if
+                      server's hostname changes) argument should be the chosen
+                      location for the binary log files.
+  --log-bin-index=name 
+                      File that holds the names for last binary log files.
+  --log-bin-trust-routine-creators 
+                      (deprecated) Use log-bin-trust-function-creators.
+  --log-bin-trust-function-creators 
+                      If equal to 0 (the default), then when --log-bin is used,
+                      creation of a function is allowed only to users having
+                      the SUPER privilege and only if this function may not
+                      break binary logging.
+  --log-error[=name]  Error log file.
+  --log-isam[=name]   Log all MyISAM changes to file.
+  -0, --log-long-format 
+                      Log some extra information to update log. Please note
+                      that this option is deprecated; see --log-short-format
+                      option.
+  --log-queries-not-using-indexes 
+                      Log queries that are executed without benefit of any
+                      index to the slow log if it is open.
+  --log-short-format  Don't log extra information to update and slow-query
+                      logs.
+  --log-slave-updates Tells the slave to log the updates from the slave thread
+                      to the binary log. You will need to turn it on if you
+                      plan to daisy-chain the slaves.
+  --log-slow-admin-statements 
+                      Log slow OPTIMIZE, ANALYZE, ALTER and other
+                      administrative statements to the slow log if it is open.
+  --log-slow-queries[=name] 
+                      Log slow queries to this log file. Defaults logging to
+                      hostname-slow.log file. Must be enabled to activate other
+                      slow log options.
+  --log-tc=name       Path to transaction coordinator log (used for
+                      transactions that affect more than one storage engine,
+                      when binary log is disabled)
+  --log-tc-size=#     Size of transaction coordinator log.
+  --log-update[=name] The update log is deprecated since version 5.0, is
+                      replaced by the binary log and this option justs turns on
+                      --log-bin instead.
+  -W, --log-warnings[=#] 
+                      Log some not critical warnings to the log file.
+  --low-priority-updates 
+                      INSERT/DELETE/UPDATE has lower priority than selects.
+  --master-connect-retry=# 
+                      The number of seconds the slave thread will sleep before
+                      retrying to connect to the master in case the master goes
+                      down or the connection is lost.
+  --master-host=name  Master hostname or IP address for replication. If not
+                      set, the slave thread will not be started. Note that the
+                      setting of master-host will be ignored if there exists a
+                      valid master.info file.
+  --master-info-file=name 
+                      The location and name of the file that remembers the
+                      master and where the I/O replication thread is in the
+                      master's binlogs.
+  --master-password=name 
+                      The password the slave thread will authenticate with when
+                      connecting to the master. If not set, an empty password
+                      is assumed.The value in master.info will take precedence
+                      if it can be read.
+  --master-port=#     The port the master is listening on. If not set, the
+                      compiled setting of MYSQL_PORT is assumed. If you have
+                      not tinkered with configure options, this should be 3306.
+                      The value in master.info will take precedence if it can
+                      be read.
+  --master-retry-count=# 
+                      The number of tries the slave will make to connect to the
+                      master before giving up.
+  --master-ssl        Enable the slave to connect to the master using SSL.
+  --master-ssl-ca[=name] 
+                      Master SSL CA file. Only applies if you have enabled
+                      master-ssl.
+  --master-ssl-capath[=name] 
+                      Master SSL CA path. Only applies if you have enabled
+                      master-ssl.
+  --master-ssl-cert[=name] 
+                      Master SSL certificate file name. Only applies if you
+                      have enabled master-ssl
+  --master-ssl-cipher[=name] 
+                      Master SSL cipher. Only applies if you have enabled
+                      master-ssl.
+  --master-ssl-key[=name] 
+                      Master SSL keyfile name. Only applies if you have enabled
+                      master-ssl.
+  --master-user=name  The username the slave thread will use for authentication
+                      when connecting to the master. The user must have FILE
+                      privilege. If the master user is not set, user test is
+                      assumed. The value in master.info will take precedence if
+                      it can be read.
+  --max-binlog-dump-events=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --memlock           Lock mysqld in memory.
+  --myisam-recover[=name] 
+                      Syntax: myisam-recover[=option[,option...]], where option
+                      can be DEFAULT, BACKUP, FORCE or QUICK.
+  --ndbcluster        Enable NDB Cluster (if this version of MySQL supports
+                      it). Disable with --skip-ndbcluster (will save memory).
+  -n, --new           Use very new possible 'unsafe' functions.
+  --old-passwords     Use old password encryption method (needed for 4.0 and
+                      older clients).
+  --old-style-user-limits 
+                      Enable old-style user limits (before 5.0.3 user resources
+                      were counted per each user+host vs. per account)
+  --pid-file=name     Pid file used by safe_mysqld.
+  -P, --port=#        Port number to use for connection.
+  --relay-log=name    The location and name to use for relay logs.
+  --relay-log-index=name 
+                      The location and name to use for the file that keeps a
+                      list of the last relay logs.
+  --relay-log-info-file=name 
+                      The location and name of the file that remembers where
+                      the SQL replication thread is in the relay logs.
+  --replicate-do-db=name 
+                      Tells the slave thread to restrict replication to the
+                      specified database. To specify more than one database,
+                      use the directive multiple times, once for each database.
+                      Note that this will only work if you do not use
+                      cross-database queries such as UPDATE some_db.some_table
+                      SET foo='bar' while having selected a different or no
+                      database. If you need cross database updates to work,
+                      make sure you have 3.23.28 or later, and use
+                      replicate-wild-do-table=db_name.%.
+  --replicate-do-table=name 
+                      Tells the slave thread to restrict replication to the
+                      specified table. To specify more than one table, use the
+                      directive multiple times, once for each table. This will
+                      work for cross-database updates, in contrast to
+                      replicate-do-db.
+  --replicate-ignore-db=name 
+                      Tells the slave thread to not replicate to the specified
+                      database. To specify more than one database to ignore,
+                      use the directive multiple times, once for each database.
+                      This option will not work if you use cross database
+                      updates. If you need cross database updates to work, make
+                      sure you have 3.23.28 or later, and use
+                      replicate-wild-ignore-table=db_name.%. 
+  --replicate-ignore-table=name 
+                      Tells the slave thread to not replicate to the specified
+                      table. To specify more than one table to ignore, use the
+                      directive multiple times, once for each table. This will
+                      work for cross-datbase updates, in contrast to
+                      replicate-ignore-db.
+  --replicate-rewrite-db=name 
+                      Updates to a database with a different name than the
+                      original. Example:
+                      replicate-rewrite-db=master_db_name->slave_db_name.
+  --replicate-wild-do-table=name 
+                      Tells the slave thread to restrict replication to the
+                      tables that match the specified wildcard pattern. To
+                      specify more than one table, use the directive multiple
+                      times, once for each table. This will work for
+                      cross-database updates. Example:
+                      replicate-wild-do-table=foo%.bar% will replicate only
+                      updates to tables in all databases that start with foo
+                      and whose table names start with bar.
+  --replicate-wild-ignore-table=name 
+                      Tells the slave thread to not replicate to the tables
+                      that match the given wildcard pattern. To specify more
+                      than one table to ignore, use the directive multiple
+                      times, once for each table. This will work for
+                      cross-database updates. Example:
+                      replicate-wild-ignore-table=foo%.bar% will not do updates
+                      to tables in databases that start with foo and whose
+                      table names start with bar.
+  --replicate-same-server-id 
+                      In replication, if set to 1, do not skip events having
+                      our server id. Default value is 0 (to break infinite
+                      loops in circular replication). Can't be set to 1 if
+                      --log-slave-updates is used.
+  --report-host=name  Hostname or IP of the slave to be reported to to the
+                      master during slave registration. Will appear in the
+                      output of SHOW SLAVE HOSTS. Leave unset if you do not
+                      want the slave to register itself with the master. Note
+                      that it is not sufficient for the master to simply read
+                      the IP of the slave off the socket once the slave
+                      connects. Due to NAT and other routing issues, that IP
+                      may not be valid for connecting to the slave from the
+                      master or other hosts.
+  --report-password=name 
+                      Undocumented.
+  --report-port=#     Port for connecting to slave reported to the master
+                      during slave registration. Set it only if the slave is
+                      listening on a non-default port or if you have a special
+                      tunnel from the master or other clients to the slave. If
+                      not sure, leave this option unset.
+  --report-user=name  Undocumented.
+  --rpl-recovery-rank=# 
+                      Undocumented.
+  --safe-mode         Skip some optimize stages (for testing).
+  --safe-show-database 
+                      Deprecated option; use GRANT SHOW DATABASES instead...
+  --safe-user-create  Don't allow new user creation by the user who has no
+                      write privileges to the mysql.user table.
+  --safemalloc-mem-limit=# 
+                      Simulate memory shortage when compiled with the
+                      --with-debug=full option.
+  --secure-auth       Disallow authentication for accounts that have old
+                      (pre-4.1) passwords.
+  --server-id=#       Uniquely identifies the server instance in the community
+                      of replication partners.
+  -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.
+  --show-slave-auth-info 
+                      Show user and password in SHOW SLAVE HOSTS on this master
+  --skip-grant-tables Start without grant tables. This gives all users FULL
+                      ACCESS to all tables!
+  --skip-host-cache   Don't cache host names.
+  --skip-locking      Deprecated option, use --skip-external-locking instead.
+  --skip-name-resolve Don't resolve hostnames. All hostnames are IP's or
+                      'localhost'.
+  --skip-networking   Don't allow connection with TCP/IP.
+  --skip-new          Don't use new, possible wrong routines.
+  --skip-show-database 
+                      Don't allow 'SHOW DATABASE' commands.
+  --skip-slave-start  If set, slave is not autostarted.
+  --skip-stack-trace  Don't print a stack trace on failure.
+  --skip-symlink      Don't allow symlinking of tables. Deprecated option.  Use
+                      --skip-symbolic-links instead.
+  --skip-thread-priority 
+                      Don't give threads different priorities.
+  --slave-load-tmpdir=name 
+                      The location where the slave should put its temporary
+                      files when replicating a LOAD DATA INFILE command.
+  --slave-skip-errors=name 
+                      Tells the slave thread to continue replication when a
+                      query returns an error from the provided list.
+  --socket=name       Socket file to use for connection.
+  --sporadic-binlog-dump-fail 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --sql-bin-update-same=# 
+                      The update log is deprecated since version 5.0, is
+                      replaced by the binary log and this option does nothing
+                      anymore.
+  --sql-mode=name     Syntax: sql-mode=option[,option[,option...]] where option
+                      can be one of: REAL_AS_FLOAT, PIPES_AS_CONCAT,
+                      ANSI_QUOTES, IGNORE_SPACE, ONLY_FULL_GROUP_BY,
+                      NO_UNSIGNED_SUBTRACTION.
+  -s, --symbolic-links 
+                      Enable symbolic link support.
+  --tc-heuristic-recover=name 
+                      Decision to use in heuristic recover process. Possible
+                      values are COMMIT or ROLLBACK
+  --temp-pool         Using this option will cause most temporary files created
+                      to use a small set of names, rather than a unique name
+                      for each new file.
+  --timed_mutexes     Specify whether to time mutexes (only InnoDB mutexes are
+                      currently supported)
+  -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
+                      separated by a colon (:), in this case they are used in a
+                      round-robin fashion.
+  --transaction-isolation=name 
+                      Default transaction isolation level.
+  -s, --use-symbolic-links 
+                      Enable symbolic link support. Deprecated option; use
+                      --symbolic-links instead.
+  -u, --user=name     Run mysqld daemon as user.
+  -v, --verbose       Used with --help option for detailed help
+  -V, --version       Output version information and exit.
+  -W, --warnings[=#]  Deprecated; use --log-warnings instead.
+  --back_log=#        The number of outstanding connection requests MySQL can
+                      have. This comes into play when the main MySQL thread
+                      gets very many connection requests in a very short time.
+  --binlog_cache_size=# 
+                      The size of the cache to hold the SQL statements for the
+                      binary log during a transaction. If you often use big,
+                      multi-statement transactions you can increase this to get
+                      more performance.
+  --bulk_insert_buffer_size=# 
+                      Size of tree cache used in bulk insert optimisation. Note
+                      that this is a limit per thread!
+  --connect_timeout=# The number of seconds the mysqld server is waiting for a
+                      connect packet before responding with 'Bad handshake'.
+  --date_format=name  The DATE format (For future).
+  --datetime_format=name 
+                      The DATETIME/TIMESTAMP format (for future).
+  --default_week_format=# 
+                      The default week format used by WEEK() functions.
+  --delayed_insert_limit=# 
+                      After inserting delayed_insert_limit rows, the INSERT
+                      DELAYED handler will check if there are any SELECT
+                      statements pending. If so, it allows these to execute
+                      before continuing.
+  --delayed_insert_timeout=# 
+                      How long a INSERT DELAYED thread should wait for INSERT
+                      statements before terminating.
+  --delayed_queue_size=# 
+                      What size queue (in rows) should be allocated for
+                      handling INSERT DELAYED. If the queue becomes full, any
+                      client that does INSERT DELAYED will wait until there is
+                      room in the queue again.
+  --expire_logs_days=# 
+                      If non-zero, binary logs will be purged after
+                      expire_logs_days days; possible purges happen at startup
+                      and at binary log rotation.
+  --flush_time=#      A dedicated thread is created to flush all tables at the
+                      given interval.
+  --ft_boolean_syntax=name 
+                      List of operators for MATCH ... AGAINST ( ... IN BOOLEAN
+                      MODE)
+  --ft_max_word_len=# The maximum length of the word to be included in a
+                      FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+                      after changing this variable.
+  --ft_min_word_len=# The minimum length of the word to be included in a
+                      FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+                      after changing this variable.
+  --ft_query_expansion_limit=# 
+                      Number of best matches to use for query expansion
+  --ft_stopword_file=name 
+                      Use stopwords from this file instead of built-in list.
+  --group_concat_max_len=# 
+                      The maximum length of the result of function 
+                      group_concat.
+  --innodb_additional_mem_pool_size=# 
+                      Size of a memory pool InnoDB uses to store data
+                      dictionary information and other internal data
+                      structures.
+  --innodb_autoextend_increment=# 
+                      Data file autoextend increment in megabytes
+  --innodb_buffer_pool_awe_mem_mb=# 
+                      If Windows AWE is used, the size of InnoDB buffer pool
+                      allocated from the AWE memory.
+  --innodb_buffer_pool_size=# 
+                      The size of the memory buffer InnoDB uses to cache data
+                      and indexes of its tables.
+  --innodb_concurrency_tickets=# 
+                      Number of times a thread is allowed to enter InnoDB
+                      within the same     SQL query after it has once got the
+                      ticket
+  --innodb_file_io_threads=# 
+                      Number of file I/O threads in InnoDB.
+  --innodb_force_recovery=# 
+                      Helps to save your data in case the disk image of the
+                      database becomes corrupt.
+  --innodb_lock_wait_timeout=# 
+                      Timeout in seconds an InnoDB transaction may wait for a
+                      lock before being rolled back.
+  --innodb_log_buffer_size=# 
+                      The size of the buffer which InnoDB uses to write log to
+                      the log files on disk.
+  --innodb_log_file_size=# 
+                      Size of each log file in a log group.
+  --innodb_log_files_in_group=# 
+                      Number of log files in the log group. InnoDB writes to
+                      the files in a circular fashion. Value 3 is recommended
+                      here.
+  --innodb_mirrored_log_groups=# 
+                      Number of identical copies of log groups we keep for the
+                      database. Currently this should be set to 1.
+  --innodb_open_files=# 
+                      How many files at the maximum InnoDB keeps open at the
+                      same time.
+  --innodb_sync_spin_loops=# 
+                      Count of spin-loop rounds in InnoDB mutexes
+  --innodb_thread_concurrency=# 
+                      Helps in performance tuning in heavily concurrent
+                      environments.
+  --innodb_commit_concurrency=# 
+                      Helps in performance tuning in heavily concurrent
+                      environments.
+  --innodb_thread_sleep_delay=# 
+                      Time of innodb thread sleeping before joining InnoDB
+                      queue (usec). Value 0 disable a sleep
+  --interactive_timeout=# 
+                      The number of seconds the server waits for activity on an
+                      interactive connection before closing it.
+  --join_buffer_size=# 
+                      The size of the buffer that is used for full joins.
+  --key_buffer_size=# The size of the buffer used for index blocks for MyISAM
+                      tables. Increase this to get better index handling (for
+                      all reads and multiple writes) to as much as you can
+                      afford; 64M on a 256M machine that mainly runs MySQL is
+                      quite common.
+  --key_cache_age_threshold=# 
+                      This characterizes the number of hits a hot block has to
+                      be untouched until it is considered aged enough to be
+                      downgraded to a warm block. This specifies the percentage
+                      ratio of that number of hits to the total number of
+                      blocks in key cache
+  --key_cache_block_size=# 
+                      The default size of key cache blocks
+  --key_cache_division_limit=# 
+                      The minimum percentage of warm blocks in key cache
+  --long_query_time=# Log all queries that have taken more than long_query_time
+                      seconds to execute to file.
+  --lower_case_table_names[=#] 
+                      If set to 1 table names are stored in lowercase on disk
+                      and table names will be case-insensitive.  Should be set
+                      to 2 if you are using a case insensitive file system
+  --max_allowed_packet=# 
+                      Max packetlength to send/receive from to server.
+  --max_binlog_cache_size=# 
+                      Can be used to restrict the total size used to cache a
+                      multi-transaction query.
+  --max_binlog_size=# Binary log will be rotated automatically when the size
+                      exceeds this value. Will also apply to relay logs if
+                      max_relay_log_size is 0. The minimum value for this
+                      variable is 4096.
+  --max_connect_errors=# 
+                      If there is more than this number of interrupted
+                      connections from a host this host will be blocked from
+                      further connections.
+  --max_connections=# The number of simultaneous clients allowed.
+  --max_delayed_threads=# 
+                      Don't start more than this number of threads to handle
+                      INSERT DELAYED statements. If set to zero, which means
+                      INSERT DELAYED is not used.
+  --max_error_count=# Max number of errors/warnings to store for a statement.
+  --max_heap_table_size=# 
+                      Don't allow creation of heap tables bigger than this.
+  --max_join_size=#   Joins that are probably going to read more than
+                      max_join_size records return an error.
+  --max_length_for_sort_data=# 
+                      Max number of bytes in sorted records.
+  --max_relay_log_size=# 
+                      If non-zero: relay log will be rotated automatically when
+                      the size exceeds this value; if zero (the default): when
+                      the size exceeds max_binlog_size. 0 excepted, the minimum
+                      value for this variable is 4096.
+  --max_seeks_for_key=# 
+                      Limit assumed max number of seeks when looking up rows
+                      based on a key
+  --max_sort_length=# The number of bytes to use when sorting BLOB or TEXT
+                      values (only the first max_sort_length bytes of each
+                      value are used; the rest are ignored).
+  --max_tmp_tables=#  Maximum number of temporary tables a client can keep open
+                      at a time.
+  --max_user_connections=# 
+                      The maximum number of active connections for a single
+                      user (0 = no limit).
+  --max_write_lock_count=# 
+                      After this many write locks, allow some read locks to run
+                      in between.
+  --multi_range_count=# 
+                      Number of key ranges to request at once.
+  --myisam_block_size=# 
+                      Block size to be used for MyISAM index pages.
+  --myisam_data_pointer_size=# 
+                      Default pointer size to be used for MyISAM tables.
+  --myisam_max_extra_sort_file_size=# 
+                      Deprecated option
+  --myisam_max_sort_file_size=# 
+                      Don't use the fast sort index method to created index if
+                      the temporary file would get bigger than this.
+  --myisam_repair_threads=# 
+                      Number of threads to use when repairing MyISAM tables.
+                      The value of 1 disables parallel repair.
+  --myisam_sort_buffer_size=# 
+                      The buffer that is allocated when sorting the index when
+                      doing a REPAIR or when creating indexes with CREATE INDEX
+                      or ALTER TABLE.
+  --myisam_stats_method=name 
+                      Specifies how MyISAM index statistics collection code
+                      should threat NULLs. Possible values of name are
+                      "nulls_unequal" (default behavior for 4.1/5.0),
+                      "nulls_equal" (emulate 4.0 behavior), and
+                      "nulls_ignored".
+  --net_buffer_length=# 
+                      Buffer length for TCP/IP and socket communication.
+  --net_read_timeout=# 
+                      Number of seconds to wait for more data from a connection
+                      before aborting the read.
+  --net_retry_count=# If a read on a communication port is interrupted, retry
+                      this many times before giving up.
+  --net_write_timeout=# 
+                      Number of seconds to wait for a block to be written to a
+                      connection  before aborting the write.
+  --open_files_limit=# 
+                      If this is not 0, then mysqld will use this value to
+                      reserve file descriptors to use with setrlimit(). If this
+                      value is 0 then mysqld will reserve max_connections*5 or
+                      max_connections + table_cache*2 (whichever is larger)
+                      number of files.
+  --optimizer_prune_level[=#] 
+                      Controls the heuristic(s) applied during query
+                      optimization to prune less-promising partial plans from
+                      the optimizer search space. Meaning: 0 - do not apply any
+                      heuristic, thus perform exhaustive search; 1 - prune
+                      plans based on number of retrieved rows.
+  --optimizer_search_depth[=#] 
+                      Maximum depth of search performed by the query optimizer.
+                      Values larger than the number of relations in a query
+                      result in better query plans, but take longer to compile
+                      a query. Smaller values than the number of tables in a
+                      relation result in faster optimization, but may produce
+                      very bad query plans. If set to 0, the system will
+                      automatically pick a reasonable value; if set to
+                      MAX_TABLES+2, the optimizer will switch to the original
+                      find_best (used for testing/comparison).
+  --preload_buffer_size=# 
+                      The size of the buffer that is allocated when preloading
+                      indexes
+  --query_alloc_block_size=# 
+                      Allocation block size for query parsing and execution
+  --query_cache_limit=# 
+                      Don't cache results that are bigger than this.
+  --query_cache_min_res_unit=# 
+                      minimal size of unit in wich space for results is
+                      allocated (last unit will be trimed after writing all
+                      result data.
+  --query_cache_size=# 
+                      The memory allocated to store results from old queries.
+  --query_cache_type=# 
+                      0 = OFF = Don't cache or retrieve results. 1 = ON = Cache
+                      all results except SELECT SQL_NO_CACHE ... queries. 2 =
+                      DEMAND = Cache only SELECT SQL_CACHE ... queries.
+  --query_cache_wlock_invalidate 
+                      Invalidate queries in query cache on LOCK for write
+  --query_prealloc_size=# 
+                      Persistent buffer for query parsing and execution
+  --range_alloc_block_size=# 
+                      Allocation block size for storing ranges during
+                      optimization
+  --read_buffer_size=# 
+                      Each thread that does a sequential scan allocates a
+                      buffer of this size for each table it scans. If you do
+                      many sequential scans, you may want to increase this
+                      value.
+  --read_only         Make all non-temporary tables read-only, with the
+                      exception for replication (slave) threads and users with
+                      the SUPER privilege
+  --read_rnd_buffer_size=# 
+                      When reading rows in sorted order after a sort, the rows
+                      are read through this buffer to avoid a disk seeks. If
+                      not set, then it's set to the value of record_buffer.
+  --div_precision_increment=# 
+                      Precision of the result of '/' operator will be increased
+                      on that value.
+  --record_buffer=#   Alias for read_buffer_size
+  --max_sp_recursion_depth[=#] 
+                      Maximum stored procedure recursion depth. (discussed with
+                      docs).
+  --relay_log_purge   0 = do not purge relay logs. 1 = purge them as soon as
+                      they are no more needed.
+  --relay_log_space_limit=# 
+                      Maximum space to use for all relay logs.
+  --slave_compressed_protocol 
+                      Use compression on master/slave protocol.
+  --slave_net_timeout=# 
+                      Number of seconds to wait for more data from a
+                      master/slave connection before aborting the read.
+  --slave_transaction_retries=# 
+                      Number of times the slave SQL thread will retry a
+                      transaction in case it failed with a deadlock or elapsed
+                      lock wait timeout, before giving up and stopping.
+  --slow_launch_time=# 
+                      If creating the thread takes longer than this value (in
+                      seconds), the Slow_launch_threads counter will be
+                      incremented.
+  --sort_buffer_size=# 
+                      Each thread that needs to do a sort allocates a buffer of
+                      this size.
+  --sync-binlog=#     Synchronously flush binary log to disk after every #th
+                      event. Use 0 (default) to disable synchronous flushing.
+  --sync-frm          Sync .frm to disk on create. Enabled by default.
+  --sync-replication=# 
+                      Enable synchronous replication.
+  --sync-replication-slave-id=# 
+                      Synchronous replication is wished for this slave.
+  --sync-replication-timeout=# 
+                      Synchronous replication timeout.
+  --table_cache=#     The number of open tables for all threads.
+  --table_lock_wait_timeout=# 
+                      Timeout in seconds to wait for a table level lock before
+                      returning an error. Used only if the connection has
+                      active cursors.
+  --thread_cache_size=# 
+                      How many threads we should keep in a cache for reuse.
+  --thread_concurrency=# 
+                      Permits the application to give the threads system a hint
+                      for the desired number of threads that should be run at
+                      the same time.
+  --thread_stack=#    The stack size for each thread.
+  --time_format=name  The TIME format (for future).
+  --tmp_table_size=#  If an in-memory temporary table exceeds this size, MySQL
+                      will automatically convert it to an on-disk MyISAM table.
+  --transaction_alloc_block_size=# 
+                      Allocation block size for transactions to be stored in
+                      binary log
+  --transaction_prealloc_size=# 
+                      Persistent buffer for transactions to be stored in binary
+                      log
+  --updatable_views_with_limit=# 
+                      1 = YES = Don't issue an error message (warning only) if
+                      a VIEW without presence of a key of the underlying table
+                      is used in queries with a LIMIT clause for updating. 0 =
+                      NO = Prohibit update of a VIEW, which does not contain a
+                      key of the underlying table and the query uses a LIMIT
+                      clause (usually get from GUI tools).
+  --wait_timeout=#    The number of seconds the server waits for activity on a
+                      connection before closing it.
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE}  Value (after reading options)
+--------------------------------- -----------------------------
+help                              TRUE
+abort-slave-event-count           0
+allow-suspicious-udfs             FALSE
+auto-increment-increment          1
+auto-increment-offset             1
+automatic-sp-privileges           TRUE
+basedir                           /usr/local/mysql/
+bdb                               FALSE
+bind-address                      (No default value)
+character-set-client-handshake    TRUE
+character-set-server              latin1
+character-sets-dir                /usr/local/mysql/share/mysql/charsets/
+chroot                            (No default value)
+collation-server                  latin1_swedish_ci
+completion-type                   0
+concurrent-insert                 1
+console                           FALSE
+datadir                           /usr/local/mysql/data/
+default-character-set             latin1
+default-collation                 latin1_swedish_ci
+default-time-zone                 (No default value)
+disconnect-slave-event-count      0
+enable-locking                    FALSE
+enable-pstack                     FALSE
+engine-condition-pushdown         FALSE
+external-locking                  FALSE
+gdb                               FALSE
+init-connect                      (No default value)
+init-file                         (No default value)
+init-slave                        (No default value)
+innodb                            TRUE
+innodb_checksums                  TRUE
+innodb_data_home_dir              (No default value)
+innodb_doublewrite                TRUE
+innodb_fast_shutdown              1
+innodb_file_per_table             FALSE
+innodb_flush_log_at_trx_commit    1
+innodb_flush_method               (No default value)
+innodb_locks_unsafe_for_binlog    FALSE
+innodb_log_arch_dir               (No default value)
+innodb_log_group_home_dir         (No default value)
+innodb_max_dirty_pages_pct        90
+innodb_max_purge_lag              0
+innodb_status_file                FALSE
+innodb_table_locks                TRUE
+innodb_support_xa                 TRUE
+isam                              FALSE
+language                          /usr/local/mysql/share/mysql/english/
+local-infile                      TRUE
+log                               (No default value)
+log-bin                           (No default value)
+log-bin-index                     (No default value)
+log-bin-trust-routine-creators    FALSE
+log-bin-trust-function-creators   FALSE
+log-error                         
+log-isam                          myisam.log
+log-queries-not-using-indexes     FALSE
+log-short-format                  FALSE
+log-slave-updates                 FALSE
+log-slow-admin-statements         FALSE
+log-slow-queries                  (No default value)
+log-tc                            tc.log
+log-tc-size                       24576
+log-update                        (No default value)
+log-warnings                      1
+low-priority-updates              FALSE
+master-connect-retry              60
+master-host                       (No default value)
+master-info-file                  master.info
+master-password                   (No default value)
+master-port                       3306
+master-retry-count                86400
+master-ssl                        FALSE
+master-ssl-ca                     (No default value)
+master-ssl-capath                 (No default value)
+master-ssl-cert                   (No default value)
+master-ssl-cipher                 (No default value)
+master-ssl-key                    (No default value)
+master-user                       test
+max-binlog-dump-events            0
+memlock                           FALSE
+myisam-recover                    OFF
+ndbcluster                        FALSE
+new                               FALSE
+old-passwords                     FALSE
+old-style-user-limits             FALSE
+pid-file                          /usr/local/mysql/data/sleek.pid
+port                              3306
+relay-log                         (No default value)
+relay-log-index                   (No default value)
+relay-log-info-file               relay-log.info
+replicate-same-server-id          FALSE
+report-host                       (No default value)
+report-password                   (No default value)
+report-port                       3306
+report-user                       (No default value)
+rpl-recovery-rank                 0
+safe-user-create                  FALSE
+secure-auth                       FALSE
+server-id                         0
+show-slave-auth-info              FALSE
+skip-grant-tables                 FALSE
+skip-slave-start                  FALSE
+slave-load-tmpdir                 /var/tmp/
+socket                            /tmp/mysql.sock
+sporadic-binlog-dump-fail         FALSE
+sql-mode                          OFF
+symbolic-links                    TRUE
+tc-heuristic-recover              (No default value)
+temp-pool                         TRUE
+timed_mutexes                     FALSE
+tmpdir                            (No default value)
+use-symbolic-links                TRUE
+verbose                           TRUE
+warnings                          1
+back_log                          50
+binlog_cache_size                 32768
+bulk_insert_buffer_size           8388608
+connect_timeout                   5
+date_format                       (No default value)
+datetime_format                   (No default value)
+default_week_format               0
+delayed_insert_limit              100
+delayed_insert_timeout            300
+delayed_queue_size                1000
+expire_logs_days                  0
+flush_time                        0
+ft_max_word_len                   84
+ft_min_word_len                   4
+ft_query_expansion_limit          20
+ft_stopword_file                  (No default value)
+group_concat_max_len              1024
+innodb_additional_mem_pool_size   1048576
+innodb_autoextend_increment       8
+innodb_buffer_pool_awe_mem_mb     0
+innodb_buffer_pool_size           8388608
+innodb_concurrency_tickets        500
+innodb_file_io_threads            4
+innodb_force_recovery             0
+innodb_lock_wait_timeout          50
+innodb_log_buffer_size            1048576
+innodb_log_file_size              5242880
+innodb_log_files_in_group         2
+innodb_mirrored_log_groups        1
+innodb_open_files                 300
+innodb_sync_spin_loops            20
+innodb_thread_concurrency         20
+innodb_commit_concurrency         0
+innodb_thread_sleep_delay         10000
+interactive_timeout               28800
+join_buffer_size                  131072
+key_buffer_size                   8388600
+key_cache_age_threshold           300
+key_cache_block_size              1024
+key_cache_division_limit          100
+long_query_time                   10
+lower_case_table_names            0
+max_allowed_packet                1048576
+max_binlog_cache_size             4294967295
+max_binlog_size                   1073741824
+max_connect_errors                10
+max_connections                   100
+max_delayed_threads               20
+max_error_count                   64
+max_heap_table_size               16777216
+max_join_size                     18446744073709551615
+max_length_for_sort_data          1024
+max_relay_log_size                0
+max_seeks_for_key                 4294967295
+max_sort_length                   1024
+max_tmp_tables                    32
+max_user_connections              0
+max_write_lock_count              4294967295
+multi_range_count                 256
+myisam_block_size                 1024
+myisam_data_pointer_size          6
+myisam_max_extra_sort_file_size   2147483648
+myisam_max_sort_file_size         2147483647
+myisam_repair_threads             1
+myisam_sort_buffer_size           8388608
+myisam_stats_method               nulls_unequal
+net_buffer_length                 16384
+net_read_timeout                  30
+net_retry_count                   10
+net_write_timeout                 60
+open_files_limit                  0
+optimizer_prune_level             1
+optimizer_search_depth            62
+preload_buffer_size               32768
+query_alloc_block_size            8192
+query_cache_limit                 1048576
+query_cache_min_res_unit          4096
+query_cache_size                  0
+query_cache_type                  1
+query_cache_wlock_invalidate      FALSE
+query_prealloc_size               8192
+range_alloc_block_size            2048
+read_buffer_size                  131072
+read_only                         FALSE
+read_rnd_buffer_size              262144
+div_precision_increment           4
+record_buffer                     131072
+max_sp_recursion_depth            0
+relay_log_purge                   TRUE
+relay_log_space_limit             0
+slave_compressed_protocol         FALSE
+slave_net_timeout                 3600
+slave_transaction_retries         10
+slow_launch_time                  2
+sort_buffer_size                  2097144
+sync-binlog                       0
+sync-frm                          TRUE
+sync-replication                  0
+sync-replication-slave-id         0
+sync-replication-timeout          10
+table_cache                       64
+table_lock_wait_timeout           50
+thread_cache_size                 0
+thread_concurrency                10
+thread_stack                      196608
+time_format                       (No default value)
+tmp_table_size                    33554432
+transaction_alloc_block_size      8192
+transaction_prealloc_size         4096
+updatable_views_with_limit        1
+wait_timeout                      28800
+
+To see what values a running MySQL server is using, type
+'mysqladmin variables' instead of 'mysqld --verbose --help'.
+

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


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

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


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

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


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

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


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

Added: trunk/connector-mxj/resources/5-0-17/Linux-i386/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-17/Linux-i386/version.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/resources/5-0-17/Linux-i386/version.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1 @@
+mysql-standard-5.0.17-linux-i686/bin/mysqld

Added: trunk/connector-mxj/resources/5-0-17/Mac OS X-ppc/mysqld
===================================================================
(Binary files differ)


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

Added: trunk/connector-mxj/resources/5-0-17/Mac OS X-ppc/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-17/Mac OS X-ppc/version.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/resources/5-0-17/Mac OS X-ppc/version.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1 @@
+mysql-standard-5.0.17-osx10.3-powerpc/bin/mysqld

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


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

Added: trunk/connector-mxj/resources/5-0-17/SunOS-sparc/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-17/SunOS-sparc/version.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/resources/5-0-17/SunOS-sparc/version.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1 @@
+mysql-standard-5.0.17-solaris9-sparc/bin/mysqld

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


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

Added: trunk/connector-mxj/resources/5-0-17/Win-x86/version.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-17/Win-x86/version.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/resources/5-0-17/Win-x86/version.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1 @@
+mysql-5.0.17-win32/bin/mysqld-nt.exe

Added: trunk/connector-mxj/resources/5-0-17/com/mysql/management/MySQL_Help.txt
===================================================================
--- trunk/connector-mxj/resources/5-0-17/com/mysql/management/MySQL_Help.txt	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/resources/5-0-17/com/mysql/management/MySQL_Help.txt	2005-12-25 22:21:51 UTC (rev 10)
@@ -0,0 +1,984 @@
+mysql-standard-5.0.17-osx10.3-powerpc/bin/mysqld  Ver 5.0.17-standard for apple-darwin7.9.0 on powerpc (MySQL Community Edition - Standard (GPL))
+Copyright (C) 2000 MySQL AB, by Monty and others
+This software comes with ABSOLUTELY NO WARRANTY. This is free software,
+and you are welcome to modify and redistribute it under the GPL license
+
+Starts the MySQL database server
+
+Usage: mysql-standard-5.0.17-osx10.3-powerpc/bin/mysqld [OPTIONS]
+
+Default options are read from the following files in the given order:
+/etc/my.cnf ~/.my.cnf 
+The following groups are read: mysqld server mysqld-5.0
+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
+
+  -?, --help          Display this help and exit.
+  --abort-slave-event-count=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  -a, --ansi          Use ANSI SQL syntax instead of MySQL syntax. This mode
+                      will also set transaction isolation level 'serializable'.
+  --allow-suspicious-udfs 
+                      Allows use of UDFs consisting of only one symbol xxx()
+                      without corresponding xxx_init() or xxx_deinit(). That
+                      also means that one can load any function from any
+                      library, for example exit() from libc.so
+  --auto-increment-increment[=#] 
+                      Auto-increment columns are incremented by this
+  --auto-increment-offset[=#] 
+                      Offset added to Auto-increment columns. Used when
+                      auto-increment-increment != 1
+  --automatic-sp-privileges 
+                      Creating and dropping stored procedures alters ACLs.
+                      Disable with --skip-automatic-sp-privileges.
+  -b, --basedir=name  Path to installation directory. All paths are usually
+                      resolved relative to this.
+  --bdb               Enable Berkeley DB (if this version of MySQL supports
+                      it). Disable with --skip-bdb (will save memory).
+  --big-tables        Allow big result sets by saving all temporary sets on
+                      file (Solves most 'table full' errors).
+  --bind-address=name IP address to bind to.
+  --binlog-do-db=name Tells the master it should log updates for the specified
+                      database, and exclude all others not explicitly
+                      mentioned.
+  --binlog-ignore-db=name 
+                      Tells the master that updates to the given database
+                      should not be logged tothe binary log.
+  --bootstrap         Used by mysql installation scripts.
+  --character-set-client-handshake 
+                      Don't use client side character set value sent during
+                      handshake.
+  -C, --character-set-server=name 
+                      Set the default character set.
+  --character-sets-dir=name 
+                      Directory where character sets are.
+  -r, --chroot=name   Chroot mysqld daemon during startup.
+  --collation-server=name 
+                      Set the default collation.
+  --completion-type=# Default completion type.
+  --concurrent-insert[=#] 
+                      Use concurrent insert with MyISAM. Disable with
+                      --concurrent-insert=0
+  --console           Write error output on screen; Don't remove the console
+                      window on windows.
+  --core-file         Write core on errors.
+  -h, --datadir=name  Path to the database root.
+  -C, --default-character-set=name 
+                      Set the default character set (deprecated option, use
+                      --character-set-server instead).
+  --default-collation=name 
+                      Set the default collation (deprecated option, use
+                      --collation-server instead).
+  --default-storage-engine=name 
+                      Set the default storage engine (table type) for tables.
+  --default-table-type=name 
+                      (deprecated) Use --default-storage-engine.
+  --default-time-zone=name 
+                      Set the default time zone.
+  --delay-key-write[=name] 
+                      Type of DELAY_KEY_WRITE.
+  --delay-key-write-for-all-tables 
+                      Don't flush key buffers between writes for any MyISAM
+                      table (Deprecated option, use --delay-key-write=all
+                      instead).
+  --disconnect-slave-event-count=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --enable-locking    Deprecated option, use --external-locking instead.
+  --enable-pstack     Print a symbolic stack trace on failure.
+  --engine-condition-pushdown 
+                      Push supported query conditions to the storage engine.
+  -T, --exit-info[=#] Used for debugging;  Use at your own risk!
+  --external-locking  Use system (external) locking.  With this option enabled
+                      you can run myisamchk to test (not repair) tables while
+                      the MySQL server is running.
+  --flush             Flush tables to disk between SQL commands.
+  --gdb               Set up signals usable for debugging
+  --init-connect=name Command(s) that are executed for each new connection
+  --init-file=name    Read SQL commands from this file at startup.
+  --init-rpl-role=name 
+                      Set the replication role.
+  --init-slave=name   Command(s) that are executed when a slave connects to
+                      this master
+  --innodb            Enable InnoDB (if this version of MySQL supports it).
+                      Disable with --skip-innodb (will save memory).
+  --innodb_checksums  Enable InnoDB checksums validation (enabled by default).
+                      Disable with --skip-innodb-checksums.
+  --innodb_data_file_path=name 
+                      Path to individual files and their sizes.
+  --innodb_data_home_dir=name 
+                      The common part for InnoDB table spaces.
+  --innodb_doublewrite 
+                      Enable InnoDB doublewrite buffer (enabled by default).
+                      Disable with --skip-innodb-doublewrite.
+  --innodb_fast_shutdown[=#] 
+                      Speeds up the shutdown process of the InnoDB storage
+                      engine. Possible values are 0, 1 (faster) or 2 (fastest -
+                      crash-like).
+  --innodb_file_per_table 
+                      Stores each InnoDB table to an .ibd file in the database
+                      dir.
+  --innodb_flush_log_at_trx_commit[=#] 
+                      Set to 0 (write and flush once per second), 1 (write and
+                      flush at each commit) or 2 (write at commit, flush once
+                      per second).
+  --innodb_flush_method=name 
+                      With which method to flush data.
+  --innodb_locks_unsafe_for_binlog 
+                      Force InnoDB not to use next-key locking. Instead use
+                      only row-level locking
+  --innodb_log_arch_dir=name 
+                      Where full logs should be archived.
+  --innodb_log_archive[=#] 
+                      Set to 1 if you want to have logs archived.
+  --innodb_log_group_home_dir=name 
+                      Path to InnoDB log files.
+  --innodb_max_dirty_pages_pct=# 
+                      Percentage of dirty pages allowed in bufferpool.
+  --innodb_max_purge_lag=# 
+                      Desired maximum length of the purge queue (0 = no limit)
+  --innodb_status_file 
+                      Enable SHOW INNODB STATUS output in the
+                      innodb_status.<pid> file
+  --innodb_table_locks 
+                      Enable InnoDB locking in LOCK TABLES
+  --innodb_support_xa Enable InnoDB support for the XA two-phase commit
+  --isam              Obsolete. ISAM storage engine is no longer supported.
+  -L, --language=name Client error messages in given language. May be given as
+                      a full path.
+  --local-infile      Enable/disable LOAD DATA LOCAL INFILE (takes values 1|0).
+  -l, --log[=name]    Log connections and queries to file.
+  --log-bin[=name]    Log update queries in binary format. Optional (but
+                      strongly recommended to avoid replication problems if
+                      server's hostname changes) argument should be the chosen
+                      location for the binary log files.
+  --log-bin-index=name 
+                      File that holds the names for last binary log files.
+  --log-bin-trust-routine-creators 
+                      (deprecated) Use log-bin-trust-function-creators.
+  --log-bin-trust-function-creators 
+                      If equal to 0 (the default), then when --log-bin is used,
+                      creation of a function is allowed only to users having
+                      the SUPER privilege and only if this function may not
+                      break binary logging.
+  --log-error[=name]  Error log file.
+  --log-isam[=name]   Log all MyISAM changes to file.
+  -0, --log-long-format 
+                      Log some extra information to update log. Please note
+                      that this option is deprecated; see --log-short-format
+                      option.
+  --log-queries-not-using-indexes 
+                      Log queries that are executed without benefit of any
+                      index to the slow log if it is open.
+  --log-short-format  Don't log extra information to update and slow-query
+                      logs.
+  --log-slave-updates Tells the slave to log the updates from the slave thread
+                      to the binary log. You will need to turn it on if you
+                      plan to daisy-chain the slaves.
+  --log-slow-admin-statements 
+                      Log slow OPTIMIZE, ANALYZE, ALTER and other
+                      administrative statements to the slow log if it is open.
+  --log-slow-queries[=name] 
+                      Log slow queries to this log file. Defaults logging to
+                      hostname-slow.log file. Must be enabled to activate other
+                      slow log options.
+  --log-tc=name       Path to transaction coordinator log (used for
+                      transactions that affect more than one storage engine,
+                      when binary log is disabled)
+  --log-tc-size=#     Size of transaction coordinator log.
+  --log-update[=name] The update log is deprecated since version 5.0, is
+                      replaced by the binary log and this option justs turns on
+                      --log-bin instead.
+  -W, --log-warnings[=#] 
+                      Log some not critical warnings to the log file.
+  --low-priority-updates 
+                      INSERT/DELETE/UPDATE has lower priority than selects.
+  --master-connect-retry=# 
+                      The number of seconds the slave thread will sleep before
+                      retrying to connect to the master in case the master goes
+                      down or the connection is lost.
+  --master-host=name  Master hostname or IP address for replication. If not
+                      set, the slave thread will not be started. Note that the
+                      setting of master-host will be ignored if there exists a
+                      valid master.info file.
+  --master-info-file=name 
+                      The location and name of the file that remembers the
+                      master and where the I/O replication thread is in the
+                      master's binlogs.
+  --master-password=name 
+                      The password the slave thread will authenticate with when
+                      connecting to the master. If not set, an empty password
+                      is assumed.The value in master.info will take precedence
+                      if it can be read.
+  --master-port=#     The port the master is listening on. If not set, the
+                      compiled setting of MYSQL_PORT is assumed. If you have
+                      not tinkered with configure options, this should be 3306.
+                      The value in master.info will take precedence if it can
+                      be read.
+  --master-retry-count=# 
+                      The number of tries the slave will make to connect to the
+                      master before giving up.
+  --master-ssl        Enable the slave to connect to the master using SSL.
+  --master-ssl-ca[=name] 
+                      Master SSL CA file. Only applies if you have enabled
+                      master-ssl.
+  --master-ssl-capath[=name] 
+                      Master SSL CA path. Only applies if you have enabled
+                      master-ssl.
+  --master-ssl-cert[=name] 
+                      Master SSL certificate file name. Only applies if you
+                      have enabled master-ssl
+  --master-ssl-cipher[=name] 
+                      Master SSL cipher. Only applies if you have enabled
+                      master-ssl.
+  --master-ssl-key[=name] 
+                      Master SSL keyfile name. Only applies if you have enabled
+                      master-ssl.
+  --master-user=name  The username the slave thread will use for authentication
+                      when connecting to the master. The user must have FILE
+                      privilege. If the master user is not set, user test is
+                      assumed. The value in master.info will take precedence if
+                      it can be read.
+  --max-binlog-dump-events=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --memlock           Lock mysqld in memory.
+  --myisam-recover[=name] 
+                      Syntax: myisam-recover[=option[,option...]], where option
+                      can be DEFAULT, BACKUP, FORCE or QUICK.
+  --ndbcluster        Enable NDB Cluster (if this version of MySQL supports
+                      it). Disable with --skip-ndbcluster (will save memory).
+  -n, --new           Use very new possible 'unsafe' functions.
+  --old-passwords     Use old password encryption method (needed for 4.0 and
+                      older clients).
+  --old-style-user-limits 
+                      Enable old-style user limits (before 5.0.3 user resources
+                      were counted per each user+host vs. per account)
+  --pid-file=name     Pid file used by safe_mysqld.
+  -P, --port=#        Port number to use for connection.
+  --relay-log=name    The location and name to use for relay logs.
+  --relay-log-index=name 
+                      The location and name to use for the file that keeps a
+                      list of the last relay logs.
+  --relay-log-info-file=name 
+                      The location and name of the file that remembers where
+                      the SQL replication thread is in the relay logs.
+  --replicate-do-db=name 
+                      Tells the slave thread to restrict replication to the
+                      specified database. To specify more than one database,
+                      use the directive multiple times, once for each database.
+                      Note that this will only work if you do not use
+                      cross-database queries such as UPDATE some_db.some_table
+                      SET foo='bar' while having selected a different or no
+                      database. If you need cross database updates to work,
+                      make sure you have 3.23.28 or later, and use
+                      replicate-wild-do-table=db_name.%.
+  --replicate-do-table=name 
+                      Tells the slave thread to restrict replication to the
+                      specified table. To specify more than one table, use the
+                      directive multiple times, once for each table. This will
+                      work for cross-database updates, in contrast to
+                      replicate-do-db.
+  --replicate-ignore-db=name 
+                      Tells the slave thread to not replicate to the specified
+                      database. To specify more than one database to ignore,
+                      use the directive multiple times, once for each database.
+                      This option will not work if you use cross database
+                      updates. If you need cross database updates to work, make
+                      sure you have 3.23.28 or later, and use
+                      replicate-wild-ignore-table=db_name.%. 
+  --replicate-ignore-table=name 
+                      Tells the slave thread to not replicate to the specified
+                      table. To specify more than one table to ignore, use the
+                      directive multiple times, once for each table. This will
+                      work for cross-datbase updates, in contrast to
+                      replicate-ignore-db.
+  --replicate-rewrite-db=name 
+                      Updates to a database with a different name than the
+                      original. Example:
+                      replicate-rewrite-db=master_db_name->slave_db_name.
+  --replicate-wild-do-table=name 
+                      Tells the slave thread to restrict replication to the
+                      tables that match the specified wildcard pattern. To
+                      specify more than one table, use the directive multiple
+                      times, once for each table. This will work for
+                      cross-database updates. Example:
+                      replicate-wild-do-table=foo%.bar% will replicate only
+                      updates to tables in all databases that start with foo
+                      and whose table names start with bar.
+  --replicate-wild-ignore-table=name 
+                      Tells the slave thread to not replicate to the tables
+                      that match the given wildcard pattern. To specify more
+                      than one table to ignore, use the directive multiple
+                      times, once for each table. This will work for
+                      cross-database updates. Example:
+                      replicate-wild-ignore-table=foo%.bar% will not do updates
+                      to tables in databases that start with foo and whose
+                      table names start with bar.
+  --replicate-same-server-id 
+                      In replication, if set to 1, do not skip events having
+                      our server id. Default value is 0 (to break infinite
+                      loops in circular replication). Can't be set to 1 if
+                      --log-slave-updates is used.
+  --report-host=name  Hostname or IP of the slave to be reported to to the
+                      master during slave registration. Will appear in the
+                      output of SHOW SLAVE HOSTS. Leave unset if you do not
+                      want the slave to register itself with the master. Note
+                      that it is not sufficient for the master to simply read
+                      the IP of the slave off the socket once the slave
+                      connects. Due to NAT and other routing issues, that IP
+                      may not be valid for connecting to the slave from the
+                      master or other hosts.
+  --report-password=name 
+                      Undocumented.
+  --report-port=#     Port for connecting to slave reported to the master
+                      during slave registration. Set it only if the slave is
+                      listening on a non-default port or if you have a special
+                      tunnel from the master or other clients to the slave. If
+                      not sure, leave this option unset.
+  --report-user=name  Undocumented.
+  --rpl-recovery-rank=# 
+                      Undocumented.
+  --safe-mode         Skip some optimize stages (for testing).
+  --safe-show-database 
+                      Deprecated option; use GRANT SHOW DATABASES instead...
+  --safe-user-create  Don't allow new user creation by the user who has no
+                      write privileges to the mysql.user table.
+  --safemalloc-mem-limit=# 
+                      Simulate memory shortage when compiled with the
+                      --with-debug=full option.
+  --secure-auth       Disallow authentication for accounts that have old
+                      (pre-4.1) passwords.
+  --server-id=#       Uniquely identifies the server instance in the community
+                      of replication partners.
+  -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.
+  --show-slave-auth-info 
+                      Show user and password in SHOW SLAVE HOSTS on this master
+  --skip-grant-tables Start without grant tables. This gives all users FULL
+                      ACCESS to all tables!
+  --skip-host-cache   Don't cache host names.
+  --skip-locking      Deprecated option, use --skip-external-locking instead.
+  --skip-name-resolve Don't resolve hostnames. All hostnames are IP's or
+                      'localhost'.
+  --skip-networking   Don't allow connection with TCP/IP.
+  --skip-new          Don't use new, possible wrong routines.
+  --skip-show-database 
+                      Don't allow 'SHOW DATABASE' commands.
+  --skip-slave-start  If set, slave is not autostarted.
+  --skip-stack-trace  Don't print a stack trace on failure.
+  --skip-symlink      Don't allow symlinking of tables. Deprecated option.  Use
+                      --skip-symbolic-links instead.
+  --skip-thread-priority 
+                      Don't give threads different priorities.
+  --slave-load-tmpdir=name 
+                      The location where the slave should put its temporary
+                      files when replicating a LOAD DATA INFILE command.
+  --slave-skip-errors=name 
+                      Tells the slave thread to continue replication when a
+                      query returns an error from the provided list.
+  --socket=name       Socket file to use for connection.
+  --sporadic-binlog-dump-fail 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --sql-bin-update-same=# 
+                      The update log is deprecated since version 5.0, is
+                      replaced by the binary log and this option does nothing
+                      anymore.
+  --sql-mode=name     Syntax: sql-mode=option[,option[,option...]] where option
+                      can be one of: REAL_AS_FLOAT, PIPES_AS_CONCAT,
+                      ANSI_QUOTES, IGNORE_SPACE, ONLY_FULL_GROUP_BY,
+                      NO_UNSIGNED_SUBTRACTION.
+  -s, --symbolic-links 
+                      Enable symbolic link support.
+  --tc-heuristic-recover=name 
+                      Decision to use in heuristic recover process. Possible
+                      values are COMMIT or ROLLBACK
+  --temp-pool         Using this option will cause most temporary files created
+                      to use a small set of names, rather than a unique name
+                      for each new file.
+  --timed_mutexes     Specify whether to time mutexes (only InnoDB mutexes are
+                      currently supported)
+  -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
+                      separated by a colon (:), in this case they are used in a
+                      round-robin fashion.
+  --transaction-isolation=name 
+                      Default transaction isolation level.
+  -s, --use-symbolic-links 
+                      Enable symbolic link support. Deprecated option; use
+                      --symbolic-links instead.
+  -u, --user=name     Run mysqld daemon as user.
+  -v, --verbose       Used with --help option for detailed help
+  -V, --version       Output version information and exit.
+  -W, --warnings[=#]  Deprecated; use --log-warnings instead.
+  --back_log=#        The number of outstanding connection requests MySQL can
+                      have. This comes into play when the main MySQL thread
+                      gets very many connection requests in a very short time.
+  --binlog_cache_size=# 
+                      The size of the cache to hold the SQL statements for the
+                      binary log during a transaction. If you often use big,
+                      multi-statement transactions you can increase this to get
+                      more performance.
+  --bulk_insert_buffer_size=# 
+                      Size of tree cache used in bulk insert optimisation. Note
+                      that this is a limit per thread!
+  --connect_timeout=# The number of seconds the mysqld server is waiting for a
+                      connect packet before responding with 'Bad handshake'.
+  --date_format=name  The DATE format (For future).
+  --datetime_format=name 
+                      The DATETIME/TIMESTAMP format (for future).
+  --default_week_format=# 
+                      The default week format used by WEEK() functions.
+  --delayed_insert_limit=# 
+                      After inserting delayed_insert_limit rows, the INSERT
+                      DELAYED handler will check if there are any SELECT
+                      statements pending. If so, it allows these to execute
+                      before continuing.
+  --delayed_insert_timeout=# 
+                      How long a INSERT DELAYED thread should wait for INSERT
+                      statements before terminating.
+  --delayed_queue_size=# 
+                      What size queue (in rows) should be allocated for
+                      handling INSERT DELAYED. If the queue becomes full, any
+                      client that does INSERT DELAYED will wait until there is
+                      room in the queue again.
+  --expire_logs_days=# 
+                      If non-zero, binary logs will be purged after
+                      expire_logs_days days; possible purges happen at startup
+                      and at binary log rotation.
+  --flush_time=#      A dedicated thread is created to flush all tables at the
+                      given interval.
+  --ft_boolean_syntax=name 
+                      List of operators for MATCH ... AGAINST ( ... IN BOOLEAN
+                      MODE)
+  --ft_max_word_len=# The maximum length of the word to be included in a
+                      FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+                      after changing this variable.
+  --ft_min_word_len=# The minimum length of the word to be included in a
+                      FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+                      after changing this variable.
+  --ft_query_expansion_limit=# 
+                      Number of best matches to use for query expansion
+  --ft_stopword_file=name 
+                      Use stopwords from this file instead of built-in list.
+  --group_concat_max_len=# 
+                      The maximum length of the result of function 
+                      group_concat.
+  --innodb_additional_mem_pool_size=# 
+                      Size of a memory pool InnoDB uses to store data
+                      dictionary information and other internal data
+                      structures.
+  --innodb_autoextend_increment=# 
+                      Data file autoextend increment in megabytes
+  --innodb_buffer_pool_awe_mem_mb=# 
+                      If Windows AWE is used, the size of InnoDB buffer pool
+                      allocated from the AWE memory.
+  --innodb_buffer_pool_size=# 
+                      The size of the memory buffer InnoDB uses to cache data
+                      and indexes of its tables.
+  --innodb_concurrency_tickets=# 
+                      Number of times a thread is allowed to enter InnoDB
+                      within the same     SQL query after it has once got the
+                      ticket
+  --innodb_file_io_threads=# 
+                      Number of file I/O threads in InnoDB.
+  --innodb_force_recovery=# 
+                      Helps to save your data in case the disk image of the
+                      database becomes corrupt.
+  --innodb_lock_wait_timeout=# 
+                      Timeout in seconds an InnoDB transaction may wait for a
+                      lock before being rolled back.
+  --innodb_log_buffer_size=# 
+                      The size of the buffer which InnoDB uses to write log to
+                      the log files on disk.
+  --innodb_log_file_size=# 
+                      Size of each log file in a log group.
+  --innodb_log_files_in_group=# 
+                      Number of log files in the log group. InnoDB writes to
+                      the files in a circular fashion. Value 3 is recommended
+                      here.
+  --innodb_mirrored_log_groups=# 
+                      Number of identical copies of log groups we keep for the
+                      database. Currently this should be set to 1.
+  --innodb_open_files=# 
+                      How many files at the maximum InnoDB keeps open at the
+                      same time.
+  --innodb_sync_spin_loops=# 
+                      Count of spin-loop rounds in InnoDB mutexes
+  --innodb_thread_concurrency=# 
+                      Helps in performance tuning in heavily concurrent
+                      environments.
+  --innodb_commit_concurrency=# 
+                      Helps in performance tuning in heavily concurrent
+                      environments.
+  --innodb_thread_sleep_delay=# 
+                      Time of innodb thread sleeping before joining InnoDB
+                      queue (usec). Value 0 disable a sleep
+  --interactive_timeout=# 
+                      The number of seconds the server waits for activity on an
+                      interactive connection before closing it.
+  --join_buffer_size=# 
+                      The size of the buffer that is used for full joins.
+  --key_buffer_size=# The size of the buffer used for index blocks for MyISAM
+                      tables. Increase this to get better index handling (for
+                      all reads and multiple writes) to as much as you can
+                      afford; 64M on a 256M machine that mainly runs MySQL is
+                      quite common.
+  --key_cache_age_threshold=# 
+                      This characterizes the number of hits a hot block has to
+                      be untouched until it is considered aged enough to be
+                      downgraded to a warm block. This specifies the percentage
+                      ratio of that number of hits to the total number of
+                      blocks in key cache
+  --key_cache_block_size=# 
+                      The default size of key cache blocks
+  --key_cache_division_limit=# 
+                      The minimum percentage of warm blocks in key cache
+  --long_query_time=# Log all queries that have taken more than long_query_time
+                      seconds to execute to file.
+  --lower_case_table_names[=#] 
+                      If set to 1 table names are stored in lowercase on disk
+                      and table names will be case-insensitive.  Should be set
+                      to 2 if you are using a case insensitive file system
+  --max_allowed_packet=# 
+                      Max packetlength to send/receive from to server.
+  --max_binlog_cache_size=# 
+                      Can be used to restrict the total size used to cache a
+                      multi-transaction query.
+  --max_binlog_size=# Binary log will be rotated automatically when the size
+                      exceeds this value. Will also apply to relay logs if
+                      max_relay_log_size is 0. The minimum value for this
+                      variable is 4096.
+  --max_connect_errors=# 
+                      If there is more than this number of interrupted
+                      connections from a host this host will be blocked from
+                      further connections.
+  --max_connections=# The number of simultaneous clients allowed.
+  --max_delayed_threads=# 
+                      Don't start more than this number of threads to handle
+                      INSERT DELAYED statements. If set to zero, which means
+                      INSERT DELAYED is not used.
+  --max_error_count=# Max number of errors/warnings to store for a statement.
+  --max_heap_table_size=# 
+                      Don't allow creation of heap tables bigger than this.
+  --max_join_size=#   Joins that are probably going to read more than
+                      max_join_size records return an error.
+  --max_length_for_sort_data=# 
+                      Max number of bytes in sorted records.
+  --max_relay_log_size=# 
+                      If non-zero: relay log will be rotated automatically when
+                      the size exceeds this value; if zero (the default): when
+                      the size exceeds max_binlog_size. 0 excepted, the minimum
+                      value for this variable is 4096.
+  --max_seeks_for_key=# 
+                      Limit assumed max number of seeks when looking up rows
+                      based on a key
+  --max_sort_length=# The number of bytes to use when sorting BLOB or TEXT
+                      values (only the first max_sort_length bytes of each
+                      value are used; the rest are ignored).
+  --max_tmp_tables=#  Maximum number of temporary tables a client can keep open
+                      at a time.
+  --max_user_connections=# 
+                      The maximum number of active connections for a single
+                      user (0 = no limit).
+  --max_write_lock_count=# 
+                      After this many write locks, allow some read locks to run
+                      in between.
+  --multi_range_count=# 
+                      Number of key ranges to request at once.
+  --myisam_block_size=# 
+                      Block size to be used for MyISAM index pages.
+  --myisam_data_pointer_size=# 
+                      Default pointer size to be used for MyISAM tables.
+  --myisam_max_extra_sort_file_size=# 
+                      Deprecated option
+  --myisam_max_sort_file_size=# 
+                      Don't use the fast sort index method to created index if
+                      the temporary file would get bigger than this.
+  --myisam_repair_threads=# 
+                      Number of threads to use when repairing MyISAM tables.
+                      The value of 1 disables parallel repair.
+  --myisam_sort_buffer_size=# 
+                      The buffer that is allocated when sorting the index when
+                      doing a REPAIR or when creating indexes with CREATE INDEX
+                      or ALTER TABLE.
+  --myisam_stats_method=name 
+                      Specifies how MyISAM index statistics collection code
+                      should threat NULLs. Possible values of name are
+                      "nulls_unequal" (default behavior for 4.1/5.0),
+                      "nulls_equal" (emulate 4.0 behavior), and
+                      "nulls_ignored".
+  --net_buffer_length=# 
+                      Buffer length for TCP/IP and socket communication.
+  --net_read_timeout=# 
+                      Number of seconds to wait for more data from a connection
+                      before aborting the read.
+  --net_retry_count=# If a read on a communication port is interrupted, retry
+                      this many times before giving up.
+  --net_write_timeout=# 
+                      Number of seconds to wait for a block to be written to a
+                      connection  before aborting the write.
+  --open_files_limit=# 
+                      If this is not 0, then mysqld will use this value to
+                      reserve file descriptors to use with setrlimit(). If this
+                      value is 0 then mysqld will reserve max_connections*5 or
+                      max_connections + table_cache*2 (whichever is larger)
+                      number of files.
+  --optimizer_prune_level[=#] 
+                      Controls the heuristic(s) applied during query
+                      optimization to prune less-promising partial plans from
+                      the optimizer search space. Meaning: 0 - do not apply any
+                      heuristic, thus perform exhaustive search; 1 - prune
+                      plans based on number of retrieved rows.
+  --optimizer_search_depth[=#] 
+                      Maximum depth of search performed by the query optimizer.
+                      Values larger than the number of relations in a query
+                      result in better query plans, but take longer to compile
+                      a query. Smaller values than the number of tables in a
+                      relation result in faster optimization, but may produce
+                      very bad query plans. If set to 0, the system will
+                      automatically pick a reasonable value; if set to
+                      MAX_TABLES+2, the optimizer will switch to the original
+                      find_best (used for testing/comparison).
+  --preload_buffer_size=# 
+                      The size of the buffer that is allocated when preloading
+                      indexes
+  --query_alloc_block_size=# 
+                      Allocation block size for query parsing and execution
+  --query_cache_limit=# 
+                      Don't cache results that are bigger than this.
+  --query_cache_min_res_unit=# 
+                      minimal size of unit in wich space for results is
+                      allocated (last unit will be trimed after writing all
+                      result data.
+  --query_cache_size=# 
+                      The memory allocated to store results from old queries.
+  --query_cache_type=# 
+                      0 = OFF = Don't cache or retrieve results. 1 = ON = Cache
+                      all results except SELECT SQL_NO_CACHE ... queries. 2 =
+                      DEMAND = Cache only SELECT SQL_CACHE ... queries.
+  --query_cache_wlock_invalidate 
+                      Invalidate queries in query cache on LOCK for write
+  --query_prealloc_size=# 
+                      Persistent buffer for query parsing and execution
+  --range_alloc_block_size=# 
+                      Allocation block size for storing ranges during
+                      optimization
+  --read_buffer_size=# 
+                      Each thread that does a sequential scan allocates a
+                      buffer of this size for each table it scans. If you do
+                      many sequential scans, you may want to increase this
+                      value.
+  --read_only         Make all non-temporary tables read-only, with the
+                      exception for replication (slave) threads and users with
+                      the SUPER privilege
+  --read_rnd_buffer_size=# 
+                      When reading rows in sorted order after a sort, the rows
+                      are read through this buffer to avoid a disk seeks. If
+                      not set, then it's set to the value of record_buffer.
+  --div_precision_increment=# 
+                      Precision of the result of '/' operator will be increased
+                      on that value.
+  --record_buffer=#   Alias for read_buffer_size
+  --max_sp_recursion_depth[=#] 
+                      Maximum stored procedure recursion depth. (discussed with
+                      docs).
+  --relay_log_purge   0 = do not purge relay logs. 1 = purge them as soon as
+                      they are no more needed.
+  --relay_log_space_limit=# 
+                      Maximum space to use for all relay logs.
+  --slave_compressed_protocol 
+                      Use compression on master/slave protocol.
+  --slave_net_timeout=# 
+                      Number of seconds to wait for more data from a
+                      master/slave connection before aborting the read.
+  --slave_transaction_retries=# 
+                      Number of times the slave SQL thread will retry a
+                      transaction in case it failed with a deadlock or elapsed
+                      lock wait timeout, before giving up and stopping.
+  --slow_launch_time=# 
+                      If creating the thread takes longer than this value (in
+                      seconds), the Slow_launch_threads counter will be
+                      incremented.
+  --sort_buffer_size=# 
+                      Each thread that needs to do a sort allocates a buffer of
+                      this size.
+  --sync-binlog=#     Synchronously flush binary log to disk after every #th
+                      event. Use 0 (default) to disable synchronous flushing.
+  --sync-frm          Sync .frm to disk on create. Enabled by default.
+  --sync-replication=# 
+                      Enable synchronous replication.
+  --sync-replication-slave-id=# 
+                      Synchronous replication is wished for this slave.
+  --sync-replication-timeout=# 
+                      Synchronous replication timeout.
+  --table_cache=#     The number of open tables for all threads.
+  --table_lock_wait_timeout=# 
+                      Timeout in seconds to wait for a table level lock before
+                      returning an error. Used only if the connection has
+                      active cursors.
+  --thread_cache_size=# 
+                      How many threads we should keep in a cache for reuse.
+  --thread_concurrency=# 
+                      Permits the application to give the threads system a hint
+                      for the desired number of threads that should be run at
+                      the same time.
+  --thread_stack=#    The stack size for each thread.
+  --time_format=name  The TIME format (for future).
+  --tmp_table_size=#  If an in-memory temporary table exceeds this size, MySQL
+                      will automatically convert it to an on-disk MyISAM table.
+  --transaction_alloc_block_size=# 
+                      Allocation block size for transactions to be stored in
+                      binary log
+  --transaction_prealloc_size=# 
+                      Persistent buffer for transactions to be stored in binary
+                      log
+  --updatable_views_with_limit=# 
+                      1 = YES = Don't issue an error message (warning only) if
+                      a VIEW without presence of a key of the underlying table
+                      is used in queries with a LIMIT clause for updating. 0 =
+                      NO = Prohibit update of a VIEW, which does not contain a
+                      key of the underlying table and the query uses a LIMIT
+                      clause (usually get from GUI tools).
+  --wait_timeout=#    The number of seconds the server waits for activity on a
+                      connection before closing it.
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE}  Value (after reading options)
+--------------------------------- -----------------------------
+help                              TRUE
+abort-slave-event-count           0
+allow-suspicious-udfs             FALSE
+auto-increment-increment          1
+auto-increment-offset             1
+automatic-sp-privileges           TRUE
+basedir                           /usr/local/mysql/
+bdb                               FALSE
+bind-address                      (No default value)
+character-set-client-handshake    TRUE
+character-set-server              latin1
+character-sets-dir                /usr/local/mysql/share/mysql/charsets/
+chroot                            (No default value)
+collation-server                  latin1_swedish_ci
+completion-type                   0
+concurrent-insert                 1
+console                           FALSE
+datadir                           /usr/local/mysql/data/
+default-character-set             latin1
+default-collation                 latin1_swedish_ci
+default-time-zone                 (No default value)
+disconnect-slave-event-count      0
+enable-locking                    FALSE
+enable-pstack                     FALSE
+engine-condition-pushdown         FALSE
+external-locking                  FALSE
+gdb                               FALSE
+init-connect                      (No default value)
+init-file                         (No default value)
+init-slave                        (No default value)
+innodb                            TRUE
+innodb_checksums                  TRUE
+innodb_data_home_dir              (No default value)
+innodb_doublewrite                TRUE
+innodb_fast_shutdown              1
+innodb_file_per_table             FALSE
+innodb_flush_log_at_trx_commit    1
+innodb_flush_method               (No default value)
+innodb_locks_unsafe_for_binlog    FALSE
+innodb_log_arch_dir               (No default value)
+innodb_log_group_home_dir         (No default value)
+innodb_max_dirty_pages_pct        90
+innodb_max_purge_lag              0
+innodb_status_file                FALSE
+innodb_table_locks                TRUE
+innodb_support_xa                 TRUE
+isam                              FALSE
+language                          /usr/local/mysql/share/mysql/english/
+local-infile                      TRUE
+log                               (No default value)
+log-bin                           (No default value)
+log-bin-index                     (No default value)
+log-bin-trust-routine-creators    FALSE
+log-bin-trust-function-creators   FALSE
+log-error                         
+log-isam                          myisam.log
+log-queries-not-using-indexes     FALSE
+log-short-format                  FALSE
+log-slave-updates                 FALSE
+log-slow-admin-statements         FALSE
+log-slow-queries                  (No default value)
+log-tc                            tc.log
+log-tc-size                       24576
+log-update                        (No default value)
+log-warnings                      1
+low-priority-updates              FALSE
+master-connect-retry              60
+master-host                       (No default value)
+master-info-file                  master.info
+master-password                   (No default value)
+master-port                       3306
+master-retry-count                86400
+master-ssl                        FALSE
+master-ssl-ca                     (No default value)
+master-ssl-capath                 (No default value)
+master-ssl-cert                   (No default value)
+master-ssl-cipher                 (No default value)
+master-ssl-key                    (No default value)
+master-user                       test
+max-binlog-dump-events            0
+memlock                           FALSE
+myisam-recover                    OFF
+ndbcluster                        FALSE
+new                               FALSE
+old-passwords                     FALSE
+old-style-user-limits             FALSE
+pid-file                          /usr/local/mysql/data/sleek.pid
+port                              3306
+relay-log                         (No default value)
+relay-log-index                   (No default value)
+relay-log-info-file               relay-log.info
+replicate-same-server-id          FALSE
+report-host                       (No default value)
+report-password                   (No default value)
+report-port                       3306
+report-user                       (No default value)
+rpl-recovery-rank                 0
+safe-user-create                  FALSE
+secure-auth                       FALSE
+server-id                         0
+show-slave-auth-info              FALSE
+skip-grant-tables                 FALSE
+skip-slave-start                  FALSE
+slave-load-tmpdir                 /var/tmp/
+socket                            /tmp/mysql.sock
+sporadic-binlog-dump-fail         FALSE
+sql-mode                          OFF
+symbolic-links                    TRUE
+tc-heuristic-recover              (No default value)
+temp-pool                         TRUE
+timed_mutexes                     FALSE
+tmpdir                            (No default value)
+use-symbolic-links                TRUE
+verbose                           TRUE
+warnings                          1
+back_log                          50
+binlog_cache_size                 32768
+bulk_insert_buffer_size           8388608
+connect_timeout                   5
+date_format                       (No default value)
+datetime_format                   (No default value)
+default_week_format               0
+delayed_insert_limit              100
+delayed_insert_timeout            300
+delayed_queue_size                1000
+expire_logs_days                  0
+flush_time                        0
+ft_max_word_len                   84
+ft_min_word_len                   4
+ft_query_expansion_limit          20
+ft_stopword_file                  (No default value)
+group_concat_max_len              1024
+innodb_additional_mem_pool_size   1048576
+innodb_autoextend_increment       8
+innodb_buffer_pool_awe_mem_mb     0
+innodb_buffer_pool_size           8388608
+innodb_concurrency_tickets        500
+innodb_file_io_threads            4
+innodb_force_recovery             0
+innodb_lock_wait_timeout          50
+innodb_log_buffer_size            1048576
+innodb_log_file_size              5242880
+innodb_log_files_in_group         2
+innodb_mirrored_log_groups        1
+innodb_open_files                 300
+innodb_sync_spin_loops            20
+innodb_thread_concurrency         20
+innodb_commit_concurrency         0
+innodb_thread_sleep_delay         10000
+interactive_timeout               28800
+join_buffer_size                  131072
+key_buffer_size                   8388600
+key_cache_age_threshold           300
+key_cache_block_size              1024
+key_cache_division_limit          100
+long_query_time                   10
+lower_case_table_names            0
+max_allowed_packet                1048576
+max_binlog_cache_size             4294967295
+max_binlog_size                   1073741824
+max_connect_errors                10
+max_connections                   100
+max_delayed_threads               20
+max_error_count                   64
+max_heap_table_size               16777216
+max_join_size                     18446744073709551615
+max_length_for_sort_data          1024
+max_relay_log_size                0
+max_seeks_for_key                 4294967295
+max_sort_length                   1024
+max_tmp_tables                    32
+max_user_connections              0
+max_write_lock_count              4294967295
+multi_range_count                 256
+myisam_block_size                 1024
+myisam_data_pointer_size          6
+myisam_max_extra_sort_file_size   2147483648
+myisam_max_sort_file_size         2147483647
+myisam_repair_threads             1
+myisam_sort_buffer_size           8388608
+myisam_stats_method               nulls_unequal
+net_buffer_length                 16384
+net_read_timeout                  30
+net_retry_count                   10
+net_write_timeout                 60
+open_files_limit                  0
+optimizer_prune_level             1
+optimizer_search_depth            62
+preload_buffer_size               32768
+query_alloc_block_size            8192
+query_cache_limit                 1048576
+query_cache_min_res_unit          4096
+query_cache_size                  0
+query_cache_type                  1
+query_cache_wlock_invalidate      FALSE
+query_prealloc_size               8192
+range_alloc_block_size            2048
+read_buffer_size                  131072
+read_only                         FALSE
+read_rnd_buffer_size              262144
+div_precision_increment           4
+record_buffer                     131072
+max_sp_recursion_depth            0
+relay_log_purge                   TRUE
+relay_log_space_limit             0
+slave_compressed_protocol         FALSE
+slave_net_timeout                 3600
+slave_transaction_retries         10
+slow_launch_time                  2
+sort_buffer_size                  2097144
+sync-binlog                       0
+sync-frm                          TRUE
+sync-replication                  0
+sync-replication-slave-id         0
+sync-replication-timeout          10
+table_cache                       64
+table_lock_wait_timeout           50
+thread_cache_size                 0
+thread_concurrency                10
+thread_stack                      196608
+time_format                       (No default value)
+tmp_table_size                    33554432
+transaction_alloc_block_size      8192
+transaction_prealloc_size         4096
+updatable_views_with_limit        1
+wait_timeout                      28800
+
+To see what values a running MySQL server is using, type
+'mysqladmin variables' instead of 'mysqld --verbose --help'.
+

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


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

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


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

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


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

Modified: trunk/connector-mxj/src/com/mysql/management/AcceptanceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/AcceptanceTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/AcceptanceTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -29,7 +29,6 @@
 
 import com.mysql.management.util.Files;
 import com.mysql.management.util.QuietTestCase;
-import com.mysql.management.util.Shell;
 import com.mysql.management.util.Str;
 import com.mysql.management.util.TestUtil;
 
@@ -40,23 +39,18 @@
 public class AcceptanceTest extends QuietTestCase {
 
     private Connection conn = null;
-
     private Statement stmt = null;
-
     private ResultSet rs = null;
 
+    private File tmpDir;
     private MysqldResourceI mysqld;
 
-    private File baseDir;
+    private Files fileUtil;
 
-    Files fileUtil;
-
-    Shell.Factory shellFactory;
-
     protected void setUp() {
         super.setUp();
         fileUtil = new Files();
-        shellFactory = new Shell.Factory();
+        tmpDir = new Files().testDir();
     }
 
     protected void tearDown() {
@@ -92,22 +86,22 @@
                 e.printStackTrace();
             }
         }
-
-        if (baseDir != null) {
-            new Files().deleteTree(baseDir);
-        }
     }
 
     public void testMain() throws Exception {
         TestUtil testUtil = new TestUtil();
         int port1 = testUtil.testPort();
+        File baseDir1 = new File(tmpDir, "cmxj-dir.1");
+
         String url1 = "jdbc:mysql://127.0.0.1:" + port1 + "/test";
-        String[] startArgs1 = new String[] { "--port=" + port1 };
-        String[] stopArgs1 = new String[] { "--shutdown" };
+        String[] startArgs1 = new String[] { "--port=" + port1,
+                "--" + MysqldResourceI.BASEDIR + "=" + baseDir1 };
+        String[] stopArgs1 = new String[] {
+                "--" + MysqldResourceI.BASEDIR + "=" + baseDir1, "--shutdown" };
 
         int port2 = port1 + 1000;
         String url2 = "jdbc:mysql://127.0.0.1:" + port2 + "/test";
-        File baseDir2 = new File(new Files().tmp(), "cmxj-dir2");
+        File baseDir2 = new File(tmpDir, "cmxj-dir.2");
         String[] startArgs2 = new String[] {
                 "--" + MysqldResourceI.PORT + "=" + port2,
                 "--" + MysqldResourceI.BASEDIR + "=" + baseDir2 };
@@ -143,10 +137,10 @@
 
     public void testCreateUser() throws Exception {
         // resetOutAndErr();
-        baseDir = new File(new Files().tmp(), "mxj-user-test");
-        fileUtil.deleteTree(baseDir);
-        mysqld = new MysqldResource(baseDir);
-        baseDir.mkdirs();
+        File baseDir3 = new File(tmpDir, "mxj-user-test");
+        fileUtil.deleteTree(baseDir3);
+        mysqld = new MysqldResource(baseDir3);
+        baseDir3.mkdirs();
 
         Map params = new HashMap();
         int port = new TestUtil().testPort();

Modified: trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/HelpOptionsParser.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.StringReader;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import com.mysql.management.util.Exceptions;
@@ -57,7 +57,7 @@
         String trimmed = trimToOptions(help);
         Exceptions.Block lineReader = newLineReader(trimmed);
 
-        Map map = new HashMap();
+        Map map = new LinkedHashMap();
         while (true) {
             String line = lineReader.exec();
             if (line == null) {

Modified: trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -38,7 +38,7 @@
 
         String resourceVersionDir = MysqldResourceI.DEFAULT_VERSION.replaceAll(
                 "\\.", "-");
-        assertEquals("5-0-16", resourceVersionDir);
+        assertEquals("5-0-17", resourceVersionDir);
         String sampleHelp = resourceVersionDir
                 + "/com/mysql/management/MySQL_Help.txt";
 
@@ -51,9 +51,10 @@
                 new Utils());
         Map parsed = parser.getOptionsFromHelp(help);
         assertEquals("/usr/local/mysql/", parsed.get(MysqldResourceI.BASEDIR));
-        assertEquals("TRUE", parsed.get("bdb"));
+        assertEquals("FALSE", parsed.get("bdb"));
         // assertEquals("(No default value)", parsed.get("time-format"));
-        assertEquals("", parsed.get("time-format"));
+        assertTrue(parsed.containsKey("time_format"));
+        assertEquals("", parsed.get("time_format"));
     }
 
     public void testTrimOptionsErrorMsg() {

Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResource.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResource.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResource.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -84,11 +84,7 @@
         this.optionParser = new HelpOptionsParser(err, utils);
         this.versionString = MysqldResourceI.DEFAULT_VERSION;
         this.killDelay = 30000;
-        if (baseDir.equals(utils.files().nullFile())) {
-            this.baseDir = new File(utils.files().tmp(), "mysql-c.mxj");
-        } else {
-            this.baseDir = baseDir;
-        }
+        this.baseDir = validBaseDir(baseDir);
         this.pidFile = null;
         this.msgPrefix = "[" + utils.str().shortClassName(getClass()) + "] ";
         this.options = new HashMap();
@@ -151,6 +147,19 @@
         setReadyForConnection(ready);
     }
 
+    final File validBaseDir(File dir) {
+        if (dir == null || dir.equals(utils.files().nullFile())) {
+            return utils.files().tmp("mysql-c.mxj");
+        }
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+        if (!dir.isDirectory()) {
+            throw new IllegalArgumentException(dir + " not a directory");
+        }
+        return dir;
+    }
+
     private void setReadyForConnection(boolean ready) {
         readyForConnections = ready;
     }
@@ -264,7 +273,7 @@
             printWarning("Not running? File not found: " + pidFile());
             return;
         }
-        
+
         new ProcessUtil(pid(), err, err, baseDir, utils).killNoThrow();
         waitForProcessToDie();
     }
@@ -546,23 +555,23 @@
         if (clop.containsKey("help")) {
             printUsage(System.out);
             return;
-        } 
-        	
+        }
+
         PrintStream out = System.out;
         PrintStream err = System.err;
         if (clop.containsKey("silent")) {
-        	clop.remove("silent");
-        	PrintStream devNull = new NullPrintStream();
-        	out = devNull;
-        	err = devNull;
-        } 
-        
+            clop.remove("silent");
+            PrintStream devNull = new NullPrintStream();
+            out = devNull;
+            err = devNull;
+        }
+
         MysqldResource mysqld = new MysqldResource(clop.getBaseDir(), out, err);
         if (clop.isShutdown()) {
             mysqld.shutdown();
             return;
         }
-        
+
         mysqld.start(new Threads().newName(), clop.asMap());
     }
 }
\ No newline at end of file

Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceI.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -25,7 +25,7 @@
  */
 public interface MysqldResourceI {
     public static final String PORT = "port";
-    public static final String DEFAULT_VERSION = "5.0.16";
+    public static final String DEFAULT_VERSION = "5.0.17";
     public static final String PID_FILE = "pid-file";
     public static final String BASEDIR = "basedir";
     public static final String DATADIR = "datadir";

Modified: trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/MysqldResourceTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -19,6 +19,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -47,6 +48,7 @@
     private TestFileUtil fileUtil;
     private TestUtil testUtil;
     private Utils utils;
+    private File baseDir;
 
     protected void setUp() {
         super.setUp();
@@ -55,19 +57,19 @@
         utils = new Utils(fileUtil, new Shell.Factory(), new Streams(),
                 new Threads(), new Str());
 
-        mysqldResource = new MysqldResource(fileUtil.nullFile(), System.out,
-                System.err, utils);
-        mysqldResource.setKillDelay(10000);
-        File baseDir = mysqldResource.getBaseDir();
+        baseDir = new File(fileUtil.testDir(), "MRTest");
         fileUtil.deleteTree(baseDir);
         if (baseDir.exists()) {
             warn("residual files");
         }
+
+        mysqldResource = new MysqldResource(baseDir, System.out, System.err,
+                utils);
+        mysqldResource.setKillDelay(10000);
     }
 
     protected void tearDown() {
         utils.threads().pause(50);
-        File baseDir = mysqldResource.getBaseDir();
         try {
             if (mysqldResource.isRunning()) {
                 mysqldResource.shutdown();
@@ -246,8 +248,7 @@
     public void testTestReporting() {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PrintStream captured = new PrintStream(baos);
-        mysqldResource = new MysqldResource(fileUtil.nullFile(), captured,
-                captured, utils);
+        mysqldResource = new MysqldResource(baseDir, captured, captured, utils);
 
         mysqldResource.reportIfNoPidfile(true);
         captured.flush();
@@ -257,7 +258,7 @@
         captured.flush();
         String output = new String(baos.toByteArray());
         testUtil.assertContainsIgnoreCase(output, "pid-file not found");
-        testUtil.assertContainsIgnoreCase(output, fileUtil.tmp().toString());
+        testUtil.assertContainsIgnoreCase(output, baseDir.toString());
     }
 
     public void testForceKill() {
@@ -294,7 +295,7 @@
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PrintStream captured = new PrintStream(baos);
 
-        mysqldResource = new MysqldResource(fileUtil.nullFile(), captured,
+        mysqldResource = new MysqldResource(fileUtil.testDir(), captured,
                 captured, utils);
         mysqldResource.finalize();
         captured.flush();
@@ -333,6 +334,29 @@
         assertEquals("share_dir.jar", mysqldResource.shareJar());
     }
 
+    public void testValidBaseDir() throws Exception {
+        File defaultBaseDir = fileUtil.tmp("mysql-c.mxj");
+        assertEquals(defaultBaseDir, mysqldResource.validBaseDir(null));
+        assertEquals(defaultBaseDir, mysqldResource.validBaseDir(fileUtil
+                .nullFile()));
+        
+        File foo = new File(fileUtil.testDir(), "junkFile.txt");
+        foo.deleteOnExit();
+        FileOutputStream fos = new FileOutputStream(foo);
+        PrintStream ps = new PrintStream(fos);
+        ps.println("junk");
+        ps.close();
+
+        IllegalArgumentException iae = null;
+        try {
+            mysqldResource.validBaseDir(foo);
+        } catch (IllegalArgumentException e) {
+            iae = e;
+        }
+        assertNotNull(iae);
+        testUtil.assertContainsIgnoreCase(iae.getMessage(), "directory");
+    }
+
     // -------------------
     private static class TestFileUtil extends Files {
         private List execFiles = new ArrayList();

Modified: trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/AcceptanceTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -17,6 +17,7 @@
  */
 package com.mysql.management.driverlaunched;
 
+import com.mysql.management.util.Files;
 import com.mysql.management.util.QuietTestCase;
 import com.mysql.management.util.TestUtil;
 
@@ -27,11 +28,20 @@
 public class AcceptanceTest extends QuietTestCase {
 
     private int port;
+    private String orig;
 
+    protected void setUp() {
+        super.setUp();
+        orig = System.getProperty(Files.USE_TEST_DIR, "");
+        System.setProperty(Files.USE_TEST_DIR, Boolean.TRUE.toString());
+    }
+
     protected void tearDown() {
+        super.tearDown();
         try {
             ServerLauncherSocketFactory.shutdown(port);
         } finally {
+            System.setProperty(Files.USE_TEST_DIR, orig);
             super.tearDown();
         }
     }

Modified: trunk/connector-mxj/src/com/mysql/management/jmx/AcceptanceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/AcceptanceTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/AcceptanceTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -23,6 +23,7 @@
 import com.mysql.management.MysqldResource;
 import com.mysql.management.MysqldResourceI;
 import com.mysql.management.jmx.jboss.JBossMysqldDynamicMBean;
+import com.mysql.management.util.Files;
 import com.mysql.management.util.QuietTestCase;
 import com.mysql.management.util.TestUtil;
 import com.mysql.management.util.Threads;
@@ -38,7 +39,14 @@
     private SimpleMysqldDynamicMBean bean;
 
     private Threads threads = new Threads();
+    private String orig;
 
+    protected void setUp() {
+        super.setUp();
+        orig = System.getProperty(Files.USE_TEST_DIR, "");
+        System.setProperty(Files.USE_TEST_DIR, Boolean.TRUE.toString());
+    }
+
     protected void tearDown() {
         try {
             if (bean != null) {
@@ -54,6 +62,7 @@
                 agent.shutdown();
             }
         } finally {
+            System.setProperty(Files.USE_TEST_DIR, orig);
             super.tearDown();
         }
     }

Modified: trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBean.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBean.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/MysqldDynamicMBean.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -17,6 +17,8 @@
  */
 package com.mysql.management.jmx;
 
+import java.io.File;
+
 import javax.management.Attribute;
 import javax.management.AttributeNotFoundException;
 

Modified: trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/SimpleMysqldDynamicMBean.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -17,6 +17,7 @@
  */
 package com.mysql.management.jmx;
 
+import java.io.File;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -101,14 +102,12 @@
     private void initConstructors() {
         Constructor[] constructors = this.getClass().getConstructors();
         Constructor con = null;
-        int i = 0;
-        while (con == null) {
+        for(int i = 0; con == null && i < constructors.length; i++) {
             if (constructors[i].getParameterTypes().length == 0)
                 con = constructors[i];
         }
         consInfo = new MBeanConstructorInfo[1];
         consInfo[0] = new MBeanConstructorInfo("MySQL", con);
-
     }
 
     private void initAttributes() {

Modified: trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBean.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBean.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBean.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -17,6 +17,8 @@
  */
 package com.mysql.management.jmx.jboss;
 
+import java.io.File;
+
 import javax.management.MBeanOperationInfo;
 import javax.management.ReflectionException;
 

Modified: trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/jmx/jboss/JBossMysqldDynamicMBeanTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -27,6 +27,7 @@
 import com.mysql.management.MysqldResourceI;
 import com.mysql.management.MysqldResourceTestImpl;
 import com.mysql.management.jmx.SimpleMysqldDynamicMBean;
+import com.mysql.management.util.Files;
 
 /**
  * @author Eric Herman <eric@stripped>
@@ -34,7 +35,19 @@
  *          eherman Exp $
  */
 public class JBossMysqldDynamicMBeanTest extends TestCase {
+    private String orig;
 
+    protected void setUp() throws Exception {
+        super.setUp();
+        orig = System.getProperty(Files.USE_TEST_DIR, "");
+        System.setProperty(Files.USE_TEST_DIR, Boolean.TRUE.toString());
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        System.setProperty(Files.USE_TEST_DIR, orig);
+    }
+
     public void testNoAutoStart() throws Exception {
         MysqldResourceI mysqld = new MysqldResourceTestImpl();
         JBossMysqldDynamicMBean myBean = new JBossMysqldDynamicMBean(mysqld);

Deleted: trunk/connector-mxj/src/com/mysql/management/util/AcceptanceTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/AcceptanceTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/util/AcceptanceTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -1,60 +0,0 @@
-/*
- Copyright (C) 2004 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as 
- published by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- */
-package com.mysql.management.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eric Herman <eric@stripped>
- * @version $Id: AcceptanceTest.java,v 1.3 2005/07/05 21:19:40 eherman Exp $
- */
-public class AcceptanceTest extends QuietTestCase {
-
-    public void testPlatformMain() {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        System.setOut(new PrintStream(baos));
-
-        List propKeys = new ArrayList();
-        propKeys.add("java.vm.vendor");
-        propKeys.add("java.vm.version");
-        propKeys.add("os.name");
-        propKeys.add("os.arch");
-        propKeys.add("os.version");
-
-        Map pairs = new LinkedHashMap();
-        for (int i = 0; i < propKeys.size(); i++) {
-            String propertyKey = (String) propKeys.get(i);
-            pairs.put(propertyKey, System.getProperty(propertyKey));
-        }
-
-        Platform.main(new String[0]);
-
-        String output = new String(baos.toByteArray());
-
-        for (Iterator it = pairs.entrySet().iterator(); it.hasNext();) {
-            String propEqVal = it.next().toString();
-            assertTrue(output.indexOf(propEqVal) >= 0);
-        }
-    }
-}
\ No newline at end of file

Modified: trunk/connector-mxj/src/com/mysql/management/util/AllTestsSuite.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/AllTestsSuite.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/util/AllTestsSuite.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -21,8 +21,6 @@
         suite.addTestSuite(StreamConnectorTest.class);
         suite.addTestSuite(StrTest.class);
 
-        suite.addTestSuite(AcceptanceTest.class);
-
         return suite;
     }
 }

Modified: trunk/connector-mxj/src/com/mysql/management/util/Files.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/Files.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/util/Files.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -29,6 +29,7 @@
 public class Files {
 
     public static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
+    public static final String USE_TEST_DIR = "cmxj.files.use-test-dir";
 
     private Shell.Factory shellFactory;
     private char separatorChar;
@@ -44,10 +45,22 @@
         this.streams = streams;
     }
 
+    public File testDir() {
+        return new File(tmp(), "test-c.mxj");
+    }
+
     public File tmp() {
         return new File(System.getProperty(JAVA_IO_TMPDIR));
     }
 
+    public File tmp(String subdir) {
+        String useTestDir = System.getProperty(USE_TEST_DIR);
+        if (Boolean.TRUE.toString().equalsIgnoreCase(useTestDir)) {
+            return new File(testDir(), subdir);
+        }
+        return new File(tmp(), subdir);
+    }
+
     /**
      * Depth First traversal of the directory. Attempts to delete every file in
      * the structure.

Modified: trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/util/FilesTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -41,11 +41,11 @@
         assertNotNull(property);
         File javaTmp = new File(property);
         assertEquals(javaTmp.getPath(), true, javaTmp.exists());
-        assertEquals(javaTmp, fileUtil.tmp());
+        assertEquals(javaTmp, fileUtil.testDir().getParentFile());
     }
 
     public void testDeleteTree() throws FileNotFoundException {
-        File foo = new File(fileUtil.tmp(), "foo");
+        File foo = new File(fileUtil.testDir(), "foo");
         File bar = new File(foo, "bar");
         bar.mkdirs();
         assertEquals(true, bar.exists());

Modified: trunk/connector-mxj/src/com/mysql/management/util/PlatformTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/PlatformTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/util/PlatformTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -18,10 +18,14 @@
 package com.mysql.management.util;
 
 import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import junit.framework.TestCase;
@@ -65,5 +69,31 @@
         platform.report(keys);
         // System.out.println(out.toString());
     }
+ 
+    public void testPlatformMain() {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        System.setOut(new PrintStream(baos));
 
-}
\ No newline at end of file
+        List propKeys = new ArrayList();
+        propKeys.add("java.vm.vendor");
+        propKeys.add("java.vm.version");
+        propKeys.add("os.name");
+        propKeys.add("os.arch");
+        propKeys.add("os.version");
+
+        Map pairs = new LinkedHashMap();
+        for (int i = 0; i < propKeys.size(); i++) {
+            String propertyKey = (String) propKeys.get(i);
+            pairs.put(propertyKey, System.getProperty(propertyKey));
+        }
+
+        Platform.main(new String[0]);
+
+        String output = new String(baos.toByteArray());
+
+        for (Iterator it = pairs.entrySet().iterator(); it.hasNext();) {
+            String propEqVal = it.next().toString();
+            assertTrue(output.indexOf(propEqVal) >= 0);
+        }
+    }
+}

Modified: trunk/connector-mxj/src/com/mysql/management/util/ProcessUtil.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ProcessUtil.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/util/ProcessUtil.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -32,14 +32,10 @@
     private Utils utils;
     private File installDir;
 
-    public ProcessUtil(String pid, PrintStream out, PrintStream err) {
-        this(pid, out, err, new Utils());
+    public ProcessUtil(String pid, PrintStream out, PrintStream err, File installDir) {
+        this(pid, out, err, installDir, new Utils());
     }
 
-    public ProcessUtil(String pid, PrintStream out, PrintStream err, Utils utils) {
-        this(pid, out, err, utils.files().tmp(), utils);
-    }
-
     public ProcessUtil(String pid, PrintStream out, PrintStream err,
             File installDir, Utils utils) {
         this.installDir = installDir;

Modified: trunk/connector-mxj/src/com/mysql/management/util/ProcessUtilTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ProcessUtilTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/util/ProcessUtilTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -1,18 +1,22 @@
 package com.mysql.management.util;
 
 import java.io.File;
+import java.io.PrintStream;
 
 import junit.framework.TestCase;
 
 public class ProcessUtilTest extends TestCase {
+    private File dir = new File(new Files().testDir(), "ProcUtiTest");
+    private PrintStream devNull = new NullPrintStream();
+    
     public void testNullPid() {
-        ProcessUtil kp = new ProcessUtil(null, null, null);
+        ProcessUtil kp = new ProcessUtil(null, devNull, devNull, dir);
         assertEquals("-1", kp.pid());
     }
 
     public void testPidWithEOL() {
         String pid = " 3343\n";
-        ProcessUtil kp = new ProcessUtil(pid, null, null);
+        ProcessUtil kp = new ProcessUtil(pid, devNull, devNull, dir);
         assertEquals("3343", kp.pid());
     }
 
@@ -24,7 +28,7 @@
             }
         });
         String pid = "2342";
-        ProcessUtil kp = new ProcessUtil(pid, null, null, utils);
+        ProcessUtil kp = new ProcessUtil(pid, devNull, devNull, dir, utils);
         String[] args = kp.killArgs(false);
         assertEquals(args[0], "kill");
         assertEquals(pid, args[args.length - 1]);
@@ -38,21 +42,21 @@
             }
         });
         String pid = "2342";
-        ProcessUtil kp = new ProcessUtil(pid, null, null, utils);
+        ProcessUtil kp = new ProcessUtil(pid, devNull, devNull, dir, utils);
         String[] args = kp.killArgs(false);
         assertTrue(args[0], args[0].endsWith("kill.exe"));
         assertEquals(pid, args[args.length - 1]);
     }
 
     public void testForce() {
-        ProcessUtil kp = new ProcessUtil("4321", null, null);
+        ProcessUtil kp = new ProcessUtil("4321",  devNull, devNull, dir);
         String[] args = kp.killArgs(true);
         assertEquals("-9", args[1]);
     }
 
     public void testIsRunning() {
         String pid = "5234";
-        ProcessUtil kp = new ProcessUtil(pid, null, null);
+        ProcessUtil kp = new ProcessUtil(pid,  devNull, devNull, dir);
         String[] args = kp.isRunningArgs();
         new TestUtil().assertContainsIgnoreCase(args[0], "kill");
         assertEquals("-0", args[1]);
@@ -60,7 +64,7 @@
     }
 
     public void testFileCreation() {
-        ProcessUtil pu = new ProcessUtil("1234", null, null);
+        ProcessUtil pu = new ProcessUtil("1234",  devNull, devNull, dir);
         File winKill;
         winKill = pu.getWindowsKillFile();
         assertTrue(winKill.exists());

Modified: trunk/connector-mxj/src/com/mysql/management/util/ShellTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/util/ShellTest.java	2005-12-12 18:15:40 UTC (rev 9)
+++ trunk/connector-mxj/src/com/mysql/management/util/ShellTest.java	2005-12-25 22:21:51 UTC (rev 10)
@@ -94,7 +94,7 @@
     public void testSetters() {
         shell.setRuntime(new RuntimeI.Default());
         shell.setEnvironment(new String[0]);
-        shell.setWorkingDir(new Files().tmp());
+        shell.setWorkingDir(new Files().testDir());
         shell.run();
         assertTrue(shell.hasReturned());
         assertEquals(1, shell.returnCode());

Thread
Connector/MXJ commit: r10 - in trunk/connector-mxj: . commercial commercial/5-0-17 commercial/5-0-17/Linux-i386 commercial/5-0-17/Mac OS X-ppc commerc...eherman25 Dec