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

Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source 
Conflicts:

mysql-test/collections/default.experimental
This commit is contained in:
Alexey Kopytov
2009-12-25 13:56:50 +03:00
parent 1d13320d9a b367b03bcb
commit 24fc798fc7
24 changed files with 424 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/field.cc
View File

@ -8333,8 +8333,7 @@ uint Field_blob::is_equal(Create_field *new_field)
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());
new_field->pack_length == pack_length());
}