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

Merge mysql.com:/home/ram/work/b26359/b26359.5.0

Browse Source 
into  mysql.com:/home/ram/work/b26359/b26359.5.1
This commit is contained in:
ramil/ram@ramil.myoffice.izhnet.ru
2007-03-29 09:38:46 +05:00
parent 0d65ee796b e3c34c9cbf
commit 95b58449f9
7 changed files with 263 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/field.h
View File

@ -358,8 +358,6 @@ public:
virtual void set_derivation(enum Derivation derivation_arg) { }
bool set_warning(MYSQL_ERROR::enum_warning_level, unsigned int code,
int cuted_increment);
bool check_int(const char *str, int length, const char *int_end,
CHARSET_INFO *cs);
void set_datetime_warning(MYSQL_ERROR::enum_warning_level, uint code,
const char *str, uint str_len,
timestamp_type ts_type, int cuted_increment);
@ -445,6 +443,11 @@ public:
int store_decimal(const my_decimal *);
my_decimal *val_decimal(my_decimal *);
uint is_equal(create_field *new_field);
int check_int(CHARSET_INFO *cs, const char *str, int length,
const char *int_end, int error);
bool get_int(CHARSET_INFO *cs, const char *from, uint len,
longlong *rnd, ulonglong unsigned_max,
longlong signed_min, longlong signed_max);
};