bk commit into 5.1 tree (msvensson:1.2149)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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.2149 06/03/06 12:21:42 msvensson@neptunus.(none) +1 -0
  Fix merge error, missing "," in result file

  mysql-test/r/bdb_gis.result
    1.5 06/03/06 12:21:37 msvensson@neptunus.(none) +1 -1
    Fix merge error, missing "," in result 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1

--- 1.4/mysql-test/r/bdb_gis.result	2006-03-06 11:39:32 +01:00
+++ 1.5/mysql-test/r/bdb_gis.result	2006-03-06 12:21:37 +01:00
@@ -11,7 +11,7 @@
 SHOW CREATE TABLE gis_point;
 Table	Create Table
 gis_point	CREATE TABLE `gis_point` (
-  `fid` int(11) NOT NULL AUTO_INCREMENT
+  `fid` int(11) NOT NULL AUTO_INCREMENT,
   `g` point DEFAULT NULL,
   PRIMARY KEY (`fid`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1