diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-03-25 20:51:22 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-03-31 10:11:16 +0400 |
| commit | 282497dd6d1049b4fb963641504c2733752845a7 (patch) | |
| tree | 7288d17c29fbbe9ac47ec51f6988fb954f59a361 /mysql-test/suite/stress | |
| parent | 5052e2479e873461bebfcedbc674bbaf57d3c968 (diff) | |
| download | mariadb-git-282497dd6d1049b4fb963641504c2733752845a7.tar.gz | |
MDEV-6720 - enable connection log in mysqltest by default
Diffstat (limited to 'mysql-test/suite/stress')
| -rw-r--r-- | mysql-test/suite/stress/r/ddl_archive.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/stress/r/ddl_csv.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/stress/r/ddl_innodb.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/stress/r/ddl_memory.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/stress/r/ddl_myisam.result | 3 |
5 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/suite/stress/r/ddl_archive.result b/mysql-test/suite/stress/r/ddl_archive.result index 457fc30b9f9..f11610b6436 100644 --- a/mysql-test/suite/stress/r/ddl_archive.result +++ b/mysql-test/suite/stress/r/ddl_archive.result @@ -2,6 +2,8 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; PREPARE stmt_start FROM "SELECT UNIX_TIMESTAMP() INTO @start"; SET @runtime = <intended_runtime>; PREPARE stmt_break FROM "SELECT UNIX_TIMESTAMP() - @start > @runtime - 1"; +connect con2,localhost,root,,; +connection default; DROP TABLE IF EXISTS t1; # Subtest 2A (one connection, no PREPARE/EXECUTE) # connection action @@ -75,5 +77,6 @@ DROP TABLE IF EXISTS t1; # con2: INSERT INTO t1 SET f2 = 9 # default: SELECT f1 <> 1 OR f1 IS NULL FROM t1 WHERE f2 = 9 # con2: DROP TABLE t1 +disconnect con2; DEALLOCATE PREPARE stmt_start; DEALLOCATE PREPARE stmt_break; diff --git a/mysql-test/suite/stress/r/ddl_csv.result b/mysql-test/suite/stress/r/ddl_csv.result index 2346638360b..ed6fafe3cc5 100644 --- a/mysql-test/suite/stress/r/ddl_csv.result +++ b/mysql-test/suite/stress/r/ddl_csv.result @@ -2,6 +2,8 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; PREPARE stmt_start FROM "SELECT UNIX_TIMESTAMP() INTO @start"; SET @runtime = <intended_runtime>; PREPARE stmt_break FROM "SELECT UNIX_TIMESTAMP() - @start > @runtime - 1"; +connect con2,localhost,root,,; +connection default; DROP TABLE IF EXISTS t1; # Subtest 2A (one connection, no PREPARE/EXECUTE) # connection action @@ -51,5 +53,6 @@ DROP TABLE IF EXISTS t1; # con2: CREATE TABLE t1 (f1 BIGINT NOT NULL) ENGINE=CSV (expect to get ER_TABLE_EXISTS_ERROR) # default: DROP TABLE t1 # con2: DROP TABLE t1 (expect to get ER_BAD_TABLE_ERROR) +disconnect con2; DEALLOCATE PREPARE stmt_start; DEALLOCATE PREPARE stmt_break; diff --git a/mysql-test/suite/stress/r/ddl_innodb.result b/mysql-test/suite/stress/r/ddl_innodb.result index 911aed2622a..479f11ebbd9 100644 --- a/mysql-test/suite/stress/r/ddl_innodb.result +++ b/mysql-test/suite/stress/r/ddl_innodb.result @@ -2,6 +2,8 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; PREPARE stmt_start FROM "SELECT UNIX_TIMESTAMP() INTO @start"; SET @runtime = <intended_runtime>; PREPARE stmt_break FROM "SELECT UNIX_TIMESTAMP() - @start > @runtime - 1"; +connect con2,localhost,root,,; +connection default; DROP TABLE IF EXISTS t1; # Subtest 1A (one connection, no PREPARE/EXECUTE) # connection action @@ -247,5 +249,6 @@ DROP INDEX IDX ON t1; # con2: SHOW CREATE TABLE t1 # default: DROP INDEX IDX ON t1 DROP TABLE t1; +disconnect con2; DEALLOCATE PREPARE stmt_start; DEALLOCATE PREPARE stmt_break; diff --git a/mysql-test/suite/stress/r/ddl_memory.result b/mysql-test/suite/stress/r/ddl_memory.result index 7ad9f9a61c5..8f20636906a 100644 --- a/mysql-test/suite/stress/r/ddl_memory.result +++ b/mysql-test/suite/stress/r/ddl_memory.result @@ -2,6 +2,8 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; PREPARE stmt_start FROM "SELECT UNIX_TIMESTAMP() INTO @start"; SET @runtime = <intended_runtime>; PREPARE stmt_break FROM "SELECT UNIX_TIMESTAMP() - @start > @runtime - 1"; +connect con2,localhost,root,,; +connection default; DROP TABLE IF EXISTS t1; # Subtest 1A (one connection, no PREPARE/EXECUTE) # connection action @@ -247,5 +249,6 @@ DROP INDEX IDX ON t1; # con2: SHOW CREATE TABLE t1 # default: DROP INDEX IDX ON t1 DROP TABLE t1; +disconnect con2; DEALLOCATE PREPARE stmt_start; DEALLOCATE PREPARE stmt_break; diff --git a/mysql-test/suite/stress/r/ddl_myisam.result b/mysql-test/suite/stress/r/ddl_myisam.result index 808b22dc859..c441d0ddc05 100644 --- a/mysql-test/suite/stress/r/ddl_myisam.result +++ b/mysql-test/suite/stress/r/ddl_myisam.result @@ -2,6 +2,8 @@ SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; PREPARE stmt_start FROM "SELECT UNIX_TIMESTAMP() INTO @start"; SET @runtime = <intended_runtime>; PREPARE stmt_break FROM "SELECT UNIX_TIMESTAMP() - @start > @runtime - 1"; +connect con2,localhost,root,,; +connection default; DROP TABLE IF EXISTS t1; # Subtest 1A (one connection, no PREPARE/EXECUTE) # connection action @@ -247,5 +249,6 @@ DROP INDEX IDX ON t1; # con2: SHOW CREATE TABLE t1 # default: DROP INDEX IDX ON t1 DROP TABLE t1; +disconnect con2; DEALLOCATE PREPARE stmt_start; DEALLOCATE PREPARE stmt_break; |