diff options
| author | unknown <monty@mysql.com> | 2005-07-04 03:50:04 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-04 03:50:04 +0300 |
| commit | 3c82f72091d2c21519540ee5bcc3b2acadfbf198 (patch) | |
| tree | 8d29892167ff9d836d0992c219bf4307f1c03b75 /myisam | |
| parent | 428830c50024475e85e12f6b188879c2de536529 (diff) | |
| parent | 306ebf7b1c1b26b45e93fbcbbf248b3479142c41 (diff) | |
| download | mariadb-git-3c82f72091d2c21519540ee5bcc3b2acadfbf198.tar.gz | |
manual merge
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
strings/ctype-utf8.c:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_unique.c | 21 | ||||
| -rw-r--r-- | myisam/myisampack.c | 2 |
2 files changed, 18 insertions, 5 deletions
diff --git a/myisam/mi_unique.c b/myisam/mi_unique.c index f2d5f01be25..34f5f595f30 100644 --- a/myisam/mi_unique.c +++ b/myisam/mi_unique.c @@ -64,7 +64,12 @@ my_bool mi_check_unique(MI_INFO *info, MI_UNIQUEDEF *def, byte *record, } -/* Calculate a hash for a row */ +/* + Calculate a hash for a row + + TODO + Add support for bit fields +*/ ha_checksum mi_unique_hash(MI_UNIQUEDEF *def, const byte *record) { @@ -126,9 +131,17 @@ ha_checksum mi_unique_hash(MI_UNIQUEDEF *def, const byte *record) return crc; } - /* - Returns 0 if both rows have equal unique value - */ + +/* + compare unique key for two rows + + TODO + Add support for bit fields + + RETURN + 0 if both rows have equal unique value + # Rows are different +*/ int mi_unique_comp(MI_UNIQUEDEF *def, const byte *a, const byte *b, my_bool null_are_equal) diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 70a32902da6..daf2bbdf85c 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -288,7 +288,7 @@ static struct my_option my_long_options[] = static void print_version(void) { - VOID(printf("%s Ver 1.22 for %s on %s\n", + VOID(printf("%s Ver 1.23 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE)); NETWARE_SET_SCREEN_MODE(1); } |