bzr push into mysql-5.5 branch (MYSQL-RE_WW:3613 to 3614)

[Build Team]

 3614 hery.ramilison@stripped	2011-11-17
      fix for bug 11748060/34981

    modified:
      scripts/mysqld_safe.sh
 3613 hery.ramilison@stripped	2011-11-17 [merge]
      Merge from mysql-5.5.18-release

    added:
      mysql-test/suite/innodb/r/innodb_bug12661768.result
      mysql-test/suite/innodb/r/innodb_misc1.result
      mysql-test/suite/innodb/t/innodb_bug12661768.test
      mysql-test/suite/innodb/t/innodb_misc1-master.opt
      mysql-test/suite/innodb/t/innodb_misc1.test
    modified:
      mysql-test/r/func_if.result
      mysql-test/r/func_str.result
      mysql-test/r/group_min_max_innodb.result
      mysql-test/r/partition_innodb_plugin.result
      mysql-test/r/sp.result
      mysql-test/r/type_newdecimal.result
      mysql-test/r/view_grant.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_bug54044.result
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_bug54044.test
      mysql-test/suite/parts/r/partition_debug_innodb.result
      mysql-test/suite/parts/t/partition_debug_innodb.test
      mysql-test/t/func_if.test
      mysql-test/t/func_str.test
      mysql-test/t/group_min_max_innodb.test
      mysql-test/t/partition_innodb_plugin.test
      mysql-test/t/sp.test
      mysql-test/t/type_newdecimal.test
      mysql-test/t/view_grant.test
      sql/field.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/handler.h
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_strfunc.cc
      sql/my_decimal.h
      sql/opt_range.cc
      sql/share/errmsg-utf8.txt
      sql/sp_head.cc
      sql/sql_acl.cc
      sql/sql_cache.cc
      sql/sql_lex.cc
      sql/sql_parse.cc
      sql/sql_reload.cc
      sql/sql_repl.cc
      sql/sql_view.cc
      sql/sql_yacc.yy
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/row/row0ins.c
      strings/decimal.c
      tests/mysql_client_test.c
=== modified file 'scripts/mysqld_safe.sh'
--- a/scripts/mysqld_safe.sh	2010-07-05 21:19:14 +0000
+++ b/scripts/mysqld_safe.sh	2011-11-17 08:13:43 +0000
@@ -464,6 +464,9 @@ export MYSQL_HOME
 if test -x "$MY_BASEDIR_VERSION/bin/my_print_defaults"
 then
   print_defaults="$MY_BASEDIR_VERSION/bin/my_print_defaults"
+elif test -x `dirname $0`/my_print_defaults
+then
+  print_defaults="`dirname $0`/my_print_defaults"
 elif test -x ./bin/my_print_defaults
 then
   print_defaults="./bin/my_print_defaults"

No bundle (reason: useless for push emails).