diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-02-09 17:53:09 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-02-09 17:53:09 +0100 |
| commit | 7f056654b9957fa300d2e9fac4129cbb7f18dbe9 (patch) | |
| tree | e8551efb4858493cd762678134aa338f06885cab /ndb/src/common | |
| parent | 26511220c28835e5ac8e92a22b9c1008b03553bc (diff) | |
| parent | 690479cd0c76572c22d1b2cc8d81c3d17e1add74 (diff) | |
| download | mariadb-git-7f056654b9957fa300d2e9fac4129cbb7f18dbe9.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
Diffstat (limited to 'ndb/src/common')
| -rw-r--r-- | ndb/src/common/util/NdbSqlUtil.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ndb/src/common/util/NdbSqlUtil.cpp b/ndb/src/common/util/NdbSqlUtil.cpp index b691b4cb512..bff829cbaf8 100644 --- a/ndb/src/common/util/NdbSqlUtil.cpp +++ b/ndb/src/common/util/NdbSqlUtil.cpp @@ -15,6 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <NdbSqlUtil.hpp> +#include <NdbOut.hpp> int NdbSqlUtil::char_compare(const char* s1, unsigned n1, @@ -858,6 +859,8 @@ NdbSqlUtil::strnxfrm_bug7284(CHARSET_INFO* cs, unsigned char* dst, unsigned dstL int n2 = (*cs->coll->strnxfrm)(cs, xsp, sizeof(xsp), nsp, n1); if (n2 <= 0) return -1; + // XXX bug workaround - strnxfrm may not write full string + memset(dst, 0x0, dstLen); // strxfrm argument string - returns no error indication int n3 = (*cs->coll->strnxfrm)(cs, dst, dstLen, src, srcLen); // pad with strxfrm-ed space chars |