bk commit into 6.0 tree (svoj:1.2670) BUG#31110

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
6.0 repository of svoj. When svoj 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@stripped, 2007-11-13 13:38:29+04:00, svoj@stripped +5 -0
  BUG#31110 - falcon: missing engine check while dropping tablespace
  
  Creating a tablespace with engine that doesn't support tablespaces
  reports a warning and succeedes doing nothing.
  
  With this fix such statement returns and error instead.
  
  Note that this problem is not actually related to falcon, but is
  generic server issue.

  mysql-test/suite/falcon/r/falcon_ts.result@stripped, 2007-11-13 13:38:27+04:00, svoj@stripped +2 -0
    A test case for BUG#31110.

  mysql-test/suite/falcon/r/falcon_ts.result@stripped, 2007-11-13 13:38:27+04:00, svoj@stripped +0 -0

  mysql-test/suite/falcon/t/falcon_ts.test@stripped, 2007-11-13 13:38:27+04:00, svoj@stripped +7 -0
    A test case for BUG#31110.

  mysql-test/suite/falcon/t/falcon_ts.test@stripped, 2007-11-13 13:38:27+04:00, svoj@stripped +0 -0

  mysql-test/suite/ndb/r/ndb_dd_basic.result@stripped, 2007-11-13 13:38:27+04:00, svoj@stripped +3 -7
    Modified a test case according to fix for BUG#31110.

  mysql-test/suite/ndb/t/ndb_dd_basic.test@stripped, 2007-11-13 13:38:27+04:00, svoj@stripped +3 -0
    Modified a test case according to fix for BUG#31110.

  sql/sql_tablespace.cc@stripped, 2007-11-13 13:38:27+04:00, svoj@stripped +4 -5
    Return an error (instead of warning) when engine doesn't support
    tablespaces.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_ts.result b/mysql-test/suite/falcon/r/falcon_ts.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_ts.result	2007-11-13 13:38:27 +04:00
@@ -0,0 +1,2 @@
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=MyISAM;
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
diff -Nrup a/mysql-test/suite/falcon/t/falcon_ts.test b/mysql-test/suite/falcon/t/falcon_ts.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_ts.test	2007-11-13 13:38:27 +04:00
@@ -0,0 +1,7 @@
+--source include/have_falcon.inc
+
+#
+# BUG#31110 - falcon: missing engine check while dropping tablespace
+#
+--error 1477
+CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=MyISAM;
diff -Nrup a/mysql-test/suite/ndb/r/ndb_dd_basic.result b/mysql-test/suite/ndb/r/ndb_dd_basic.result
--- a/mysql-test/suite/ndb/r/ndb_dd_basic.result	2007-10-30 17:09:48 +04:00
+++ b/mysql-test/suite/ndb/r/ndb_dd_basic.result	2007-11-13 13:38:27 +04:00
@@ -7,21 +7,17 @@ ADD UNDOFILE 'undofile.dat'
 INITIAL_SIZE 16M
 UNDO_BUFFER_SIZE = 1M
 ENGINE=MYISAM;
-Warnings:
-Error	1477	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 ALTER LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile02.dat'
 INITIAL_SIZE = 4M 
 ENGINE=XYZ;
-Warnings:
-Warning	1286	Unknown table engine 'XYZ'
-Error	1477	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 CREATE TABLESPACE ts1
 ADD DATAFILE 'datafile.dat'
 USE LOGFILE GROUP lg1
 INITIAL_SIZE 12M;
-Warnings:
-Error	1477	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
+ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
 set storage_engine=ndb;
 CREATE LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile.dat'
diff -Nrup a/mysql-test/suite/ndb/t/ndb_dd_basic.test b/mysql-test/suite/ndb/t/ndb_dd_basic.test
--- a/mysql-test/suite/ndb/t/ndb_dd_basic.test	2007-08-27 12:05:24 +05:00
+++ b/mysql-test/suite/ndb/t/ndb_dd_basic.test	2007-11-13 13:38:27 +04:00
@@ -25,17 +25,20 @@ DROP TABLE IF EXISTS t1;
 --enable_warnings
 
 # some negative tests
+--error 1477
 CREATE LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile.dat'
 INITIAL_SIZE 16M
 UNDO_BUFFER_SIZE = 1M
 ENGINE=MYISAM;
 
+--error 1477
 ALTER LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile02.dat'
 INITIAL_SIZE = 4M 
 ENGINE=XYZ;
 
+--error 1477
 CREATE TABLESPACE ts1
 ADD DATAFILE 'datafile.dat'
 USE LOGFILE GROUP lg1
diff -Nrup a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc
--- a/sql/sql_tablespace.cc	2007-06-19 16:27:52 +05:00
+++ b/sql/sql_tablespace.cc	2007-11-13 13:38:27 +04:00
@@ -60,11 +60,10 @@ int mysql_alter_tablespace(THD *thd, st_
   }
   else
   {
-    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
-                        ER_ILLEGAL_HA_CREATE_OPTION,
-                        ER(ER_ILLEGAL_HA_CREATE_OPTION),
-                        ha_resolve_storage_engine_name(hton),
-                        "TABLESPACE or LOGFILE GROUP");
+    my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
+             ha_resolve_storage_engine_name(hton),
+             "TABLESPACE or LOGFILE GROUP");
+    DBUG_RETURN(HA_ADMIN_NOT_IMPLEMENTED);
   }
   write_bin_log(thd, FALSE, thd->query, thd->query_length);
   DBUG_RETURN(FALSE);