Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-03-11 17:10:44+11:00, stewart@stripped +2 -0
[PATCH] WL4012: ndb_mgmd on win32: add test to check --usage doesnt arbitrarily change
mysql-test/r/ndb_tools_usage.result@stripped, 2008-03-11 17:05:31+11:00, stewart@stripped +503 -0
WL4012: ndb_mgmd on win32: add test to check --usage doesnt arbitrarily change
mysql-test/r/ndb_tools_usage.result@stripped, 2008-03-11 17:05:31+11:00, stewart@stripped +0 -0
mysql-test/t/ndb_tools_usage.test@stripped, 2008-03-11 17:05:31+11:00, stewart@stripped +36 -0
WL4012: ndb_mgmd on win32: add test to check --usage doesnt arbitrarily change
mysql-test/t/ndb_tools_usage.test@stripped, 2008-03-11 17:05:31+11:00, stewart@stripped +0 -0
diff -Nrup a/mysql-test/r/ndb_tools_usage.result b/mysql-test/r/ndb_tools_usage.result
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/ndb_tools_usage.result 2008-03-11 17:05:31 +11:00
@@ -0,0 +1,503 @@
+This program will retreive config options for a ndb cluster
+
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ --nodes Print nodes
+ --connections Print connections
+ -q, --query=name Query option(s)
+ --host=name Host
+ --type=name Type of node/connection
+ --id=# Nodeid
+ --nodeid=# Nodeid
+ -f, --fields=name Field separator
+ -r, --rows=name Row separator
+ --config-file=name Path to config.ini
+ --mycnf Read config from my.cnf
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug (No default value)
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+nodes FALSE
+connections FALSE
+query (No default value)
+host (No default value)
+type (No default value)
+id 0
+nodeid 0
+fields ,
+rows
+config-file (No default value)
+mycnf FALSE
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ -d, --database=name Name of database table is in
+ -t, --transactional Single transaction (may run out of operations)
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug d:t:O,/tmp/ndb_delete_all.trace
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+database TEST_DB
+transactional FALSE
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ -d, --database=name Name of database table is in
+ -u, --unqualified Use unqualified table names
+ -p, --extra-partition-info
+ Print more info per partition
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug d:t:O,/tmp/ndb_desc.trace
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+database TEST_DB
+unqualified FALSE
+extra-partition-info FALSE
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ -d, --database=name Name of database table is in
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug (No default value)
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+database TEST_DB
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ -d, --database=name Name of database table is in
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug (No default value)
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+database TEST_DB
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster ndb_restore
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ -c, --connect=name same as --connect-string
+ -n, --nodeid=# Backup files from node with id
+ -b, --backupid=# Backup id
+ -r, --restore_data Restore table data/logs into NDB Cluster using NDBAPI
+ -m, --restore_meta Restore meta data into NDB Cluster using NDBAPI
+ -p, --parallelism=# No of parallel transactions during restore of
+ data.(parallelism can be 1 to 1024)
+ --print Print data and log to stdout
+ --print_data Print data to stdout
+ --print_meta Print meta data to stdout
+ --print_log Print log to stdout
+ --backup_path=name Path to backup files
+ -f, --dont_ignore_systab_0
+ Experimental. Do not ignore system table during restore.
+ --fields-enclosed-by=name
+ Fields are enclosed by ...
+ --fields-terminated-by=name
+ Fields are terminated by ...
+ --fields-optionally-enclosed-by=name
+ Fields are optionally enclosed by ...
+ --hex print binary types in hex format
+ -T, --tab=name Creates tab separated textfile for each table to given
+ path. (creates .txt files)
+ --append for --tab append data to file
+ --lines-terminated-by=name
+ --verbose=# verbosity
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug d:t:O,/tmp/ndb_restore.trace
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+connect (No default value)
+nodeid 0
+backupid 0
+restore_data FALSE
+restore_meta FALSE
+parallelism 128
+print FALSE
+print_data FALSE
+print_meta FALSE
+print_log FALSE
+backup_path ./
+dont_ignore_systab_0 FALSE
+fields-enclosed-by (No default value)
+fields-terminated-by (No default value)
+fields-optionally-enclosed-by (No default value)
+hex FALSE
+tab (No default value)
+append FALSE
+lines-terminated-by (No default value)
+verbose 1
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ -d, --database=name Name of database table is in
+ -p, --parallelism=# parallelism
+ -l, --lock=# Read(0), Read-hold(1), Exclusive(2)
+ -o, --order Sort resultset according to index
+ -z, --descending Sort descending (requires order flag)
+ -h, --header Print header
+ -x, --useHexFormat Output numbers in hexadecimal format
+ -D, --delimiter=name
+ Column delimiter
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug d:t:O,/tmp/ndb_select_all.trace
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+database TEST_DB
+parallelism 0
+lock 0
+order FALSE
+descending FALSE
+header TRUE
+useHexFormat FALSE
+delimiter
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ -d, --database=name Name of database table is in
+ -p, --parallelism=# parallelism
+ -l, --lock=# Read(0), Read-hold(1), Exclusive(2)
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug d:t:O,/tmp/ndb_select_count.trace
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+database TEST_DB
+parallelism 240
+lock 0
+
+Default options are read from the following files in the given order:
+The following groups are read: mysql_cluster
+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
+
+ -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'.
+ -?, --usage Display this help and exit.
+ -?, --help Display this help and exit.
+ -V, --version Output version information and exit.
+ -c, --ndb-connectstring=name
+ Set connect string for connecting to ndb_mgmd. Syntax:
+ "[nodeid=<id>;][host=]<hostname>[:<port>]". Overrides
+ specifying entries in NDB_CONNECTSTRING and my.cnf
+ --ndb-mgmd-host=name
+ Set host and port for connecting to ndb_mgmd. Syntax:
+ <hostname>[:<port>].
+ --ndb-nodeid=# Set node id for this node.
+ --ndb-shm Allow optimizing using shared memory connections when
+ available
+ --ndb-optimized-node-selection
+ Select nodes for transactions in a more optimal way
+ -c, --connect-string=name
+ same as --ndb-connectstring
+ --core-file Write core on errors.
+ --character-sets-dir=name
+ Directory where character sets are.
+ -d, --database=name Name of database table is in
+ -l, --loops=# loops
+ -t, --type=# type
+ -u, --unqualified Use unqualified table names
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE} Value (after reading options)
+--------------------------------- -----------------------------
+debug d:t:O,/tmp/ndb_show_tables.trace
+ndb-connectstring (No default value)
+ndb-mgmd-host (No default value)
+ndb-nodeid 0
+ndb-shm FALSE
+ndb-optimized-node-selection TRUE
+connect-string (No default value)
+core-file TRUE
+character-sets-dir (No default value)
+database TEST_DB
+loops 1
+type 0
+unqualified FALSE
diff -Nrup a/mysql-test/t/ndb_tools_usage.test b/mysql-test/t/ndb_tools_usage.test
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/ndb_tools_usage.test 2008-03-11 17:05:31 +11:00
@@ -0,0 +1,36 @@
+-- source include/have_ndb.inc
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)//
+--exec $NDB_TOOLS_DIR/ndb_config --usage -no-defaults
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)//
+--replace $NDB_TOOLS_DIR NDB_TOOLS_DIR
+--exec $NDB_TOOLS_DIR/ndb_delete_all --usage
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)//
+--replace $NDB_TOOLS_DIR NDB_TOOLS_DIR
+--exec $NDB_TOOLS_DIR/ndb_desc --usage
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)//
+--replace $NDB_TOOLS_DIR NDB_TOOLS_DIR
+--exec $NDB_TOOLS_DIR/ndb_drop_index --usage
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)//
+--replace $NDB_TOOLS_DIR NDB_TOOLS_DIR
+--exec $NDB_TOOLS_DIR/ndb_drop_table --usage
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)|(Usage: \/.*)//
+--exec $NDB_TOOLS_DIR/ndb_restore --usage
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)//
+--replace $NDB_TOOLS_DIR NDB_TOOLS_DIR
+--exec $NDB_TOOLS_DIR/ndb_select_all --usage
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)//
+--replace $NDB_TOOLS_DIR NDB_TOOLS_DIR
+--exec $NDB_TOOLS_DIR/ndb_select_count --usage
+
+--replace_regex /(\/etc\/my.cnf.*)|(MySQL distrib.*)//
+--replace $NDB_TOOLS_DIR NDB_TOOLS_DIR
+--exec $NDB_TOOLS_DIR/ndb_show_tables --usage
+
| Thread |
|---|
| • bk commit into 5.0 tree (stewart:1.2524) | Stewart Smith | 11 Mar |
