bzr push into mysql-5.5 branch (Georgi.Kodinov:3818 to 3819)

[Georgi Kodinov]

 3819 Georgi Kodinov	2012-05-09 [merge]
      merge

 3818 Joerg Bruehe	2012-05-07 [merge]
      Merge 5.5.24 back into main 5.5.
      This is a weave merge, but without any conflicts.
      In 14 source files, the copyright year needed to be updated to 2012.

    added:
      mysql-test/r/blackhole.result
      mysql-test/suite/innodb/r/innodb_bug13635833.result
      mysql-test/suite/innodb/t/innodb_bug13635833.test
      mysql-test/suite/rpl/r/rpl_row_merge_engine.result
      mysql-test/suite/rpl/t/rpl_row_merge_engine.test
      mysql-test/t/blackhole.test
    modified:
      include/my_base.h
      include/violite.h
      mysql-test/r/cast.result
      mysql-test/r/errors.result
      mysql-test/r/gis.result
      mysql-test/r/subselect.result
      mysql-test/r/subselect_innodb.result
      mysql-test/r/user_var.result
      mysql-test/t/cast.test
      mysql-test/t/errors.test
      mysql-test/t/gis.test
      mysql-test/t/subselect.test
      mysql-test/t/subselect_innodb.test
      mysql-test/t/user_var.test
      mysys/my_handler_errors.h
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/handler.cc
      sql/item.cc
      sql/item_subselect.cc
      sql/item_timefunc.cc
      sql/log_event.cc
      sql/log_event_old.cc
      sql/mysqld.cc
      sql/password.c
      sql/rpl_rli.cc
      sql/share/errmsg-utf8.txt
      sql/spatial.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_select.cc
      storage/blackhole/ha_blackhole.cc
      storage/innobase/dict/dict0dict.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/db0err.h
      storage/innobase/include/univ.i
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0mysql.c
      storage/innobase/ut/ut0ut.c
      vio/viosocket.c
No bundle (reason: useless for push emails).