diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-24 19:26:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-24 20:36:03 +0300 |
| commit | db203d7471b87395f344db4f8302065c085ab975 (patch) | |
| tree | faeb80ed57e2d8e70b4636a36659de88290cb96d /mysql-test/suite/innodb/t/innodb-32k.test | |
| parent | 433050562965d83228bcab0d39c8ec64058fe8e3 (diff) | |
| parent | 44ed24352212ed23bbc13ef0badedf41e87c3aad (diff) | |
| download | mariadb-git-db203d7471b87395f344db4f8302065c085ab975.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-32k.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-32k.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-32k.test b/mysql-test/suite/innodb/t/innodb-32k.test index 65c1d4bbc76..356746e8ec4 100644 --- a/mysql-test/suite/innodb/t/innodb-32k.test +++ b/mysql-test/suite/innodb/t/innodb-32k.test @@ -294,13 +294,14 @@ UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c, CREATE INDEX t1f17 ON t1 (v(767)); ---error 1713 +BEGIN; UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d,f=@d,g=@d,h=@d,i=@d,j=@d, k=@d,l=@d,m=@d,n=@d,o=@d,p=@d,q=@d,r=@d,s=@d,t=@d,u=@d, v=@d,w=@d,x=@d,y=@d,z=@d, aa=@d,ba=@d,ca=@d,da=@d,ea=@d,fa=@d,ga=@d,ha=@d,ia=@d,ja=@d, ka=@d,la=@d,ma=@d,na=@d,oa=@d,pa=@d,qa=@d,ra=@d,sa=@d,ta=@d,ua=@d, va=@d,wa=@d,xa=@d,ya=@d,za=@d; +ROLLBACK; BEGIN; UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d; |