Merge from 5.0

parent c81b4c01
...@@ -156,3 +156,5 @@ drop function bug15728_insert; ...@@ -156,3 +156,5 @@ drop function bug15728_insert;
drop table t1, t2; drop table t1, t2;
# End of 5.0 tests # End of 5.0 tests
sync_slave_with_master;
...@@ -1223,7 +1223,7 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg, ...@@ -1223,7 +1223,7 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,
field_name(field_name_arg), field_name(field_name_arg),
query_id(0), key_start(0), part_of_key(0), part_of_sortkey(0), query_id(0), key_start(0), part_of_key(0), part_of_sortkey(0),
unireg_check(unireg_check_arg), unireg_check(unireg_check_arg),
field_length(length_arg), null_bit(null_bit_arg), dflt_field(0) field_length(length_arg), null_bit(null_bit_arg)
{ {
flags=null_ptr ? 0: NOT_NULL_FLAG; flags=null_ptr ? 0: NOT_NULL_FLAG;
comment.str= (char*) ""; comment.str= (char*) "";
......
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