After merge fixes

Don't create temporary objects with no table name


myisam/mi_open.c:
  After merge fix
mysql-test/r/analyse.result:
  After merge fix
mysql-test/r/backup.result:
  After merge fix
mysql-test/r/create.result:
  After merge fix
mysql-test/r/delete.result:
  After merge fix
mysql-test/r/func_like.result:
  After merge fix
mysql-test/r/innodb.result:
  After merge fix
mysql-test/r/rpl_loaddatalocal.result:
  After merge fix
mysql-test/r/type_timestamp.result:
  After merge fix
mysql-test/t/delete.test:
  Change to not use table 't'
sql/sql_class.h:
  Remove usage of thd when creating 'Table_ident'
  Don't create temporary objects with no table name
sql/sql_derived.cc:
  Indentation fix
sql/sql_select.cc:
  After merge fix
  Fixed wrong return -> DBUG_RETURN()
sql/sql_yacc.yy:
  Remove usage of thd when creating 'Table_ident'

1 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
index ee0c3ce1219..ae216f9b380 100644
--- a/mysql-test/r/delete.result
+++ b/mysql-test/r/delete.result
@@ -24,14 +24,14 @@ create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a));
 insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27);
 delete from t1 where a=27;
 drop table t1;
-CREATE TABLE `t` (
+CREATE TABLE `t1` (
 `i` int(10) NOT NULL default '0',
 `i2` int(10) NOT NULL default '0',
 PRIMARY KEY  (`i`)
-) TYPE=MyISAM CHARSET=latin1;
-DELETE FROM t USING t WHERE post='1';
+);
+DELETE FROM t1 USING t1 WHERE post='1';
 Unknown column 'post' in 'where clause'
-drop table if exists t;
+drop table t1;
 CREATE TABLE t1 (
 bool     char(0) default NULL,
 not_null varchar(20) binary NOT NULL default '',