bk commit into 5.0 tree (jimw:1.1942)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1942 05/05/07 08:10:10 jimw@stripped +3 -0
  Fix tests after merge

  mysql-test/t/archive.test
    1.8 05/05/07 08:09:44 jimw@stripped +2 -0
    Rewrite path for embedded server testing

  mysql-test/r/type_ranges.result
    1.33 05/05/07 08:09:34 jimw@stripped +1 -1
    Update result

  mysql-test/r/create.result
    1.88 05/05/07 08:09:24 jimw@stripped +1 -1
    Update result

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.7/mysql-test/t/archive.test	2005-04-27 13:02:23 -07:00
+++ 1.8/mysql-test/t/archive.test	2005-05-07 08:09:44 -07:00
@@ -1296,6 +1296,8 @@
 create table t3 engine=archive select * from t2;
 select * from t3 where fld3='bonfire';
 select count(*) from t3;
+# Clean up path in error message
+--replace_result $MYSQL_TEST_DIR . /var/master-data/ /
 rename table t3 to t4;
 select * from t4 where fld3='bonfire';
 select count(*) from t4;

--- 1.87/mysql-test/r/create.result	2005-05-07 05:00:37 -07:00
+++ 1.88/mysql-test/r/create.result	2005-05-07 08:09:24 -07:00
@@ -429,7 +429,7 @@
 Field	Type	Null	Key	Default	Extra
 a	int(11)	YES		NULL	
 b	bigint(11)	NO		0	
-c	bigint(10)	NO		0	
+c	bigint(11)	NO		0	
 d	date	YES		NULL	
 e	varchar(1)	NO			
 f	datetime	YES		NULL	

--- 1.32/mysql-test/r/type_ranges.result	2005-04-05 19:45:08 -07:00
+++ 1.33/mysql-test/r/type_ranges.result	2005-05-07 08:09:34 -07:00
@@ -270,7 +270,7 @@
 create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
 show full columns from t2;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-auto	int(6) unsigned	NULL	NO	PRI	0		#	
+auto	bigint(12) unsigned	NULL	NO	PRI	0		#	
 t1	bigint(1)	NULL	NO		0		#	
 t2	varchar(1)	latin1_swedish_ci	NO				#	
 t3	varchar(256)	latin1_swedish_ci	NO				#