Commit dd370c9a authored by unknown's avatar unknown
Browse files

Merge from 5.0 


mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Manual merge from 5.0. In 5.0 this was in another file.
sql/field.cc:
  Removed unused variable.
parent ae26d2aa

mysql-test/extra/rpl_tests/rpl_insert_id.test

+2 −0
Original line number Diff line number Diff line
@@ -156,3 +156,5 @@ drop function bug15728_insert; 
drop table t1, t2;



# End of 5.0 tests



sync_slave_with_master;

sql/field.cc

+1 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg, 
   field_name(field_name_arg),

   query_id(0), key_start(0), part_of_key(0), part_of_sortkey(0),

   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;

  comment.str= (char*) "";