diff options
| author | unknown <brian@zim.(none)> | 2007-12-20 12:32:16 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2007-12-20 12:32:16 -0800 |
| commit | 77538eeb46bb8d61d48981af4e9eba024e9c9e41 (patch) | |
| tree | be163b35724401d8fe39e083383c5b99cbb3c398 /mysql-test/r/mysqlslap.result | |
| parent | 7213ca204dc3d10f751ca2507321eede1238d6cb (diff) | |
| parent | 9603ebc45c684a895bf2413a05ef01772851e507 (diff) | |
| download | mariadb-git-77538eeb46bb8d61d48981af4e9eba024e9c9e41.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into zim.(none):/home/bk/mysql-5.1-arch
client/client_priv.h:
Auto merged
client/mysqlslap.c:
Auto merged
mysql-test/r/mysqlslap.result:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqlslap.result')
| -rw-r--r-- | mysql-test/r/mysqlslap.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/r/mysqlslap.result index 9207dd48d0e..4cb01490407 100644 --- a/mysql-test/r/mysqlslap.result +++ b/mysql-test/r/mysqlslap.result @@ -177,13 +177,17 @@ INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); SET AUTOCOMMIT=0; SHOW TABLES; +SET AUTOCOMMIT=0; select * from t1; +COMMIT; select * from t2; COMMIT; select * from t1; +COMMIT; select * from t2; COMMIT; select * from t1; +COMMIT; select * from t2; COMMIT; COMMIT; @@ -199,13 +203,17 @@ INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); SET AUTOCOMMIT=0; SHOW TABLES; +SET AUTOCOMMIT=0; select * from t1; +COMMIT; select * from t2; COMMIT; select * from t1; +COMMIT; select * from t2; COMMIT; select * from t1; +COMMIT; select * from t2; COMMIT; COMMIT; |