database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#25431, Adding index to table with BLOB is not done on-line

Browse Source 
add a new method is_equal in class Field_blob to compare BLOB field when alter table


sql/field.cc:
  add a method compare_str_field_flags in class Field_str
  add a method is_equal in class Field_blob to compare BLOB field when alter table
sql/field.h:
  add corresponding declaration of new method in class definition
This commit is contained in:
unknown
2007-04-27 12:21:23 +02:00
parent eea294cd00
commit 80701e3ac6
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sql/field.cc
View File

@ -6099,13 +6099,21 @@ 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)
{
return (((new_field->flags & (BINCMP_FLAG | BINARY_FLAG)) &&
!(flags & (BINCMP_FLAG | BINARY_FLAG))) ||
(!(new_field->flags & (BINCMP_FLAG | BINARY_FLAG)) &&
(flags & (BINCMP_FLAG | BINARY_FLAG))));
}
uint Field_str::is_equal(create_field *new_field) uint Field_str::is_equal(create_field *new_field)
{ {
if (((new_field->flags & (BINCMP_FLAG | BINARY_FLAG)) && if (compare_str_field_flags(new_field, flags))
!(flags & (BINCMP_FLAG | BINARY_FLAG))) || return 0;
(!(new_field->flags & (BINCMP_FLAG | BINARY_FLAG)) &&
(flags & (BINCMP_FLAG | BINARY_FLAG))))
return 0; /* One of the fields is binary and the other one isn't */
return ((new_field->sql_type == real_type()) && return ((new_field->sql_type == real_type()) &&
new_field->charset == field_charset && new_field->charset == field_charset &&
@ -7611,6 +7619,18 @@ uint Field_blob::max_packed_col_length(uint max_length)
} }
uint Field_blob::is_equal(create_field *new_field)
{
if (compare_str_field_flags(new_field, flags))
return 0;
return ((new_field->sql_type == get_blob_type_from_length(max_data_length()))
&& new_field->charset == field_charset &&
((Field_blob *)new_field->field)->max_data_length() ==
max_data_length());
}
#ifdef HAVE_SPATIAL #ifdef HAVE_SPATIAL
void Field_geom::get_key_image(char *buff, uint length, imagetype type_arg) void Field_geom::get_key_image(char *buff, uint length, imagetype type_arg)

2
sql/field.h
View File

@ -476,6 +476,7 @@ public:
friend class create_field; friend class create_field;
my_decimal *val_decimal(my_decimal *); my_decimal *val_decimal(my_decimal *);
virtual bool str_needs_quotes() { return TRUE; } virtual bool str_needs_quotes() { return TRUE; }
bool compare_str_field_flags(create_field *new_field, uint32 flags);
uint is_equal(create_field *new_field); uint is_equal(create_field *new_field);
}; };
@ -1328,6 +1329,7 @@ public:
bool has_charset(void) const bool has_charset(void) const
{ return charset() == &my_charset_bin ? FALSE : TRUE; } { return charset() == &my_charset_bin ? FALSE : TRUE; }
uint32 max_display_length(); uint32 max_display_length();
uint is_equal(create_field *new_field);
}; };