bk commit into 5.0 tree (kroki:1.2096)

[kroki]

Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash 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.2096 06/04/25 17:48:57 kroki@stripped +1 -0
  Fix after manual merge.

  mysql-test/r/func_misc.result
    1.23 06/04/25 17:48:51 kroki@stripped +8 -8
    Fix after manual merge.

# 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:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-merge

--- 1.22/mysql-test/r/func_misc.result	2006-04-25 15:27:33 +04:00
+++ 1.23/mysql-test/r/func_misc.result	2006-04-25 17:48:51 +04:00
@@ -51,14 +51,6 @@
 a
 2004-01-06 12:34:00
 drop table t1;
-create table t1 as select uuid(), length(uuid());
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `uuid()` varchar(36) character set utf8 NOT NULL default '',
-  `length(uuid())` int(10) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-drop table t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (conn CHAR(7), connection_id INT);
 INSERT INTO t1 VALUES ('default', CONNECTION_ID());
@@ -95,6 +87,14 @@
 IS_USED_LOCK('bug16501')
 NULL
 DROP TABLE t1;
+create table t1 as select uuid(), length(uuid());
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `uuid()` varchar(36) character set utf8 NOT NULL default '',
+  `length(uuid())` int(10) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
 create table t1 (a timestamp default '2005-05-05 01:01:01',
 b timestamp default '2005-05-05 01:01:01');
 insert into t1 set a = now();