diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2006-10-25 12:21:45 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2006-10-25 12:21:45 +0200 |
| commit | a48d71010063a09a2ad5d49c5924afc999204e2a (patch) | |
| tree | 0ad5204fbc6746b2cda8328a299f38bec67e4a7a /sql | |
| parent | 822049b9e1a6c78d73c8fbd6aa9efcfcaa15bb07 (diff) | |
| parent | 08ce5b3dbd9687145f2525ba308eaa854ab9e651 (diff) | |
| download | mariadb-git-a48d71010063a09a2ad5d49c5924afc999204e2a.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
sql/handler.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 2b6ddd45e05..cff8213edec 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1778,8 +1778,7 @@ void handler::print_error(int error, myf errflag) if (key_nr == MAX_KEY) { /* Key is unknown */ - str.length(0); - str.append(""); + str.copy("", 0, system_charset_info); key_nr= -1; } else |