diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 20:51:34 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-10-19 20:51:34 -0200 |
| commit | 69aea87d5f424efc92708a44d0d3753958210610 (patch) | |
| tree | 89c69aad253aa731dde00030a149eadbd82193ad /sql/key.cc | |
| parent | 3d0473233ac420f4dc997e88619c1deecb6109ca (diff) | |
| parent | 39e9bde2c0baed472d915f2404cacd6dd63cbbe6 (diff) | |
| download | mariadb-git-69aea87d5f424efc92708a44d0d3753958210610.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/key.cc b/sql/key.cc index 582334620ad..e28e0803986 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -361,7 +361,7 @@ void key_unpack(String *to,TABLE *table,uint idx) if (field->binary() && field->type() == MYSQL_TYPE_STRING && tmp.length()) { const char *tmp_end= tmp.ptr() + tmp.length(); - while (tmp_end > tmp.ptr() && !*--tmp_end); + while (tmp_end > tmp.ptr() && !*--tmp_end) ; tmp.length(tmp_end - tmp.ptr() + 1); } if (cs->mbmaxlen > 1 && |