bk commit into 5.0 tree (igor:1.2521)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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, 2007-06-07 15:04:39-07:00, igor@stripped +1 -0
  Correction to remove compilee warnings and compiler errors on Windows.

  sql/field.h@stripped, 2007-06-07 15:04:37-07:00, igor@stripped +1 -0
    Correction to remove compilee warnings and compiler errors on Windows.

# 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:	igor
# Host:	olga.mysql.com
# Root:	/home/igor/mysql-5.0-opt

--- 1.205/sql/field.h	2007-06-07 15:04:46 -07:00
+++ 1.206/sql/field.h	2007-06-07 15:04:46 -07:00
@@ -364,6 +364,7 @@
   {
     /* shouldn't get here. */
     DBUG_ASSERT(0);
+    return GEOM_GEOMETRY;
   }
   friend bool reopen_table(THD *,struct st_table *,bool);
   friend int cre_myisam(my_string name, register TABLE *form, uint options,