Commit 91ab3809 authored by unknown's avatar unknown

Merge mysql.com:/home/jimw/my/mysql-5.0-8679

into mysql.com:/home/jimw/my/mysql-5.0-build

parents c76b98e7 2ad50a50
No related merge requests found
...@@ -4144,7 +4144,8 @@ static my_bool is_binary_compatible(enum enum_field_types type1, ...@@ -4144,7 +4144,8 @@ static my_bool is_binary_compatible(enum enum_field_types type1,
range4[]= { MYSQL_TYPE_ENUM, MYSQL_TYPE_SET, MYSQL_TYPE_TINY_BLOB, range4[]= { MYSQL_TYPE_ENUM, MYSQL_TYPE_SET, MYSQL_TYPE_TINY_BLOB,
MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_LONG_BLOB, MYSQL_TYPE_BLOB, MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_LONG_BLOB, MYSQL_TYPE_BLOB,
MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_STRING, MYSQL_TYPE_GEOMETRY, MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_STRING, MYSQL_TYPE_GEOMETRY,
MYSQL_TYPE_DECIMAL, MYSQL_TYPE_NULL }, MYSQL_TYPE_DECIMAL, MYSQL_TYPE_NULL };
static const enum enum_field_types
*range_list[]= { range1, range2, range3, range4 }, *range_list[]= { range1, range2, range3, range4 },
**range_list_end= range_list + sizeof(range_list)/sizeof(*range_list); **range_list_end= range_list + sizeof(range_list)/sizeof(*range_list);
const enum enum_field_types **range, *type; const enum enum_field_types **range, *type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment