From 568dcdd1a06ca743d29af0cdd58005b64d043b0b Mon Sep 17 00:00:00 2001 From: unknown <patg@krsna.patg.net> Date: Mon, 5 Dec 2005 07:50:16 -0800 Subject: [PATCH] WORKLOG #2983 Removed --help from test. (did so already, don't know why push didn't push that previous changeset!) mysql-test/r/mysqlslap.result: WORKLOG #2983 removed --help results mysql-test/t/mysqlslap.test: WORKLOG #2983 removed --help from test --- mysql-test/r/mysqlslap.result | 68 +---------------------------------- mysql-test/t/mysqlslap.test | 1 - 2 files changed, 1 insertion(+), 68 deletions(-) diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/r/mysqlslap.result index bbef0846a1..ae38fbe940 100644 --- a/mysql-test/r/mysqlslap.result +++ b/mysql-test/r/mysqlslap.result @@ -1,67 +1 @@ -/home/patg/mysql-build/mysql-5.1-slap/client/.libs/lt-mysqlslap Ver 0.1 Distrib 5.1.3-alpha, for suse-linux (i686) -Copyright (C) 2005 MySQL AB -This software comes with ABSOLUTELY NO WARRANTY. This is free software, -and you are welcome to modify and redistribute it under the GPL license - -Run a query multiple times against the server - -Usage: /home/patg/mysql-build/mysql-5.1-slap/client/.libs/lt-mysqlslap [OPTIONS] - -Default options are read from the following files in the given order: -/etc/my.cnf ~/.my.cnf -The following groups are read: mysqlslap client -The following options may be given as the first argument: ---print-defaults Print the program argument list and exit ---no-defaults Don't read default options from any options file ---defaults-file=# Only read default options from the given file # ---defaults-extra-file=# Read this file after the global files are read - -a, --auto-generate-sql - Generate SQL where not supplied by file or command line. - -C, --compress Use compression in server/client protocol. - -l, --concurrency-load=# - Number of clients to use when loading data. - -c, --concurrency=# Number of clients to simulate for query to run. - --create=name File or string to use for create. - -d, --data=name File or string with INSERT to use for populating data. - -#, --debug[=name] Output debug log. Often this is 'd:t:o,filename'. - -F, --delimiter=name - Delimiter to use in SQL statements supplied in file or - command line. - -D, --drop-schema Drop schema if it exists prior to running and after - running. - -e, --engine=name Storage engine to use for creating the table. - -?, --help Display this help and exit. - -h, --host=name Connect to host. - -i, --iterations=# Number of iterations. - -x, --number-char-cols=# - Number of INT columns to create table with if specifying - --sql-generate-sql. - -y, --number-int-cols=# - Number of VARCHAR columns to create table with if - specifying --sql-generate-sql. - -n, --number-rows=# Number of rows to insert when loading data. - -p, --password[=name] - Password to use when connecting to server. If password is - not given it's asked from the tty. - -P, --port=# Port number to use for connection. - --protocol=name The protocol of connection (tcp,socket,pipe,memory). - -A, --skip-create-schema - Don't create a schema, use existing schema. - -L, --skip-data-load - Don't load any data, use existing data set. - -Q, --skip-query Don't run any queries. - -s, --silent Run program in silent mode - no output. - -q, --query=name Query to run or file containing query to run. - -S, --socket=name Socket file to use for connection. - --ssl Enable SSL for connection (automatically enabled with - other flags). Disable with --skip-ssl. - --ssl-key=name X509 key in PEM format (implies --ssl). - --ssl-cert=name X509 cert in PEM format (implies --ssl). - --ssl-ca=name CA file in PEM format (check OpenSSL docs, implies - --ssl). - --ssl-capath=name CA directory (check OpenSSL docs, implies --ssl). - --ssl-cipher=name SSL cipher to use (implies --ssl). - -u, --user=name User for login if not current user. - -v, --verbose More verbose output; You can use this multiple times to - get even more verbose output. - -V, --version Output version information and exit. +# this test result intentionally blank due to running in silent mode. diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/t/mysqlslap.test index 7df7f96f5e..c9a53fe6d0 100644 --- a/mysql-test/t/mysqlslap.test +++ b/mysql-test/t/mysqlslap.test @@ -1,7 +1,6 @@ # Can't run test of external client with embedded server --source include/not_embedded.inc ---exec $MYSQL_SLAP --help --exec $MYSQL_SLAP --silent --drop-schema --concurrency=5 --concurrency-load=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --number-rows=12 --auto-generate-sql --exec $MYSQL_SLAP --silent --drop-schema --concurrency=5 --concurrency-load=5 --iterations=20 --number-rows=10 --query="select * from t1" --data="INSERT INTO t1 VALUES (1, 'This is a test')" --create="CREATE TABLE t1 (id int, name varchar(64))" -- 2.30.9