diff options
| author | unknown <monty@mysql.com> | 2004-12-18 06:05:16 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-18 06:05:16 +0200 |
| commit | e8b60b16121a68111e84c6a8671a3ebde9500d5d (patch) | |
| tree | 8e8581b17151730ec13c7ed6ec00128c62a192a8 /mysys/my_handler.c | |
| parent | 491baa972a2a2f373ae4dd3a1de2470169527326 (diff) | |
| parent | 8eaef91fff849885a7369a21a752e87cb1e592c8 (diff) | |
| download | mariadb-git-e8b60b16121a68111e84c6a8671a3ebde9500d5d.tar.gz | |
Merge with global tree
myisam/mi_key.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysys/my_handler.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
include/my_base.h:
Merge
Diffstat (limited to 'mysys/my_handler.c')
| -rw-r--r-- | mysys/my_handler.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c index e4dc55964da..7c22f02fa2a 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -207,7 +207,8 @@ int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, b+=length; } break; - case HA_KEYTYPE_VARTEXT: + case HA_KEYTYPE_VARTEXT1: + case HA_KEYTYPE_VARTEXT2: { int a_length,b_length,pack_length; get_key_length(a_length,a); @@ -229,7 +230,8 @@ int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, break; } break; - case HA_KEYTYPE_VARBINARY: + case HA_KEYTYPE_VARBINARY1: + case HA_KEYTYPE_VARBINARY2: { int a_length,b_length,pack_length; get_key_length(a_length,a); |