diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-10 08:00:17 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-10 08:00:17 +0100 |
| commit | 1b93e6d8d0b728ccc668cf0e7df157ea7fb49836 (patch) | |
| tree | eba201c3d69340c5e3a52288cac32f2054da1713 /mysql-test/t/mysqlslap.test | |
| parent | 874fea6d2859b6796713c4f127a2f37fe83f58a2 (diff) | |
| parent | 7a793314613abe798091c619e2542086e1a768f1 (diff) | |
| download | mariadb-git-1b93e6d8d0b728ccc668cf0e7df157ea7fb49836.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqlslap.result:
Real output produced, remove "echo"
mysql-test/t/mysqlslap.test:
Real output produced, remove "echo"
Diffstat (limited to 'mysql-test/t/mysqlslap.test')
| -rw-r--r-- | mysql-test/t/mysqlslap.test | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/t/mysqlslap.test index 8234659b2e6..8c2fcf7aac5 100644 --- a/mysql-test/t/mysqlslap.test +++ b/mysql-test/t/mysqlslap.test @@ -5,7 +5,6 @@ --exec $MYSQL_SLAP --silent --concurrency=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --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 --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" |