Merge hf@192.168.21.12:work/embt/my50-embt

into  mysql.com:/d2/hf/my51-embt


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/federated.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/flush_block_commit.result:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged

mysql-test/t/lock_multi.test

+-- source include/not_embedded.inc
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings