diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-02-26 14:08:31 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-02-26 14:08:31 +0400 |
| commit | 5bc80ff8903edc3e304c7b0a7440f7dfb84b1893 (patch) | |
| tree | 5f2778ec9968b65a3ce00b266e03fcbe8c70751c | |
| parent | 6d535030870ec158630a785d334ab4b710fdc523 (diff) | |
| download | mariadb-git-5bc80ff8903edc3e304c7b0a7440f7dfb84b1893.tar.gz | |
sql_udf.cc, protocol.cc:
Less default_charset_info
sql/protocol.cc:
Less default_charset_info
sql/sql_udf.cc:
Less default_charset_info
| -rw-r--r-- | sql/protocol.cc | 6 | ||||
| -rw-r--r-- | sql/sql_udf.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 9a7a913f874..6bd5c4534e9 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -508,7 +508,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag) List_iterator_fast<Item> it(*list); Item *item; char buff[80]; - String tmp((char*) buff,sizeof(buff),default_charset_info); + String tmp((char*) buff,sizeof(buff),&my_charset_bin); Protocol_simple prot(thd); String *packet= prot.storage_packet(); DBUG_ENTER("send_fields"); @@ -655,7 +655,7 @@ bool Protocol::store(const char *from) bool Protocol::store(I_List<i_string>* str_list) { char buf[256]; - String tmp(buf, sizeof(buf), default_charset_info); + String tmp(buf, sizeof(buf), &my_charset_bin); uint32 len; I_List_iterator<i_string> it(*str_list); i_string* s; @@ -794,7 +794,7 @@ bool Protocol_simple::store(Field *field) field_pos++; #endif char buff[MAX_FIELD_WIDTH]; - String tmp(buff,sizeof(buff),default_charset_info); + String tmp(buff,sizeof(buff), &my_charset_bin); field->val_str(&tmp,&tmp); if (convert) return convert_str(tmp.ptr(), tmp.length()); diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 387c9970e34..450f1dd09ae 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -431,9 +431,9 @@ int mysql_create_function(THD *thd,udf_func *udf) goto err; restore_record(table,2); // Get default values for fields - table->field[0]->store(u_d->name.str, u_d->name.length, default_charset_info); + table->field[0]->store(u_d->name.str, u_d->name.length, system_charset_info); table->field[1]->store((longlong) u_d->returns); - table->field[2]->store(u_d->dl,(uint) strlen(u_d->dl), default_charset_info); + table->field[2]->store(u_d->dl,(uint) strlen(u_d->dl), system_charset_info); if (table->fields >= 4) // If not old func format table->field[3]->store((longlong) u_d->type); error = table->file->write_row(table->record[0]); |