diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-02-20 11:21:12 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-02-20 11:21:12 +0200 |
| commit | 46a07dbc5f527be5011c50422683f376d5ed5d22 (patch) | |
| tree | cea10e2c6b0a4f1dd9069a472481dda3c1cd9ed3 /innobase/rem | |
| parent | 6226e45b7b1537ebd24277a5ceb3c874c57aff3e (diff) | |
| download | mariadb-git-46a07dbc5f527be5011c50422683f376d5ed5d22.tar.gz | |
rem0cmp.c, data0type.c, data0type.ic, data0type.h, ha_innodb.cc:
Remove the now redundant flag DATA_NONLATIN1; better comments
sql/ha_innodb.cc:
Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/include/data0type.h:
Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/include/data0type.ic:
Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/data/data0type.c:
Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/rem/rem0cmp.c:
Remove the now redundant flag DATA_NONLATIN1; better comments
Diffstat (limited to 'innobase/rem')
| -rw-r--r-- | innobase/rem/rem0cmp.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/innobase/rem/rem0cmp.c b/innobase/rem/rem0cmp.c index b6f32c83b35..86818168db9 100644 --- a/innobase/rem/rem0cmp.c +++ b/innobase/rem/rem0cmp.c @@ -331,7 +331,9 @@ cmp_data_data_slow( if (cur_type->mtype >= DATA_FLOAT || (cur_type->mtype == DATA_BLOB - && (cur_type->prtype & DATA_NONLATIN1))) { + && 0 == (cur_type->prtype & DATA_BINARY_TYPE) + && dtype_get_charset_coll(cur_type->prtype) != + data_mysql_latin1_swedish_charset_coll)) { return(cmp_whole_field(cur_type, data1, len1, data2, len2)); } @@ -532,8 +534,10 @@ cmp_dtuple_rec_with_match( } if (cur_type->mtype >= DATA_FLOAT - || (cur_type->mtype == DATA_BLOB - && (cur_type->prtype & DATA_NONLATIN1))) { + || (cur_type->mtype == DATA_BLOB + && 0 == (cur_type->prtype & DATA_BINARY_TYPE) + && dtype_get_charset_coll(cur_type->prtype) != + data_mysql_latin1_swedish_charset_coll)) { ret = cmp_whole_field(cur_type, dfield_get_data(dtuple_field), dtuple_f_len, @@ -854,8 +858,10 @@ cmp_rec_rec_with_match( } if (cur_type->mtype >= DATA_FLOAT - || (cur_type->mtype == DATA_BLOB - && (cur_type->prtype & DATA_NONLATIN1))) { + || (cur_type->mtype == DATA_BLOB + && 0 == (cur_type->prtype & DATA_BINARY_TYPE) + && dtype_get_charset_coll(cur_type->prtype) != + data_mysql_latin1_swedish_charset_coll)) { ret = cmp_whole_field(cur_type, rec1_b_ptr, rec1_f_len, |