mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map()
This commit is contained in:
@ -6081,12 +6081,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))));
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user