bk commit into 4.1 tree (konstantin:1.2472) BUG#13134

[konstantin]

Below is the list of changes that have just been committed into a local
4.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2472 06/02/23 23:41:15 konstantin@stripped +4 -0
  Remove 'delayed' to make the test deterministic (already
  fixed in 5.0).
  A post-review fix (Bug#13134)

  mysql-test/t/ps.test
    1.48 06/02/23 23:41:06 konstantin@stripped +0 -1
    A post-review fix (Bug#13134)

  mysql-test/t/heap.test
    1.24 06/02/23 23:41:06 konstantin@stripped +2 -2
    Remove 'delayed' to make the test deterministic.

  mysql-test/r/ps.result
    1.47 06/02/23 23:41:06 konstantin@stripped +0 -3
    Remove an unneeded drop table (test case for Bug#13134)

  mysql-test/r/heap.result
    1.31 06/02/23 23:41:06 konstantin@stripped +2 -2
    Remove 'delayed' to make the test deterministic.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-4.1-13134

--- 1.30/mysql-test/r/heap.result	2005-11-08 08:26:31 +03:00
+++ 1.31/mysql-test/r/heap.result	2006-02-23 23:41:06 +03:00
@@ -297,11 +297,11 @@
 ERROR 23000: Duplicate entry
'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl'
for key 1
 drop table t1;
 CREATE TABLE t1 (a int, key(a)) engine=heap;
-insert delayed into t1 values (0);
+insert into t1 values (0);
 delete from t1;
 select * from t1;
 a
-insert delayed into t1 values (0), (1);
+insert into t1 values (0), (1);
 select * from t1 where a = 0;
 a
 0

--- 1.23/mysql-test/t/heap.test	2005-11-08 08:26:31 +03:00
+++ 1.24/mysql-test/t/heap.test	2006-02-23 23:41:06 +03:00
@@ -238,10 +238,10 @@
 # Bug 12796: Record doesn't show when selecting through index
 #
 CREATE TABLE t1 (a int, key(a)) engine=heap;
-insert delayed into t1 values (0);
+insert into t1 values (0);
 delete from t1;
 select * from t1;
-insert delayed into t1 values (0), (1);
+insert into t1 values (0), (1);
 select * from t1 where a = 0;
 drop table t1;
 

--- 1.46/mysql-test/r/ps.result	2006-02-21 19:52:14 +03:00
+++ 1.47/mysql-test/r/ps.result	2006-02-23 23:41:06 +03:00
@@ -733,9 +733,6 @@
 5
 deallocate prepare stmt;
 drop table t1;
-drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 't1'
 prepare stmt from 'create table t1 (a varchar(10) character set utf8)';
 execute stmt;
 insert into t1 (a) values (repeat('a', 20));

--- 1.47/mysql-test/t/ps.test	2006-02-21 19:52:15 +03:00
+++ 1.48/mysql-test/t/ps.test	2006-02-23 23:41:06 +03:00
@@ -769,7 +769,6 @@
 # recreated with PS/SP"
 #
 
-drop table if exists t1;
 prepare stmt from 'create table t1 (a varchar(10) character set utf8)';
 execute stmt;
 --disable_warnings