summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqlslap.test
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-01-01 20:08:45 -0800
committerunknown <brian@zim.(none)>2006-01-01 20:08:45 -0800
commit9b9af86ac07df7ff2557ea5870879223d221cb33 (patch)
treef17979f0696d8e5de6513ec2d97d0bdd2f3e6da1 /mysql-test/t/mysqlslap.test
parentdcab4ab1ade429cfc5e40cc047244757f8dfb518 (diff)
downloadmariadb-git-9b9af86ac07df7ff2557ea5870879223d221cb33.tar.gz
Cleaned up memory allocation to be a little more staight forward (though I suspect someone will hate my sizeof() increment).
Nothing really to see here. Updated comments in code. More comments are probably needed, but isn't that always the case? client/mysqlslap.c: Updated docs. Removed complicated malloc calls with a single malloc. Cleaned up the way statements were be free'd (aka its now a function instead of a bunch of copy/paste). Removed older and not so accurate timediff() call. Cleaned up call to parse out concurrency. mysql-test/t/mysqlslap.test: Edited the tests to make sure we check default concurrency (we can't test concurrency normally since in theory the results could be random). You will noticed that the result was not changed.
Diffstat (limited to 'mysql-test/t/mysqlslap.test')
-rw-r--r--mysql-test/t/mysqlslap.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/t/mysqlslap.test
index b3cbebe4ff4..8234659b2e6 100644
--- a/mysql-test/t/mysqlslap.test
+++ b/mysql-test/t/mysqlslap.test
@@ -4,10 +4,10 @@
--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql
---exec $MYSQL_SLAP --only-print --concurrency=1 --iterations=20 --query="select * from t1" --create="CREATE TABLE t1 (id int, name varchar(64)); INSERT INTO t1 VALUES (1, 'This is a test')" --delimiter=";"
+--exec $MYSQL_SLAP --only-print --iterations=20 --query="select * from t1" --create="CREATE TABLE t1 (id int, name varchar(64)); INSERT INTO t1 VALUES (1, 'This is a test')" --delimiter=";"
--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=20 --query="select * from t1" --create="CREATE TABLE t1 (id int, name varchar(64)); INSERT INTO t1 VALUES (1, 'This is a test')" --delimiter=";"
---exec $MYSQL_SLAP --only-print --concurrency=1 --iterations=1 --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --engine="heap,myisam"
+--exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --engine="heap,myisam"
--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=20 --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')"