diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2014-12-18 20:38:47 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2014-12-18 20:38:47 +0300 |
| commit | 13e1acc58fe4785fc6b41e00ffded2d21d10f82c (patch) | |
| tree | c0310df3a1a9876f85efe83827be20192f1c6c1b /sql | |
| parent | 724dbaabc0d06c4446417eb217d8536f193461f9 (diff) | |
| parent | b75090c7dede338236b98ace65362348579ffa01 (diff) | |
| download | mariadb-git-13e1acc58fe4785fc6b41e00ffded2d21d10f82c.tar.gz | |
Merge 5.3 -> 5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index dc76691d71f..bdb2d1c3346 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9286,7 +9286,7 @@ bool generate_derived_keys_for_table(KEYUSE *keyuse, uint count, uint keys) else { /* Mark keyuses for this key to be excluded */ - for (KEYUSE *curr=save_first_keyuse; curr < first_keyuse; curr++) + for (KEYUSE *curr=save_first_keyuse; curr < keyuse; curr++) { curr->key= MAX_KEY; } |