bk commit into 5.1 tree (mskold:1.2365) BUG#19196

[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
  1.2365 06/04/20 13:32:41 mskold@stripped +1 -0
  Fix for bug#19196: Attempt to create index on usupported field type gives wrong error
code: updated with new expected error codes

  mysql-test/r/ndb_bitfield.result
    1.13 06/04/20 13:31:59 mskold@stripped +6 -6
    Fix for bug#19196: Attempt to create index on usupported field type gives wrong error
code: updated with new expected error codes

# 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:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.1-new

--- 1.12/mysql-test/r/ndb_bitfield.result	2006-04-20 12:10:04 +02:00
+++ 1.13/mysql-test/r/ndb_bitfield.result	2006-04-20 13:31:59 +02:00
@@ -201,21 +201,21 @@
 pk1 bit(9) not null primary key,
 b int
 ) engine=ndbcluster;
-ERROR HY000: Can't create table 'test.t1' (errno: 140)
+ERROR HY000: Can't create table 'test.t1' (errno: 906)
 show warnings;
 Level	Code	Message
-Error	1296	Got error 739 'Unsupported primary key length' from NDB
-Error	1005	Can't create table 'test.t1' (errno: 140)
+Error	1296	Got error 906 'Unsupported attribute type in index' from NDB
+Error	1005	Can't create table 'test.t1' (errno: 906)
 create table t1 (
 pk1 int not null primary key,
 b bit(9),
 key(b)
 ) engine=ndbcluster;
-ERROR HY000: Can't create table 'test.t1' (errno: 140)
+ERROR HY000: Can't create table 'test.t1' (errno: 906)
 show warnings;
 Level	Code	Message
-Error	1296	Got error 743 'Unsupported character set in table or index' from NDB
-Error	1005	Can't create table 'test.t1' (errno: 140)
+Error	1296	Got error 906 'Unsupported attribute type in index' from NDB
+Error	1005	Can't create table 'test.t1' (errno: 906)
 create table t1 (
 pk1 int primary key,
 b bit(32) not null