summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-04-14 21:31:22 +0200
committerunknown <serg@serg.mylan>2005-04-14 21:31:22 +0200
commitc8723e7f95fa716484e0e84e179e2f4deb5fbc2a (patch)
treed216238c0859c374d61a43945a50bc97418ca099 /mysql-test/r
parent78bdb7d50d259175229195ec37614f84099cd6be (diff)
parent1403fb000b58a171b094a93b35c4f93123c15b19 (diff)
downloadmariadb-git-c8723e7f95fa716484e0e84e179e2f4deb5fbc2a.tar.gz
merged
mysql-test/r/innodb.result: Auto merged mysql-test/t/innodb.test: Auto merged
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/innodb.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 53a788ca824..6117b0a9a00 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -878,6 +878,7 @@ truncate table t1;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
commit;
truncate table t1;
+truncate table t1;
select * from t1;
a
insert into t1 values(1),(2);