fix alter_table.test: remove old assert as it was removed from 5.6,

add extra_func code from 5.5, that was lost in a merge

1 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index b2cfd079ff5..9fbd585e25a 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -270,8 +270,8 @@ ERROR 42000: Incorrect table name ''
 drop table t1;
 drop table if exists t1, t2;
 Warnings:
-Note	1051	Unknown table 't1'
-Note	1051	Unknown table 't2'
+Note	1051	Unknown table 'test.t1'
+Note	1051	Unknown table 'test.t2'
 create table t1 ( a varchar(10) not null primary key ) engine=myisam;
 create table t2 ( a varchar(10) not null primary key ) engine=merge union=(t1);
 flush tables;
@@ -415,7 +415,7 @@ alter table t1 drop key a;
 drop table t1;
 CREATE TABLE T12207(a int) ENGINE=MYISAM;
 ALTER TABLE T12207 DISCARD TABLESPACE;
-ERROR HY000: Table storage engine for 'T12207' doesn't have this option
+ERROR HY000: Storage engine MyISAM of the table `test`.`T12207` doesn't have this option
 DROP TABLE T12207;
 create table t1 (a text) character set koi8r;
 insert into t1 values (_koi8r'ΤΕΣΤ');
@@ -556,7 +556,7 @@ create database mysqltest;
 create table t1 (c1 int);
 alter table t1 rename mysqltest.t1;
 drop table t1;
-ERROR 42S02: Unknown table 't1'
+ERROR 42S02: Unknown table 'test.t1'
 alter table mysqltest.t1 rename t1;
 drop table t1;
 create table t1 (c1 int);