bk commit into 5.1 tree (jonas:1.1930)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.1930 05/10/14 13:52:00 jonas@stripped +1 -0
  ndb -
    update test result for conflicting error codes

  mysql-test/r/ndb_partition_error.result
    1.5 05/10/14 13:51:56 jonas@stripped +1 -1
    update fixed error code

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1

--- 1.4/mysql-test/r/ndb_partition_error.result	2005-07-22 18:17:21 +02:00
+++ 1.5/mysql-test/r/ndb_partition_error.result	2005-10-14 13:51:56 +02:00
@@ -11,7 +11,7 @@
 (partition x1 values less than (5) nodegroup 12,
 partition x2 values less than (10) nodegroup 13,
 partition x3 values less than (20) nodegroup 14);
-ERROR HY000: Can't create table './test/t1.frm' (errno: 747)
+ERROR HY000: Can't create table './test/t1.frm' (errno: 771)
 CREATE TABLE t1 (
 a int not null,
 b int not null,