bk commit into 5.0 tree (mskold:1.2266)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 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-09-13 19:59:22+02:00, mskold@stripped +1 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
  MERGE: 1.1616.2735.3

  mysql-test/r/ndb_multi.result@stripped, 2006-09-13 19:59:18+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.2

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

--- 1.6/mysql-test/r/ndb_multi.result	2006-09-13 19:59:28 +02:00
+++ 1.7/mysql-test/r/ndb_multi.result	2006-09-13 19:59:28 +02:00
@@ -88,7 +88,7 @@ show tables;
 Tables_in_test
 t1
 Warnings:
-Warning	1050	Local table t1 shadows cluster table
+Warning	1050	Local table test.t1 shadows ndb table
 select * from t1 order by c1;
 c1
 100