summaryrefslogtreecommitdiff
path: root/mysql-test/t/archive.test
diff options
context:
space:
mode:
authorramil@mysql.com <>2006-06-15 17:37:47 +0500
committerramil@mysql.com <>2006-06-15 17:37:47 +0500
commitc15a5a2b263b0d2b9e5693ca5838b54c8f3581b7 (patch)
treea1942fc7093cb1e338561642dea2dccc9a9f8893 /mysql-test/t/archive.test
parent00fcdf8c006b55eb32972a81d1d1bcd43af6a0c4 (diff)
parent26fa98a2cbed5413ff3e4899700523ddf5d81274 (diff)
downloadmariadb-git-c15a5a2b263b0d2b9e5693ca5838b54c8f3581b7.tar.gz
Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
Diffstat (limited to 'mysql-test/t/archive.test')
-rw-r--r--mysql-test/t/archive.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
index ba2ad3ed8aa..f712a770712 100644
--- a/mysql-test/t/archive.test
+++ b/mysql-test/t/archive.test
@@ -1330,12 +1330,14 @@ SELECT * FROM t2;
#
# For bug #12836
# Delete was allowing all rows to be removed
+--error 1031
DELETE FROM t2;
SELECT * FROM t2;
INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
SELECT * FROM t2;
+--error 1031
TRUNCATE TABLE t2;
SELECT * FROM t2;