Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/my/mysql-5.0


sql/sp_head.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged

8 files changed, 11 insertions, 13 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 7e2e32083e1..c87b613cb12 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -7835,7 +7835,7 @@ int Field_bit::store(const char *from, uint length, CHARSET_INFO *cs)
 
 int Field_bit::store(double nr)
 {
-  return (Field_bit::store((longlong) nr));
+  return store((longlong) nr);
 }
 
 
@@ -8018,7 +8018,8 @@ int Field_bit_as_char::store(const char *from, uint length, CHARSET_INFO *cs)
       (delta == 0 && bits && (uint) (uchar) *from >= (uint) (1 << bits)))
   {
     memset(ptr, 0xff, field_length);
-    *ptr&= ((1 << bits) - 1); /* set first byte */
+    if (bits)
+      *ptr&= ((1 << bits) - 1); /* set first byte */
     set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
     return 1;
   }
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index c76034c7986..89210a2f3cd 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -345,12 +345,11 @@
 
 */
 
-#ifdef __GNUC__
+#include "mysql_priv.h"
+#ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation                          // gcc: Class implementation
 #endif
 
-#include "mysql_priv.h"
-
 #ifdef HAVE_FEDERATED_DB
 #include "ha_federated.h"
 #define MAX_REMOTE_SIZE IO_SIZE
diff --git a/sql/ha_federated.h b/sql/ha_federated.h
index 22fc03e9eec..f084976718c 100644
--- a/sql/ha_federated.h
+++ b/sql/ha_federated.h
@@ -21,7 +21,7 @@
   that you can implement.
 */
 
-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
 
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 76b0fa6afcf..b07de7eb21d 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -3014,7 +3014,7 @@ String *Item_func_str_to_date::val_str(String *str)
 
 bool Item_func_last_day::get_date(TIME *ltime, uint fuzzy_date)
 {
-  if (get_arg0_date(ltime,fuzzy_date))
+  if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE))
     return 1;
   uint month_idx= ltime->month-1;
   ltime->day= days_in_month[month_idx];
diff --git a/sql/sp_cache.cc b/sql/sp_cache.cc
index 83811e76f9b..c8f0ed6ba2d 100644
--- a/sql/sp_cache.cc
+++ b/sql/sp_cache.cc
@@ -14,11 +14,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif
-
-#include "mysql_priv.h"
 #include "sp_cache.h"
 #include "sp_head.h"
 
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 9b372a4d062..1e5bd5b5b8c 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -14,11 +14,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif
-
-#include "mysql_priv.h"
 #include "sp_head.h"
 #include "sp.h"
 #include "sp_pcontext.h"
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc
index f95a43eb903..0de7fe212c0 100644
--- a/sql/sp_pcontext.cc
+++ b/sql/sp_pcontext.cc
@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif
@@ -22,7 +23,6 @@
 #undef SAFEMALLOC				/* Problems with threads */
 #endif
 
-#include "mysql_priv.h"
 #include "sp_pcontext.h"
 #include "sp_head.h"
 
diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index 0e8210301c1..6f2165539d7 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.cc
@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif
@@ -22,7 +23,6 @@
 #undef SAFEMALLOC				/* Problems with threads */
 #endif
 
-#include "mysql_priv.h"
 #include "mysql.h"
 #include "sp_head.h"
 #include "sp_rcontext.h"