bk commit into 5.1 tree (mskold:1.2383)

[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, 2007-01-08 11:47:33+01:00, mskold@stripped +3 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
  MERGE: 1.2373.1.3

  mysql-test/r/ndb_index_ordered.result@stripped, 2007-01-08 11:47:24+01:00, mskold@stripped
+0 -0
    Auto merged
    MERGE: 1.25.1.1

  mysql-test/t/ndb_index_ordered.test@stripped, 2007-01-08 11:47:24+01:00, mskold@stripped
+0 -0
    Auto merged
    MERGE: 1.28.1.1

  sql/ha_ndbcluster.cc@stripped, 2007-01-08 11:47:24+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.384.1.1

# 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/RESYNC

--- 1.26/mysql-test/r/ndb_index_ordered.result	2007-01-08 11:47:43 +01:00
+++ 1.27/mysql-test/r/ndb_index_ordered.result	2007-01-08 11:47:43 +01:00
@@ -835,3 +835,12 @@ a
 3
 delete from t1;
 drop table t1;
+create table nationaldish (DishID int(10) unsigned NOT NULL AUTO_INCREMENT,
+CountryCode char(3) NOT NULL,
+DishTitle varchar(64) NOT NULL,
+calories smallint(5) unsigned DEFAULT NULL,
+PRIMARY KEY (DishID)
+) ENGINE=ndbcluster;
+create index i on nationaldish(countrycode,calories) using hash;
+ERROR 42000: Table 'nationaldish' uses an extension that doesn't exist in this MySQL
version
+drop table nationaldish;

--- 1.29/mysql-test/t/ndb_index_ordered.test	2007-01-08 11:47:43 +01:00
+++ 1.30/mysql-test/t/ndb_index_ordered.test	2007-01-08 11:47:43 +01:00
@@ -455,3 +455,17 @@ rollback;
 select * from t1 order by a;
 delete from t1;
 drop table t1;
+
+# bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH
index
+
+create table nationaldish (DishID int(10) unsigned NOT NULL AUTO_INCREMENT,
+                           CountryCode char(3) NOT NULL,
+                           DishTitle varchar(64) NOT NULL,
+                           calories smallint(5) unsigned DEFAULT NULL,
+                           PRIMARY KEY (DishID)
+                           ) ENGINE=ndbcluster;
+
+--error ER_UNSUPPORTED_EXTENSION
+create index i on nationaldish(countrycode,calories) using hash;
+
+drop table nationaldish;