Fix test results from merge, and fix the symlink test which had an

out-of-sync test and result.


mysql-test/r/type_float.result:
  Warning message text changed
mysql-test/t/symlink.test:
  Re-enable part of test
mysql-test/r/symlink.result:
  Update results to match test

1 files changed, 2 insertions, 2 deletions

diff --git a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
index 9e71ac4b925..25c78129129 100644
--- a/mysql-test/t/symlink.test
+++ b/mysql-test/t/symlink.test
@@ -50,8 +50,8 @@ optimize table t9;
 repair table t9;
 alter table t9 add column c int not null;
 
-#--replace_result $MYSQL_TEST_DIR TEST_DIR
-#show create table t9;
+--replace_result $MYSQL_TEST_DIR TEST_DIR
+show create table t9;
 
 # Test renames
 alter table t9 rename t8, add column d int not null;