bk commit into 5.0 tree (acurtis:1.1872) BUG#8861

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of acurtis. When acurtis 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.1872 05/04/21 15:36:10 acurtis@stripped +2 -0
  Bug#8861
    Correct previous bugfix

  sql/protocol.cc
    1.100 05/04/21 15:35:58 acurtis@stripped +1 -1
    Bug#8861
      Correct previous bugfix

  sql/item.cc
    1.111 05/04/21 15:35:57 acurtis@stripped +1 -0
    Bug#8861
      Correct previous bugfix

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/.amd_mnt/bk.anubis/host/work-acurtis/bug9102

--- 1.110/sql/item.cc	2005-04-16 04:34:44 +01:00
+++ 1.111/sql/item.cc	2005-04-21 15:35:57 +01:00
@@ -3591,6 +3591,7 @@
     break;
   }
   case MYSQL_TYPE_SHORT:
+  case MYSQL_TYPE_YEAR:
   {
     longlong nr;
     nr= val_int();

--- 1.99/sql/protocol.cc	2005-04-21 13:22:32 +01:00
+++ 1.100/sql/protocol.cc	2005-04-21 15:35:58 +01:00
@@ -774,7 +774,6 @@
 #ifndef DEBUG_OFF
   DBUG_ASSERT(field_types == 0 ||
 	      field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
-              field_types[field_pos] == MYSQL_TYPE_YEAR ||
               field_types[field_pos] == MYSQL_TYPE_BIT ||
               field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
 	      (field_types[field_pos] >= MYSQL_TYPE_ENUM &&
@@ -801,6 +800,7 @@
 {
 #ifndef DEBUG_OFF
   DBUG_ASSERT(field_types == 0 ||
+	      field_types[field_pos] == MYSQL_TYPE_YEAR ||
 	      field_types[field_pos] == MYSQL_TYPE_SHORT);
   field_pos++;
 #endif