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, 12 insertions, 23 deletions

diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index b3d996c1475..fd728c453aa 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -93,61 +93,50 @@ drop database mysqltest;
 #
 
 use test;
-create table t1(
-    `number          ` int auto_increment primary key,
-    `original_value  ` varchar(50),
-    `f_double        ` double,
-    `f_float         ` float,
-    `f_double_7_2    ` double(7,2),
-    `f_float_4_3     ` float (4,3),
-    `f_double_u      ` double unsigned,
-    `f_float_u       ` float unsigned,
-    `f_double_15_1_u ` double(15,1) unsigned,
-    `f_float_3_1_u   ` float (3,1) unsigned
-);
+create table t1(number int auto_increment primary key, original_value varchar(50), f_double double, f_float float, f_double_7_2 double(7,2), f_float_4_3 float (4,3), f_double_u double unsigned, f_float_u float unsigned, f_double_15_1_u double(15,1) unsigned, f_float_3_1_u float (3,1) unsigned);
 
 set @value= "aa";
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= "1aa";
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= "aa1";
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= "1e+1111111111a";
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= "-1e+1111111111a";
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= 1e+1111111111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= -1e+1111111111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= 1e+111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= -1e+111;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= 1;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 set @value= -1;
 insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
---query_vertical select * from t1 where `number          `=last_insert_id()
+--query_vertical select * from t1 where number =last_insert_id()
 
 drop table t1;