diff options
| author | unknown <bar@mysql.com> | 2004-10-29 17:00:39 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-10-29 17:00:39 +0500 |
| commit | 08809ca1927cd9f06af9fb179e32e2f75341d2b1 (patch) | |
| tree | 9cc9765d8b1a393421a6e3df083461c690d1c028 /sql/sql_show.cc | |
| parent | 5329e3a66349b4d0288e007bbf51fddbf8779e63 (diff) | |
| download | mariadb-git-08809ca1927cd9f06af9fb179e32e2f75341d2b1.tar.gz | |
A fix according to Monty's request:
"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert().
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 3bf11c0d6b8..2af4cb3fc23 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -752,8 +752,9 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, String def(tmp1,sizeof(tmp1), system_charset_info); type.set(tmp, sizeof(tmp), field->charset()); field->val_str(&type); + uint dummy_errors; def.copy(type.ptr(), type.length(), type.charset(), - system_charset_info); + system_charset_info, &dummy_errors); protocol->store(def.ptr(), def.length(), def.charset()); } else if (field->unireg_check == Field::NEXT_NUMBER || @@ -1338,9 +1339,10 @@ store_create_info(THD *thd, TABLE *table, String *packet) if (type.length()) { String def_val; + uint dummy_errors; /* convert to system_charset_info == utf8 */ def_val.copy(type.ptr(), type.length(), field->charset(), - system_charset_info); + system_charset_info, &dummy_errors); append_unescaped(packet, def_val.ptr(), def_val.length()); } else |