after merge fixes

include/my_tree.h:
  After merge fixes
mysql-test/r/create.result:
  After merge fixes
mysql-test/r/insert.result:
  After merge fixes
mysql-test/r/multi_update.result:
  After merge fixes
mysql-test/r/query_cache.result:
  After merge fixes
mysql-test/r/rpl_error_ignored_table.result:
  After merge fixes
mysql-test/r/rpl_optimize.result:
  After merge fixes
mysql-test/r/show_check.result:
  After merge fixes
mysql-test/t/insert.test:
  After merge fixes (Remove columns with space last)
mysql-test/t/multi_update.test:
  After merge fixes
mysql-test/t/show_check.test:
  After merge fixes
sql/field.cc:
  Remove compiler warnings
sql/sql_base.cc:
  Fix bug when table was refreshed

1 files changed, 3 insertions, 3 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 73596b71623..343ab89e6b5 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -263,11 +263,11 @@ a	b
 3	4
 drop table t1;
 create table `t1 `(a int);
-Incorrect table name 't1 '
+ERROR 42000: Incorrect table name 't1 '
 create database `db1 `;
-Incorrect database name 'db1 '
+ERROR 42000: Incorrect database name 'db1 '
 create table t1(`a ` int);
-Incorrect column name 'a '
+ERROR 42000: Incorrect column name 'a '
 create table t1 (a int, key(a));
 create table t2 (b int, foreign key(b) references t1(a), key(b));
 drop table if exists t1,t2;