bk commit into 5.0 tree (svoj:1.2242)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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-08-07 19:35:02+05:00, svoj@stripped +1 -0
  After merge fix.

  mysql-test/r/ps_7ndb.result@stripped, 2006-08-07 19:34:57+05:00, svoj@stripped +1 -1
    After merge fix.

# 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:	svoj
# Host:	may.pils.ru
# Root:	/home/svoj/devel/mysql/BUG14770/mysql-5.0-engines

--- 1.42/mysql-test/r/ps_7ndb.result	2006-08-07 19:35:10 +05:00
+++ 1.43/mysql-test/r/ps_7ndb.result	2006-08-07 19:35:10 +05:00
@@ -1287,7 +1287,7 @@
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
 select a,b from t1 order by a;
 a	b
 0	two