bzr push into mysql-trunk branch (sergey.vojtovich:4052 to 4053)

[Sergey Vojtovich]

 4053 Sergey Vojtovich	2012-06-23
      WL6336
      
      Fixed field_long-t.

    modified:
      unittest/gunit/field_long-t.cc
 4052 Alexander Nozdrin	2012-06-22 [merge]
      Auto-merge from trunk.

    modified:
      mysql-test/suite/rpl/t/disabled.def
=== modified file 'unittest/gunit/field_long-t.cc'
--- a/unittest/gunit/field_long-t.cc	2012-05-07 12:05:48 +0000
+++ b/unittest/gunit/field_long-t.cc	2012-06-23 11:01:17 +0000
@@ -353,7 +353,7 @@ TEST_F(FieldLongTest, StoreNullValue)
   }
 
   // Save NULL value in a field that can NOT have NULL value
-  field_long.null_ptr= NULL;
+  field_long.set_null_ptr(NULL, 0);
   {
     Mock_error_handler error_handler(thd(), WARN_DATA_TRUNCATED);
     err= set_field_to_null(&field_long);

No bundle (reason: useless for push emails).