Commit d9ec5a4e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/d2/hf/common/my50-common 

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


mysql-test/r/flush_block_commit_notembedded.result:
  merging
parents e9a98339 42a7506d

mysql-test/t/mysql_upgrade.test

+3 −0
Original line number Diff line number Diff line 
# Can't run test of external client with embedded server

-- source include/not_embedded.inc



# Only run test if "mysql_upgrade" is found

--require r/have_mysql_upgrade.result

--disable_query_log