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 | 7af5094208edac1dd3af9ba2883f3c91264fbf6a (patch) | |
| tree | 89c69aad253aa731dde00030a149eadbd82193ad /sql/key.cc | |
| parent | 9be9ad7b05590c3dc1ec432256f41924efa5ada0 (diff) | |
| parent | 1040f98ccffccbed8d1e95fe8252e402b8ee4e3f (diff) | |
| download | mariadb-git-7af5094208edac1dd3af9ba2883f3c91264fbf6a.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 && |