diff options
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/key.cc b/sql/key.cc index f2488ab74cb..d103c07eb72 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -1,15 +1,15 @@ /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -96,7 +96,7 @@ void key_copy(byte *key,TABLE *table,uint idx,uint key_length) length=min(key_length,key_part->length); set_if_smaller(blob_length,length); int2store(key,(uint) blob_length); - key+=2; // Skipp length info + key+=2; // Skip length info memcpy(key,pos,blob_length); } else @@ -250,7 +250,7 @@ void key_unpack(String *to,TABLE *table,uint idx) bool check_if_key_used(TABLE *table, uint idx, List<Item> &fields) { - List_iterator<Item> f(fields); + List_iterator_fast<Item> f(fields); KEY_PART_INFO *key_part,*key_part_end; for (key_part=table->key_info[idx].key_part,key_part_end=key_part+ table->key_info[idx].key_parts ; @@ -258,7 +258,7 @@ bool check_if_key_used(TABLE *table, uint idx, List<Item> &fields) key_part++) { Item_field *field; - + if (key_part->field == table->timestamp_field) return 1; // Can't be used for update |