summaryrefslogtreecommitdiff
path: root/sql/set_var.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-12-19 09:38:29 +0400
committerunknown <bar@bar.mysql.r18.ru>2002-12-19 09:38:29 +0400
commit52ed8cb8cbf0ca6966aeb56f0b1ec8d1ecf5bd93 (patch)
treed0aec1a4fd431a5751be4d2f1990a3e35606aedc /sql/set_var.h
parentb29cc128bfb15a4a81eda0031b0f2e74c862d250 (diff)
downloadmariadb-git-52ed8cb8cbf0ca6966aeb56f0b1ec8d1ecf5bd93.tar.gz
removed several cases of default_charset_info use
a bit more ucs2 compatibility sql/des_key_file.cc: use latin1 sql/field.cc: use latin1 sql/field_conv.cc: removed default_charset_info sql/hostname.cc: removed default_charset_info sql/item_timefunc.cc: gets closer to ucs2 compatibility sql/log_event.cc: removed default_charset_info sql/set_var.h: removed default_charset_info
Diffstat (limited to 'sql/set_var.h')
-rw-r--r--sql/set_var.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h
index 39a5995e30f..f479cbad042 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -452,7 +452,7 @@ public:
{
Item_field *item= (Item_field*) value_arg;
if (!(value=new Item_string(item->field_name, strlen(item->field_name),
- system_charset_info)))
+ item->charset())))
value=value_arg; /* Give error message later */
}
else