bk commit into 5.0 tree (msvensson:1.1905)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1905 05/04/27 22:02:26 msvensson@neptunus.(none) +2 -0
  Little different behaviour in 5.0 and merge with new tests required these changes

  mysql-test/t/archive.test
    1.7 05/04/27 22:02:23 msvensson@neptunus.(none) +13 -11
    Changed order of tests so that the are before the unpredictable INSERT DELAYED
    Warning is produced during the rename 

  mysql-test/r/archive.result
    1.6 05/04/27 22:02:23 msvensson@neptunus.(none) +16 -14
    Changed order of tests so that the are before the unpredictable INSERT DELAYED
    Warning is produced during the rename 

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.5/mysql-test/r/archive.result	2005-04-27 12:55:57 +02:00
+++ 1.6/mysql-test/r/archive.result	2005-04-27 22:02:23 +02:00
@@ -184,6 +184,22 @@
 250503	heaving
 250504	population
 250505	bomb
+create table t3 engine=archive select * from t2;
+select * from t3 where fld3='bonfire';
+auto	fld1	companynr	fld3	fld4	fld5	fld6
[phone]	bonfire	corresponds	positively	
+select count(*) from t3;
+count(*)
+1199
+rename table t3 to t4;
+Warnings:
+Error	7	Error on rename of './test/t3.ARN' to './test/t4.ARN' (Errcode: 2)
+select * from t4 where fld3='bonfire';
+auto	fld1	companynr	fld3	fld4	fld5	fld6
[phone]	bonfire	corresponds	positively	
+select count(*) from t4;
+count(*)
+1199
 INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat','');
 INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
 INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
@@ -5020,18 +5036,4 @@
 3	011402	37	Romans	scholastics	jarring	
 4	011403	37	intercepted	audiology	tinily	
 INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-create table t3 engine=archive select * from t2;
-select * from t3 where fld3='bonfire';
-auto	fld1	companynr	fld3	fld4	fld5	fld6
-1191	068504	00	bonfire	corresponds	positively	
-select count(*) from t3;
-count(*)
-1203
-rename table t3 to t4;
-select * from t4 where fld3='bonfire';
-auto	fld1	companynr	fld3	fld4	fld5	fld6
-1191	068504	00	bonfire	corresponds	positively	
-select count(*) from t4;
-count(*)
-1203
 drop table t1, t2, t4;

--- 1.6/mysql-test/t/archive.test	2005-04-27 12:55:57 +02:00
+++ 1.7/mysql-test/t/archive.test	2005-04-27 22:02:23 +02:00
@@ -1289,6 +1289,18 @@
 select fld1,fld3 from t2 where fld1 like "25050%";
 select fld1,fld3 from t2 where fld1 like "25050_";
 
+
+#
+# Test rename of table
+#
+create table t3 engine=archive select * from t2;
+select * from t3 where fld3='bonfire';
+select count(*) from t3;
+rename table t3 to t4;
+select * from t4 where fld3='bonfire';
+select count(*) from t4;
+
+
 #
 # Test for insert after select
 #
@@ -1308,19 +1320,9 @@
 SELECT * FROM t2;
 
 # Just test syntax, we will never know if the out put is right or wrong
+# Must be the last test
 INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
 # 
 # Cleanup, test is over
 #
-
-#
-# Test rename of table
-#
-create table t3 engine=archive select * from t2;
-select * from t3 where fld3='bonfire';
-select count(*) from t3;
-rename table t3 to t4;
-select * from t4 where fld3='bonfire';
-select count(*) from t4;
-
 drop table t1, t2, t4;