Commit 857bc49d authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents dcd8383b 69760897

ndb/include/kernel/signaldata/CreateEvnt.hpp

+0 −1
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ struct CreateEvntRef { 
    EventNameTooLong = 4708,

    EventNameExists = 746,

    EventNotFound = 4731,

    AttributeNotStored = 4245,

    AttributeNullable = 4246,

    BadRequestType = 4247,

    InvalidName = 4248,

ndb/include/kernel/signaldata/CreateIndx.hpp

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ public: 
    IndexNameTooLong = 4241,

    TooManyIndexes = 4242,

    IndexExists = 4244,

    AttributeNotStored = 4245,

    AttributeNullable = 4246,

    BadRequestType = 4247,

    InvalidName = 4248,

ndb/src/ndbapi/ndberror.c

+0 −1
Original line number Diff line number Diff line
@@ -494,7 +494,6 @@ ErrorBundle ErrorCodes[] = { 
  { 4242, AE, "Too many indexes" },

  { 4243, AE, "Index not found" },

  { 4244, OE, "Index or table with given name already exists" },

  { 4245, AE, "Index attribute must be defined as stored, i.e. the StorageAttributeType must be defined as NormalStorageAttribute"},

  { 4247, AE, "Illegal index/trigger create/drop/alter request" },

  { 4248, AE, "Trigger/index name invalid" },

  { 4249, AE, "Invalid table" },

ndb/test/include/NdbSchemaOp.hpp

+3 −46
Original line number Diff line number Diff line
@@ -78,29 +78,6 @@ 
    NoStorageTypeDef              ///< Used for debugging only

  };

  

  /**

   * Where attribute is stored.

   *

   * This is used to indicate whether a primary key

   * should only be stored in the index storage and not in the data storage

   * or if it should be stored in both places.

   * The first alternative makes the attribute take less space, 

   * but makes it impossible to scan using attribute.

   *

   * @note  Use NormalStorageAttribute for most cases.

   *        (IndexStorageAttribute should only be used on primary key 

   *        attributes and only if you do not want to scan using the attribute.)

   */

  enum StorageAttributeType { 

    NoStorageAttributeTypeDefined = -1,  ///< <i>Missing explanation</i>

    IndexStorageAttribute,               ///< Attribute is only stored in 

                                         ///< index storage (ACC)

    NormalStorageAttribute               ///< Attribute values are stored 

                                         ///< both in the index (ACC) and 

                                         ///< in the data storage (TUP)

  };

  

  

  /**

   *  Type of fragmentation used for a table

   */
@@ -405,27 +382,7 @@ public: 
   *                     the attribute.

   *                     <br>

   *                     Legal values: true, false

   * @param aStType      Stored in both index and data storage or 

   *                     only store in index data storage.

   *                     <br>

   *                     This parameter is only of interest for tuple 

   *                     key attributes.

   * 			 All tuple key attributes values are always stored 

   *                     in the index storage part.

   *                     If this parameter is set to 

   *                     IndexStorageAttribute, then the attribute values 

   *                     will <em>only</em> be stored in the index 

   *                     storage part and <em>not</em> in the data 

   *                     storage part. 

   *                     <br>

   *                     If there will be no scans using the primary

   *                     key attribute and if the size of the attribute 

   *                     is large, then this might be of interest.

   *                     A typical example is a table where 

   *                     http-addresses are used as primary key.

   *                     <br>

   *                     Legal values: NormalStorageAttribute, 

   *                                   IndexStorageAttribute

   * @param aStType      Obsolete since wl-2066

   * @param aDistributionKey    Sometimes it is preferable to use a subset

   *                            of the primary key as the distribution key. 

   *                            An example is TPC-C where it might be
@@ -474,7 +431,7 @@ public: 
		      AttrType aAttrType = UnSigned,

		      StorageMode aStorageMode = MMBased,

		      bool nullable = false,

		      StorageAttributeType aStType= NormalStorageAttribute,

		      int aStType= 0, // obsolete

		      int aDistributionKey = 0,

		      int aDistributionGroup = 0,

		      int aDistributionGroupNoOfBits = 16,
@@ -491,7 +448,7 @@ public: 
		      AttrType aAttrType,

		      StorageMode aStorageMode,

		      NullAttributeType aNullAttr,

		      StorageAttributeType aStType = NormalStorageAttribute,

		      int aStType, // obsolete

		      int aDistributionKey = 0,

		      int aDistributionGroup = 0,

		      int aDistributionGroupNoOfBits = 16){

ndb/test/ndbapi/bench/userInterface.cpp

+3 −3
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ create_table_server(Ndb * pNdb){ 
      String, 

      MMBased,

      NotNullAttribute,

      NormalStorageAttribute,

      0,

      0,

      1,

      16);
@@ -376,7 +376,7 @@ create_table_subscriber(Ndb * pNdb){ 
      String, 

      MMBased,

      NotNullAttribute,

      NormalStorageAttribute,

      0,

      0,

      1,

      16);
@@ -494,7 +494,7 @@ create_table_session(Ndb * pNdb){ 
				       String, 

				       MMBased,

				       NotNullAttribute,

				       NormalStorageAttribute,

				       0,

				       0,

				       1,

				       16);