diff options
| author | monty@narttu.mysql.fi <> | 2002-08-30 12:40:40 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2002-08-30 12:40:40 +0300 |
| commit | 7134ffec210edde21860a2b2c2654be481de49b4 (patch) | |
| tree | 1bb81fd601075133af9ee99bd7ac94baf5ffc46c /sql/key.cc | |
| parent | 921f7c9c551d9e1bdd5083ebe71d204ab6246ba1 (diff) | |
| parent | dd5382187e68ff5337e1fe7ba5f86f0d9cdd31d5 (diff) | |
| download | mariadb-git-7134ffec210edde21860a2b2c2654be481de49b4.tar.gz | |
Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/key.cc b/sql/key.cc index d103c07eb72..fa09a0a6d44 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -192,8 +192,9 @@ int key_cmp(TABLE *table,const byte *key,uint idx,uint key_length) if (!(key_part->key_type & (FIELDFLAG_NUMBER+FIELDFLAG_BINARY+ FIELDFLAG_PACK))) { - if (my_sortcmp((char*) key,(char*) table->record[0]+key_part->offset, - length)) + /* BAR TODO: I'm not sure this should be system_charset_info */ + if (my_sortcmp(system_charset_info,(char*) key, + (char*) table->record[0]+key_part->offset,length)) return 1; } else if (memcmp(key,table->record[0]+key_part->offset,length)) |