diff options
author | unknown <brian@piggy.tangent.org> | 2007-08-20 13:25:53 -0700 |
---|---|---|
committer | unknown <brian@piggy.tangent.org> | 2007-08-20 13:25:53 -0700 |
commit | ffc7ef56a3f75cb60fb5c276862b6214354c464b (patch) | |
tree | 11d99899e13c4e310d5944dff64bc1caf880a1c6 /mysql-test | |
parent | 73c60e9db017150c2c42b7b3c9fa7cb57f0b503f (diff) | |
parent | a56ade56ab9695a465ae5c9d08b36fd3056f85ce (diff) | |
download | mariadb-git-ffc7ef56a3f75cb60fb5c276862b6214354c464b.tar.gz |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into piggy.tangent.org:/home/mysql/trees/mysql-5.1-arch
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/t/mysqlslap.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/t/mysqlslap.test index 192aefb0e03..dffa226d101 100644 --- a/mysql-test/t/mysqlslap.test +++ b/mysql-test/t/mysqlslap.test @@ -38,3 +38,5 @@ --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" --post-query="SHOW TABLES" --pre-query="SHOW TABLES"; --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" --post-query="SHOW TABLES" --pre-query="SHOW TABLES" --number-of-queries=6 --commit=1; + +--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=1 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-add-autoincrement --auto-generate-sql-load-type=write --detach=2 |