diff options
| author | unknown <joerg@trift2.> | 2007-06-06 19:59:18 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-06-06 19:59:18 +0200 |
| commit | 92a46e05794ca134c8feb7190c7c21496c3134bf (patch) | |
| tree | d107f76384810baaf845921af162fd7858539c30 /client | |
| parent | 10a21ed042e39c8800893dbb8ba711d54daf4896 (diff) | |
| parent | d05a958056137ab0f5727a2b125a2fc02f71a4b9 (diff) | |
| download | mariadb-git-92a46e05794ca134c8feb7190c7c21496c3134bf.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
CMakeLists.txt:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlslap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 86f024a9b6f..546b9dee3f5 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -35,7 +35,8 @@ Supply your own create and query SQL statements, with 50 clients querying (200 selects for each): - mysqlslap --create="CREATE TABLE A (a int);INSERT INTO A (23)" \ + mysqlslap --delimiter=";" \ + --create="CREATE TABLE A (a int);INSERT INTO A VALUES (23)" \ --query="SELECT * FROM A" --concurrency=50 --iterations=200 Let the program build the query SQL statement with a table of two int @@ -554,7 +555,7 @@ static struct my_option my_long_options[] = GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"host", 'h', "Connect to host.", (uchar**) &host, (uchar**) &host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"iterations", 'i', "Number of times too run the tests.", (uchar**) &iterations, + {"iterations", 'i', "Number of times to run the tests.", (uchar**) &iterations, (uchar**) &iterations, 0, GET_UINT, REQUIRED_ARG, 1, 0, 0, 0, 0, 0}, {"number-char-cols", 'x', "Number of VARCHAR columns to create table with if specifying --auto-generate-sql ", |