diff options
| author | unknown <kaa@polly.(none)> | 2007-11-16 14:24:06 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-11-16 14:24:06 +0300 |
| commit | 4b48eb6f1e4565ba31982f73908664108ba0fb7b (patch) | |
| tree | f8291a420e98b26c7058c22927b5c38f15f72aaf /sql/sql_select.cc | |
| parent | 0372747a3e02c28c64baedf41604ebb492d593eb (diff) | |
| parent | 1c1dd1f25c42081c7bf72042ccfcb83896298aab (diff) | |
| download | mariadb-git-4b48eb6f1e4565ba31982f73908664108ba0fb7b.tar.gz | |
Merge polly.(none):/home/kaa/src/opt/bug32241/my50-bug29131
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f8cbaee0b89..3d3b8668a79 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -15327,7 +15327,8 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order, { if (tab->use_quick == 2) { - char buf[MAX_KEY/8+1]; + /* 4 bits per 1 hex digit + terminating '\0' */ + char buf[MAX_KEY / 4 + 1]; extra.append(STRING_WITH_LEN("; Range checked for each " "record (index map: 0x")); extra.append(tab->keys.print(buf)); |