From 6ffe593ddca98f77348ea9a15c88c4ec643a7d6c Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Mon, 6 Mar 2006 12:21:42 +0100
Subject: [PATCH] Fix merge error, missing "," in result file

---
 mysql-test/r/bdb_gis.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/bdb_gis.result b/mysql-test/r/bdb_gis.result
index 969cdb34788..b1a74eac2da 100644
--- a/mysql-test/r/bdb_gis.result
+++ b/mysql-test/r/bdb_gis.result
@@ -11,7 +11,7 @@ CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);
 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