diff options
| author | unknown <bar@deer.(none)> | 2003-12-29 18:45:13 +0400 |
|---|---|---|
| committer | unknown <bar@deer.(none)> | 2003-12-29 18:45:13 +0400 |
| commit | 64d039833ec84669fa0d2154264f100f41db0fd2 (patch) | |
| tree | a5f45669aa3d6ae39040c5e3cf457d58f94e7209 | |
| parent | d55382369eb639417dd01a62ff4867f9213f10ce (diff) | |
| download | mariadb-git-64d039833ec84669fa0d2154264f100f41db0fd2.tar.gz | |
logging_ok:
Logging to logging@openlogging.org accepted
item_strfunc.cc:
Bug wich appeared in ctype_tis620 is fixed
sql/item_strfunc.cc:
Bug wich appeared in ctype_tis620 is fixed
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index db4ad62f23b..785ea13b492 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 3cb03d7ea49..fdacc4ec536 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() |