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

Merge

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-11-03 22:48:03 +02:00
parent dde384d9ea 085b1c5608
commit 6b79cd5c23
85 changed files with 2868 additions and 1861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/field.h
View File

@ -224,7 +224,7 @@ public:
uint offset(); // Should be inline ...
void copy_from_tmp(int offset);
uint fill_cache_field(struct st_cache_field *copy);
virtual bool get_date(TIME *ltime,bool fuzzydate);
virtual bool get_date(TIME *ltime,uint fuzzydate);
virtual bool get_time(TIME *ltime);
virtual CHARSET_INFO *charset(void) const { return &my_charset_bin; }
virtual bool has_charset(void) const { return FALSE; }
@ -647,7 +647,7 @@ public:
longget(tmp,ptr);
return tmp;
}
bool get_date(TIME *ltime,bool fuzzydate);
bool get_date(TIME *ltime,uint fuzzydate);
bool get_time(TIME *ltime);
};
@ -735,7 +735,7 @@ public:
void sql_type(String &str) const;
bool store_for_compare() { return 1; }
bool zero_pack() const { return 1; }
bool get_date(TIME *ltime,bool fuzzydate);
bool get_date(TIME *ltime,uint fuzzydate);
bool get_time(TIME *ltime);
};
@ -805,7 +805,7 @@ public:
void sql_type(String &str) const;
bool store_for_compare() { return 1; }
bool zero_pack() const { return 1; }
bool get_date(TIME *ltime,bool fuzzydate);
bool get_date(TIME *ltime,uint fuzzydate);
bool get_time(TIME *ltime);
};
@ -1160,9 +1160,6 @@ uint pack_length_to_packflag(uint type);
uint32 calc_pack_length(enum_field_types type,uint32 length);
bool set_field_to_null(Field *field);
bool set_field_to_null_with_conversions(Field *field, bool no_conversions);
uint find_enum(TYPELIB *typelib,const char *x, uint length);
ulonglong find_set(TYPELIB *typelib,const char *x, uint length,
char **err_pos, uint *err_len, bool *set_warning);
bool test_if_int(const char *str, int length, const char *int_end,
CHARSET_INFO *cs);