bk commit into 5.1 tree (andrey:1.2303)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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.2303 06/04/07 12:29:32 andrey@lmy004. +1 -0
  Merge ahristov@stripped:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-bug17494-real

  sql/item_timefunc.cc
    1.110 06/04/07 12:29:28 andrey@lmy004. +0 -0
    Auto merged

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug17494-real/RESYNC

--- 1.109/sql/item_timefunc.cc	2006-04-07 09:13:20 +02:00
+++ 1.110/sql/item_timefunc.cc	2006-04-07 12:29:28 +02:00
@@ -2090,7 +2090,7 @@ longlong Item_extract::val_int()
   switch (int_type) {
   case INTERVAL_YEAR:		return ltime.year;
   case INTERVAL_YEAR_MONTH:	return ltime.year*100L+ltime.month;
-  case INTERVAL_QUARTER:	return ltime.month/3 + 1;
+  case INTERVAL_QUARTER:	return (ltime.month+2)/3;
   case INTERVAL_MONTH:		return ltime.month;
   case INTERVAL_WEEK:
   {