bk commit into 5.0 tree (gluh:1.2509)

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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-05-30 17:09:16+05:00, gluh@eagle.(none) +1 -0
  Merge sgluhov@stripped:/home/bk/mysql-5.0-opt
  into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
  MERGE: 1.2503.1.2

  mysql-test/r/view.result@stripped, 2007-05-30 17:09:12+05:00, gluh@eagle.(none) +0 -0
    Auto merged
    MERGE: 1.201.2.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:	gluh
# Host:	eagle.(none)
# Root:	/home/gluh/MySQL/Merge/5.0-opt/RESYNC

--- 1.203/mysql-test/r/view.result	2007-05-30 15:46:20 +05:00
+++ 1.204/mysql-test/r/view.result	2007-05-30 17:09:12 +05:00
@@ -1497,7 +1497,7 @@ insert into v3(b) values (10);
 insert into v3(a) select a from t2;
 insert into v3(b) select b from t2;
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL
column 'a' at row 2
+Warning	1048	Column 'a' cannot be null
 insert into v3(a) values (1) on duplicate key update a=a+10000+VALUES(a);
 select * from t1;
 a	b