bk commit into 5.0 tree (tnurnberg:1.2208)

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg. When tnurnberg 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@stripped, 2006-07-19 16:50:55+02:00, tnurnberg@stripped +1 -0
  manual merge, part 2/2

  mysql-test/r/mysqldump.result@stripped, 2006-07-19 16:50:52+02:00, tnurnberg@stripped +0 -1
    manual mergies, part 2/2

# 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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/work/mysql-5.0-merge

--- 1.104/mysql-test/r/mysqldump.result	2006-07-19 16:51:02 +02:00
+++ 1.105/mysql-test/r/mysqldump.result	2006-07-19 16:51:02 +02:00
@@ -2818,7 +2818,6 @@ create database mysqldump_views;
 use mysqldump_views;
 create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_tables.basetable;
 
-
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 */;
 
 USE `mysqldump_tables`;