diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:30:24 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:30:24 +0300 |
| commit | b3cb7b7f7742f691c9a14598e455b4ecb96f07e1 (patch) | |
| tree | fd68b42f3c1b7e47b36b19209daf540c3a0c7a68 /sql/handler.cc | |
| parent | 6f38e3083f0d867af8d1499fba92c7eaae295726 (diff) | |
| parent | aee5ef8516ce0599402ca8e8a6b72f3eca36739b (diff) | |
| download | mariadb-git-b3cb7b7f7742f691c9a14598e455b4ecb96f07e1.tar.gz | |
merge with 4.0.5
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 7aba6817eca..f60c3449075 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -688,7 +688,7 @@ void handler::print_error(int error, myf errflag) { /* Write the dupplicated key in the error message */ char key[MAX_KEY_LENGTH]; - String str(key,sizeof(key)); + String str(key,sizeof(key),default_charset_info); key_unpack(&str,table,(uint) key_nr); uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(ER(ER_DUP_ENTRY)); if (str.length() >= max_length) |