diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index db4ad62f23b0c077b0b5cd21f6fecc5c5a5ad9e5..785ea13b4920695d307710787cc039f7b7c9c10a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -15,6 +15,7 @@ arjen@george.bitbike.com bar@bar.intranet.mysql.r18.ru bar@bar.mysql.r18.ru bar@bar.udmsearch.izhnet.ru +bar@deer.(none) bar@gw.udmsearch.izhnet.ru bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 3cb03d7ea4941b0c9b0ac94ac62940b006585c47..fdacc4ec53635d922cacdc43670a68af38eadb88 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2104,8 +2104,8 @@ String *Item_func_conv_charset::val_str(String *str) null_value=1; return 0; } - null_value= str->copy(arg->ptr(),arg->length(),arg->charset(),conv_charset); - return null_value ? 0 : str; + null_value= str_value.copy(arg->ptr(),arg->length(),arg->charset(),conv_charset); + return null_value ? 0 : &str_value; } void Item_func_conv_charset::fix_length_and_dec()