database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Field_geom should have same max_length as Field_blob

Browse Source 
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
This commit is contained in:
unknown
2004-06-21 11:27:40 +03:00
parent 028dfdb3f7
commit 19eb2ce4d6
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_time.result
View File

@ -533,6 +533,8 @@ date_add(date,INTERVAL "1 1:1:1" DAY_SECOND)
select date_add(time,INTERVAL 1 SECOND) from t1; select date_add(time,INTERVAL 1 SECOND) from t1;
date_add(time,INTERVAL 1 SECOND) date_add(time,INTERVAL 1 SECOND)
NULL NULL
Warnings:
Warning 1264 Data truncated; out of range for column 'time' at row 1
drop table t1; drop table t1;
select last_day('2000-02-05') as f1, last_day('2002-12-31') as f2, 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, last_day('2003-03-32') as f3, last_day('2003-04-01') as f4,

7
sql/field.cc
View File

@ -3380,7 +3380,10 @@ bool Field_time::get_date(TIME *ltime, uint fuzzydate)
long tmp; long tmp;
if (!fuzzydate) 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; return 1;
} }
tmp=(long) sint3korr(ptr); tmp=(long) sint3korr(ptr);
@ -5984,7 +5987,7 @@ uint32 Field_blob::max_length()
case 3: case 3:
return 16777215; return 16777215;
case 4: case 4:
return (uint32)4294967295; return (uint32) 4294967295U;
default: default:
DBUG_ASSERT(0); // we should never go here DBUG_ASSERT(0); // we should never go here
return 0; return 0;

1
sql/field.h
View File

@ -1089,7 +1089,6 @@ public:
void get_key_image(char *buff,uint length, CHARSET_INFO *cs,imagetype type); void get_key_image(char *buff,uint length, CHARSET_INFO *cs,imagetype type);
void set_key_image(char *buff,uint length, CHARSET_INFO *cs); 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; } field_cast_enum field_cast_type() { return FIELD_CAST_GEOM; }
}; };
#endif /*HAVE_SPATIAL*/ #endif /*HAVE_SPATIAL*/