database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

5.1 -> 5.5 merge

Browse Source
This commit is contained in:
Sergey Glukhov
2011-04-12 14:13:15 +04:00
parent db63b0b771 60cc2f91d6
commit f88699196c
7 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.cc
View File

@ -5382,6 +5382,7 @@ double Field_year::val_real(void)
longlong Field_year::val_int(void)
{
ASSERT_COLUMN_MARKED_FOR_READ;
DBUG_ASSERT(field_length == 2 || field_length == 4);
int tmp= (int) ptr[0];
if (field_length != 4)
tmp%=100; // Return last 2 char
@ -5394,6 +5395,7 @@ longlong Field_year::val_int(void)
String *Field_year::val_str(String *val_buffer,
String *val_ptr __attribute__((unused)))
{
DBUG_ASSERT(field_length < 5);
val_buffer->alloc(5);
val_buffer->length(field_length);
char *to=(char*) val_buffer->ptr();