diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-04 09:05:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-04 09:05:45 +0300 |
| commit | b30fb701cc040cd9243a3634240672b27f78d142 (patch) | |
| tree | 2c181ef5c48a4622b0f8930418e905271777dff4 /mysql-test/include/index_merge1.inc | |
| parent | f6023857765701da780969b2628963738599865c (diff) | |
| parent | 71a2e6a3c66bc1e84809e0e91ffaef1cadc87642 (diff) | |
| download | mariadb-git-b30fb701cc040cd9243a3634240672b27f78d142.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/include/index_merge1.inc')
| -rw-r--r-- | mysql-test/include/index_merge1.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc index b63b2db78da..0fb94b96ab4 100644 --- a/mysql-test/include/index_merge1.inc +++ b/mysql-test/include/index_merge1.inc @@ -37,12 +37,14 @@ insert into t0 values (1),(2),(3),(4),(5),(6),(7),(8); let $1=7; set @d=8; +begin; while ($1) { eval insert into t0 select key1+@d from t0; eval set @d=@d*2; dec $1; } +commit; --enable_query_log alter table t0 add key2 int not null, add index i2(key2); @@ -362,6 +364,7 @@ INSERT INTO t1 VALUES ('foo','bar', 'ZZ'),('fuz','baz', 'ZZ'); --disable_query_log let $1=9; +begin; while ($1) { eval INSERT INTO t1 SELECT * from t1 WHERE cola = 'foo'; @@ -374,6 +377,7 @@ while ($1) eval INSERT INTO t1 SELECT * from t1 WHERE cola <> 'foo'; dec $1; } +commit; --enable_query_log |