bk commit into 5.0 tree (andrey:1.1909)

[ahristov]

Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1909 05/08/29 21:00:43 andrey@lmy004. +3 -0
  fix for bug 12207 (alter table discard tablespace on MyISAM table
  causes ERROR 2013).
  (all-in-one approved patch)

  sql/sql_table.cc
    1.270 05/08/29 21:00:37 andrey@lmy004. +3 -3
    send all error message to table->file->print_error() thus not missing
    handing of some (like engine not supported).
    
    fix for bug #12207 (alter table discard tablespace on MyISAM table
    causes ERROR 2013)

  mysql-test/t/alter_table.test
    1.38 05/08/29 21:00:37 andrey@lmy004. +8 -0
    test for bug #12207 (alter table discard tablescpae on MyISAM table
    causes ERROR 2013)

  mysql-test/r/alter_table.result
    1.51 05/08/29 21:00:37 andrey@lmy004. +4 -0
    result for test for bug #12207
    (alter table discard database works on mysiam and causes error 2013)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.0-clean

--- 1.269/sql/sql_table.cc	2005-08-26 10:49:14 +02:00
+++ 1.270/sql/sql_table.cc	2005-08-29 21:00:37 +02:00
@@ -2820,15 +2820,15 @@
 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);
 }
 

--- 1.50/mysql-test/r/alter_table.result	2005-08-08 15:46:00 +02:00
+++ 1.51/mysql-test/r/alter_table.result	2005-08-29 21:00:37 +02:00
@@ -523,6 +523,10 @@
 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;

--- 1.37/mysql-test/t/alter_table.test	2005-07-28 15:12:32 +02:00
+++ 1.38/mysql-test/t/alter_table.test	2005-08-29 21:00:37 +02:00
@@ -338,6 +338,14 @@
 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
 #
 # The column's character set was changed but the actual data was not