summaryrefslogtreecommitdiff
path: root/sql/des_key_file.cc
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/des_key_file.cc
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/des_key_file.cc')
-rw-r--r--sql/des_key_file.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/des_key_file.cc b/sql/des_key_file.cc
index ca92e38279b..22cf9094486 100644
--- a/sql/des_key_file.cc
+++ b/sql/des_key_file.cc
@@ -34,6 +34,8 @@ static int initialized;
1 Error
*/
+#define des_cs my_charset_latin1
+
bool
load_des_key_file(const char *file_name)
{
@@ -70,10 +72,10 @@ load_des_key_file(const char *file_name)
{
offset=(char) (offset - '0');
// Remove newline and possible other control characters
- for (start=buf+1 ; my_isspace(system_charset_info, *start) ; start++) ;
+ for (start=buf+1 ; my_isspace(des_cs, *start) ; start++) ;
end=buf+length;
for (end=strend(buf) ;
- end > start && !my_isgraph(system_charset_info, end[-1]) ; end--) ;
+ end > start && !my_isgraph(des_cs, end[-1]) ; end--) ;
if (start != end)
{