bk commit into 5.0 tree (andrey:1.1956) BUG#12207

[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.1956 05/08/08 16:49:40 andrey@lmy004. +4 -0
  fix for bug #12207 - ALTER TABLE DISCARD TABLESPACE  on a MyISAM table makes client to hang

  sql/sql_table.cc
    1.268 05/08/08 16:49:30 andrey@lmy004. +3 -1
    if there was an error call my_error(), don't be silent or the client will hang on waiting.

  sql/share/errmsg.txt
    1.38 05/08/08 16:49:30 andrey@lmy004. +2 -0
    new message used by fix for bug #12207 but could be used on other occasions

  mysql-test/t/alter_table.test
    1.38 05/08/08 16:49:30 andrey@lmy004. +8 -0
    test for bug #12207

  mysql-test/r/alter_table.result
    1.50 05/08/08 16:47:33 andrey@lmy004. +4 -0
    result for test of bug 12207 - DISCARD TABLESPACE silent on MyISAM

# 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:	/home/andrey/mysql-5.0-bug12207

--- 1.267/sql/sql_table.cc	2005-08-04 02:06:15 +02:00
+++ 1.268/sql/sql_table.cc	2005-08-08 16:49:30 +02:00
@@ -2798,8 +2798,10 @@
   thd->proc_info="end";
 
   if (error)
+  {
+    my_error(ER_UNSUPPORTED_ENGINE_OPERATION, MYF(0));
     goto err;
-
+  }
   /*
     The 0 in the call below means 'not in a transaction', which means
     immediate invalidation; that is probably what we wish here

--- 1.37/sql/share/errmsg.txt	2005-08-03 01:28:30 +02:00
+++ 1.38/sql/share/errmsg.txt	2005-08-08 16:49:30 +02:00
@@ -5388,3 +5388,5 @@
 	eng "Thread stack overrun:  %ld bytes used of a %ld byte stack, and %ld bytes needed.  Use 'mysqld -O thread_stack=#' to specify a bigger stack."
 ER_TOO_LONG_BODY 42000 S1009
 	eng "Routine body for '%-.100s' is too long"
+ER_UNSUPPORTED_ENGINE_OPERATION
+        eng "Operation not supported by this table handler"

--- 1.49/mysql-test/r/alter_table.result	2005-05-16 14:21:31 +02:00
+++ 1.50/mysql-test/r/alter_table.result	2005-08-08 16:47:33 +02:00
@@ -537,3 +537,7 @@
 alter table t1 add unique ( a(1) );
 ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys
 drop table t1;
+CREATE TABLE T12207(a int) ENGINE=MYISAM;
+ALTER TABLE T12207 DISCARD TABLESPACE;
+ERROR HY000: Operation not supported by this table handler
+DROP TABLE T12207;

--- 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-08 16:49:30 +02:00
@@ -362,3 +362,11 @@
 drop table t1;
 
 # End of 4.1 tests
+
+#
+# BUG 12207 alter table ... discard table space on MyISAM table causes ERROR 2013 (HY000)
+#
+CREATE TABLE T12207(a int) ENGINE=MYISAM;
+--error 1438
+ALTER TABLE T12207 DISCARD TABLESPACE;
+DROP TABLE T12207;