From 19eb2ce4d60830671c090480837c7afbc743459e Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com>
Date: Mon, 21 Jun 2004 11:27:40 +0300
Subject: [PATCH] Field_geom should have same max_length as Field_blob Updated
 tests After merge fix

mysql-test/r/func_time.result:
  Updated tests
sql/field.cc:
  After merge fix
  Removed compiler warning
sql/field.h:
  Field_geom should have same max_length as Field_blob
---
 mysql-test/r/func_time.result | 2 ++
 sql/field.cc                  | 7 +++++--
 sql/field.h                   | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index fd3199add72..2dc6bffd071 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -533,6 +533,8 @@ date_add(date,INTERVAL "1 1:1:1" DAY_SECOND)
 select date_add(time,INTERVAL 1 SECOND) from t1;
 date_add(time,INTERVAL 1 SECOND)
 NULL
+Warnings:
+Warning	1264	Data truncated; out of range for column 'time' at row 1
 drop table t1;
 select last_day('2000-02-05') as f1, last_day('2002-12-31') as f2,
 last_day('2003-03-32') as f3, last_day('2003-04-01') as f4,
diff --git a/sql/field.cc b/sql/field.cc
index e8c6688545f..f113b98cccd 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -3380,7 +3380,10 @@ bool Field_time::get_date(TIME *ltime, uint fuzzydate)
   long tmp;
   if (!fuzzydate)
   {
-    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE);
+    push_warning_printf(table->in_use, MYSQL_ERROR::WARN_LEVEL_WARN,
+                        ER_WARN_DATA_OUT_OF_RANGE,
+                        ER(ER_WARN_DATA_OUT_OF_RANGE), field_name,
+                        table->in_use->row_count);
     return 1;
   }
   tmp=(long) sint3korr(ptr);
@@ -5984,7 +5987,7 @@ uint32 Field_blob::max_length()
   case 3:
     return 16777215;
   case 4:
-    return (uint32)4294967295;
+    return (uint32) 4294967295U;
   default:
     DBUG_ASSERT(0); // we should never go here
     return 0;
diff --git a/sql/field.h b/sql/field.h
index 40d18693d2e..e7a30372e43 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1089,7 +1089,6 @@ public:
 
   void get_key_image(char *buff,uint length, CHARSET_INFO *cs,imagetype type);
   void set_key_image(char *buff,uint length, CHARSET_INFO *cs);
-  uint32 max_length() { return field_length; }
   field_cast_enum field_cast_type() { return FIELD_CAST_GEOM; }
 };
 #endif /*HAVE_SPATIAL*/