bk commit into 5.0 tree (ramil:1.1940)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.1940 05/07/15 16:25:31 ramil@stripped +1 -0
  NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combined

  sql/field.cc
    1.274 05/07/15 16:25:23 ramil@stripped +2 -2
    NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combined

# 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:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/mysql-5.0

--- 1.273/sql/field.cc	2005-07-15 15:50:48 +05:00
+++ 1.274/sql/field.cc	2005-07-15 16:25:23 +05:00
@@ -8487,8 +8487,8 @@
   else
     interval=0;
   def=0;
-  if (!(flags & NO_DEFAULT_VALUE_FLAG) &&
-      !old_field->is_real_null() && ! (flags & BLOB_FLAG) &&
+  if (!(flags & (NO_DEFAULT_VALUE_FLAG | BLOB_FLAG)) &&
+      !old_field->is_real_null() &&
       old_field->ptr && orig_field)
   {
     char buff[MAX_FIELD_WIDTH],*pos;