diff options
| author | jani@hynda.mysql.fi <> | 2007-08-22 17:29:38 +0300 |
|---|---|---|
| committer | jani@hynda.mysql.fi <> | 2007-08-22 17:29:38 +0300 |
| commit | 6519de046919c9b772e4ed36bd7592b900e4956c (patch) | |
| tree | eb1ce9100b55c8b26a72392c57e84461668936c7 /sql/field.cc | |
| parent | 400aec95f7dcf0a25b41c90854584f47cce12b35 (diff) | |
| parent | 2cb4a2c0b65d857db9b74c77f1ce0a740543e6e1 (diff) | |
| download | mariadb-git-6519de046919c9b772e4ed36bd7592b900e4956c.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 37262f8c38c..8e869484dda 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6298,12 +6298,12 @@ uint Field::is_equal(Create_field *new_field) /* If one of the fields is binary and the other one isn't return 1 else 0 */ -bool Field_str::compare_str_field_flags(Create_field *new_field, uint32 flags) +bool Field_str::compare_str_field_flags(Create_field *new_field, uint32 flag_arg) { return (((new_field->flags & (BINCMP_FLAG | BINARY_FLAG)) && - !(flags & (BINCMP_FLAG | BINARY_FLAG))) || + !(flag_arg & (BINCMP_FLAG | BINARY_FLAG))) || (!(new_field->flags & (BINCMP_FLAG | BINARY_FLAG)) && - (flags & (BINCMP_FLAG | BINARY_FLAG)))); + (flag_arg & (BINCMP_FLAG | BINARY_FLAG)))); } |