diff options
| author | bar@bar.mysql.r18.ru <> | 2003-01-29 17:31:20 +0400 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-01-29 17:31:20 +0400 |
| commit | 735399a850528714ba43b6e7aec84aa9a8878321 (patch) | |
| tree | 264982c7494f97fc034269d9b20c340299092a4b /sql/item.cc | |
| parent | ff3eaaebe742d83aee425a3c6b81c020c16f71cd (diff) | |
| download | mariadb-git-735399a850528714ba43b6e7aec84aa9a8878321.tar.gz | |
Move latin1 into a separarte file
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/item.cc b/sql/item.cc index 575c5b4d89c..ad35d36b0fd 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -115,7 +115,7 @@ bool Item_string::eq(const Item *item, bool binary_cmp) const bool Item::get_date(TIME *ltime,bool fuzzydate) { char buff[40]; - String tmp(buff,sizeof(buff), my_charset_bin),*res; + String tmp(buff,sizeof(buff), &my_charset_bin),*res; if (!(res=val_str(&tmp)) || str_to_TIME(res->ptr(),res->length(),ltime,fuzzydate) == TIMESTAMP_NONE) { @@ -133,7 +133,7 @@ bool Item::get_date(TIME *ltime,bool fuzzydate) bool Item::get_time(TIME *ltime) { char buff[40]; - String tmp(buff,sizeof(buff),my_charset_bin),*res; + String tmp(buff,sizeof(buff),&my_charset_bin),*res; if (!(res=val_str(&tmp)) || str_to_time(res->ptr(),res->length(),ltime)) { @@ -883,7 +883,7 @@ Item_varbinary::Item_varbinary(const char *str, uint str_length) char *ptr=(char*) sql_alloc(max_length+1); if (!ptr) return; - str_value.set(ptr,max_length,my_charset_bin); + str_value.set(ptr,max_length,&my_charset_bin); char *end=ptr+max_length; if (max_length*2 != str_length) *ptr++=char_val(*str++); // Not even, assume 0 prefix @@ -1232,7 +1232,7 @@ Item *resolve_const_item(Item *item,Item *comp_item) if (res_type == STRING_RESULT) { char buff[MAX_FIELD_WIDTH]; - String tmp(buff,sizeof(buff),my_charset_bin),*result; + String tmp(buff,sizeof(buff),&my_charset_bin),*result; result=item->val_str(&tmp); if (item->null_value) { @@ -1287,8 +1287,8 @@ bool field_is_equal_to_item(Field *field,Item *item) { char item_buff[MAX_FIELD_WIDTH]; char field_buff[MAX_FIELD_WIDTH]; - String item_tmp(item_buff,sizeof(item_buff),my_charset_bin),*item_result; - String field_tmp(field_buff,sizeof(field_buff),my_charset_bin); + String item_tmp(item_buff,sizeof(item_buff),&my_charset_bin),*item_result; + String field_tmp(field_buff,sizeof(field_buff),&my_charset_bin); item_result=item->val_str(&item_tmp); if (item->null_value) return 1; // This must be true |