bk commit into 5.1 tree (mskold:1.2373) BUG#24667

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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, 2006-12-20 15:15:26+01:00, mskold@stripped +6 -0
  ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc:
    bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed
TABLESPACE declaration for STORAGE MEMORY
  Makefile:
    Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile ->
storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
  mgmapi_logevent2.cpp:
    Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp
-> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
  Makefile:
    Rename mgmapi_logevent_dual to mgmapi_logevent2
  mgmapi_logevent2.cpp:
    Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp ->
storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp

  mysql-test/r/ndb_dd_ddl.result@stripped, 2006-12-20 15:05:22+01:00, mskold@stripped +5 -0
    bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed
TABLESPACE declaration for STORAGE MEMORY

  mysql-test/t/ndb_dd_ddl.test@stripped, 2006-12-20 15:05:22+01:00, mskold@stripped +9 -0
    bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed
TABLESPACE declaration for STORAGE MEMORY

  sql/ha_ndbcluster.cc@stripped, 2006-12-20 15:05:22+01:00, mskold@stripped +10 -0
    bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed
TABLESPACE declaration for STORAGE MEMORY

  storage/ndb/ndbapi-examples/Makefile@stripped, 2006-12-20 14:05:32+01:00, mskold@stripped
+1 -1
    Rename mgmapi_logevent_dual to mgmapi_logevent2

  storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile@stripped, 2006-12-20 14:05:32+01:00,
mskold@stripped +1 -1
    Rename mgmapi_logevent_dual to mgmapi_logevent2

  storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile@stripped, 2006-12-20 13:53:56+01:00,
mskold@stripped +0 -0
    Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile ->
storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile

  storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp@stripped, 2006-12-20
13:53:56+01:00, mskold@stripped +0 -0
    Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp ->
storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp

  storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp@stripped, 2006-12-20
13:52:21+01:00, mskold@stripped +0 -0
    Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp
-> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb

--- 1.12/mysql-test/r/ndb_dd_ddl.result	2006-12-20 15:15:42 +01:00
+++ 1.13/mysql-test/r/ndb_dd_ddl.result	2006-12-20 15:15:42 +01:00
@@ -183,6 +183,11 @@ INITIAL_SIZE 1M
 ENGINE NDB;
 CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
+TABLESPACE ts1 STORAGE MEMORY
+ENGINE NDB;
+ERROR HY000: Can't create table 'test.t1' (errno: 138)
+CREATE TABLE t1
+(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
 TABLESPACE ts1 STORAGE DISK
 ENGINE NDB;
 CREATE INDEX b_i on t1(b);

--- 1.11/mysql-test/t/ndb_dd_ddl.test	2006-12-20 15:15:42 +01:00
+++ 1.12/mysql-test/t/ndb_dd_ddl.test	2006-12-20 15:15:42 +01:00
@@ -270,11 +270,18 @@ ADD DATAFILE 'datafile2.dat'
 INITIAL_SIZE 1M
 ENGINE NDB;
 
+--error 1005
+CREATE TABLE t1
+(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
+TABLESPACE ts1 STORAGE MEMORY
+ENGINE NDB;
+
 CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
 TABLESPACE ts1 STORAGE DISK
 ENGINE NDB;
 
+
 CREATE INDEX b_i on t1(b);
 CREATE INDEX bc_i on t1(b, c);
 
@@ -350,5 +357,7 @@ drop logfile group lg1
 engine ndb;
 
 drop table t1;
+
+
 
 # End 5.1 test

--- 1.10/storage/ndb/ndbapi-examples/Makefile	2006-12-20 15:15:42 +01:00
+++ 1.11/storage/ndb/ndbapi-examples/Makefile	2006-12-20 15:15:42 +01:00
@@ -7,7 +7,7 @@ BIN_DIRS := 	ndbapi_simple \
 		ndbapi_scan \
 		mgmapi_logevent \
 		ndbapi_simple_dual \
-		mgmapi_logevent_dual
+		mgmapi_logevent2
 
 bins: $(patsubst %, _bins_%, $(BIN_DIRS))
 

--- 1.380/sql/ha_ndbcluster.cc	2006-12-20 15:15:42 +01:00
+++ 1.381/sql/ha_ndbcluster.cc	2006-12-20 15:15:42 +01:00
@@ -4836,6 +4836,16 @@ int ha_ndbcluster::create(const char *na
   }
   else if (info->tablespace)
   {
+    if (info->storage_media == HA_SM_MEMORY)
+    {
+      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+			  ER_ILLEGAL_HA_CREATE_OPTION,
+			  ER(ER_ILLEGAL_HA_CREATE_OPTION),
+			  ndbcluster_hton_name,
+			  "TABLESPACE currently only supported for "
+			  "STORAGE DISK"); 
+      DBUG_RETURN(HA_ERR_UNSUPPORTED);
+    }
     tab.setTablespace(info->tablespace);
     info->storage_media = HA_SM_DISK;  //if use tablespace, that also means store on
disk
   }

--- 1.1/storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile	2006-12-20 15:15:43
+01:00
+++ 1.3/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile	2006-12-20 15:15:43 +01:00
@@ -1,4 +1,4 @@
-TARGET = mgmapi_logevent_dual
+TARGET = mgmapi_logevent2
 SRCS = $(TARGET).cpp
 OBJS = $(TARGET).o
 CXX = g++