bk commit into 5.1 tree (gluh:1.2375)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 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, 2006-11-21 16:45:05+04:00, gluh@stripped +1 -0
  after merge fix

  mysql-test/r/information_schema.result@stripped, 2006-11-21 16:44:59+04:00, gluh@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:	gluh
# Host:	gluh.(none)
# Root:	/home/gluh/MySQL/Merge/5.1-opt

--- 1.138/mysql-test/r/information_schema.result	2006-11-21 16:45:17 +04:00
+++ 1.139/mysql-test/r/information_schema.result	2006-11-21 16:45:17 +04:00
@@ -1338,7 +1338,7 @@
 explain select * from v1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	0	const row not found
-2	DERIVED	tables	ALL	NULL	NULL	NULL	NULL	2	Using filesort
+2	DERIVED	tables	ALL	NULL	NULL	NULL	NULL	0	Using filesort
 explain select * from (select table_name from information_schema.tables) as a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	0	const row not found