bk commit into 5.0 tree (patg:1.1959) BUG#12597

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.0 repository of patg. When patg 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.1959 05/09/10 00:48:24 patg@stripped +1 -0
  BUG #12597 after merge, needed to produce results

  mysql-test/r/mysqldump.result
    1.65 05/09/10 00:47:58 patg@stripped +0 -2
    BUG #12597 - new results file because of merge of test and results file

# 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:	patg
# Host:	radha.local
# Root:	/Users/patg/mysql-build/mysql-5.0.bug12597

--- 1.64/mysql-test/r/mysqldump.result	2005-09-10 00:29:45 +02:00
+++ 1.65/mysql-test/r/mysqldump.result	2005-09-10 00:47:58 +02:00
@@ -1875,7 +1875,6 @@
 end if;
 end	BEFORE	#	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
 DROP TABLE t1, t2;
-
 DROP TABLE IF EXISTS `test1`;
 Warnings:
 Note	1051	Unknown table 'test1'
@@ -1907,7 +1906,6 @@
 DROP TRIGGER testref;
 DROP TABLE test1;
 DROP TABLE test2;
-
 CREATE TABLE t1 (id int);
 INSERT INTO t1 VALUES(1);
 INSERT INTO t1 VALUES(2);