Commit e7816165 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into lmy004.:/work/mysql-5.0-clean
parents a5403486 04af59a3

mysql-test/r/alter_table.result

+4 −0
Original line number Diff line number Diff line
@@ -523,6 +523,10 @@ alter table t1 drop key no_such_key; 
ERROR 42000: Can't DROP 'no_such_key'; check that column/key exists

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

DROP TABLE T12207;

create table t1 (a text) character set koi8r;

insert into t1 values (_koi8r'');

select hex(a) from t1;

mysql-test/t/alter_table.test

+8 −0
Original line number Diff line number Diff line
@@ -337,6 +337,14 @@ alter table t1 drop key no_such_key; 
alter table t1 drop key a;

drop table t1;



#

# BUG 12207 alter table ... discard table space on MyISAM table causes ERROR 2013 (HY000)

#

CREATE TABLE T12207(a int) ENGINE=MYISAM;

--error 1031

ALTER TABLE T12207 DISCARD TABLESPACE;

DROP TABLE T12207;



#

# Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns

#

sql/sql_table.cc

+3 −3
Original line number Diff line number Diff line
@@ -2820,14 +2820,14 @@ mysql_discard_or_import_tablespace(THD *thd, 
err:

  close_thread_tables(thd);

  thd->tablespace_op=FALSE;

  

  if (error == 0)

  {

    send_ok(thd);

    DBUG_RETURN(0);

  }



  if (error == HA_ERR_ROW_IS_REFERENCED)

    my_error(ER_ROW_IS_REFERENCED, MYF(0));

  table->file->print_error(error, MYF(0));

    

  DBUG_RETURN(-1);

}