summaryrefslogtreecommitdiff
path: root/sql/sql_error.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-03-17 13:14:04 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-03-17 13:14:04 +0400
commit3a407e58921ea1f0ce36e7d9b6bd1e7b723346dc (patch)
tree964cdcf2c74b547efa3df764fba458b70cf72286 /sql/sql_error.cc
parent11bd5990630ed03a50ae8b3e586a91a39ca9136b (diff)
downloadmariadb-git-3a407e58921ea1f0ce36e7d9b6bd1e7b723346dc.tar.gz
Preparing to client<->server autoconvert
Diffstat (limited to 'sql/sql_error.cc')
-rw-r--r--sql/sql_error.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index 5508be5167a..00c80a654cb 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -180,9 +180,9 @@ my_bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
}
protocol->prepare_for_resend();
protocol->store(warning_level_names[err->level],
- warning_level_length[err->level]);
+ warning_level_length[err->level], system_charset_info);
protocol->store((uint32) err->code);
- protocol->store(err->msg, strlen(err->msg));
+ protocol->store(err->msg, strlen(err->msg), system_charset_info);
if (protocol->write())
DBUG_RETURN(1);
if (!--limit)