bk commit into 4.1 tree (timour:1.2538)

[timour]

Below is the list of changes that have just been committed into a local
4.1 repository of tkatchaounov. When tkatchaounov 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-07-25 22:44:22+03:00, timour@stripped +1 -0
  Merge tkatchaounov@stripped:/home/bk/mysql-4.1-opt
  into  lamia.home:/home/tkatchaounov/autopush/4.1-bug-20954
  MERGE: 1.2536.1.1

  mysql-test/r/subselect.result@stripped, 2006-07-25 22:44:20+03:00, timour@stripped +0 -0
    Auto merged
    MERGE: 1.178.1.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:	timour
# Host:	lamia.home
# Root:	/home/tkatchaounov/autopush/4.1-bug-20954/RESYNC

--- 1.179/mysql-test/r/subselect.result	2006-07-25 22:44:25 +03:00
+++ 1.180/mysql-test/r/subselect.result	2006-07-25 22:44:25 +03:00
@@ -539,7 +539,7 @@ EXPLAIN EXTENDED SELECT MAX(numreponse) 
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
 Warnings:
-Note	1003	select max(test.t1.numreponse) AS `MAX(numreponse)` from test.t1 where (test.t1.numeropost = _latin1'1')
+Note	1003	select max(test.t1.numreponse) AS `MAX(numreponse)` from test.t1
 EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT MAX(numreponse) FROM t1 WHERE numeropost='1');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	const	PRIMARY,numreponse	PRIMARY	7	const,const	1	Using index