bzr push into mysql-trunk branch (alexander.barkov:3889 to 3890)

[Alexander Barkov]

 3890 Alexander Barkov	2012-04-19
      Additional fix for the previous commit changing
      data type for m_lenth in SimpleCString from uint to size_t.

    modified:
      sql/item.h
 3889 magnus.blaudd@stripped	2012-04-19
      binlog
      - fix trivial .result file  mismatch, apparently the .test file or one
        of teh include files it uses has been changed to use
        "show_binlog_events.inc" instead of the raw "show binlog events" command

    modified:
      mysql-test/suite/binlog/r/binlog_multi_engine.result
=== modified file 'sql/item.h'
--- a/sql/item.h	2012-04-19 10:49:27 +0000
+++ b/sql/item.h	2012-04-19 11:30:44 +0000
@@ -156,7 +156,7 @@ public:
 class NameString: public SimpleCString
 {
 private:
-  void set_or_copy(const char *str, uint length, bool is_null_terminated)
+  void set_or_copy(const char *str, size_t length, bool is_null_terminated)
   {
     if (is_null_terminated)
       set(str, length);

No bundle (reason: useless for push emails).