bzr commit into mysql-6.0-backup branch (kgeorge:2739)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/bzr/fix-6.0-bugteam/

 2739 Georgi Kodinov	2008-07-23
      fixed 5.1-bugteam -> 6.0-bugteam merge problems 
modified:
  mysql-test/mysql-test-run.pl*
  mysql-test/r/partition_pruning.result

per-file messages:
  mysql-test/mysql-test-run.pl
    added executable flag
  mysql-test/r/partition_pruning.result
    fixed key length in EXPLAIN
=== modified file 'mysql-test/mysql-test-run.pl' (properties changed: -x to +x)
=== modified file 'mysql-test/r/partition_pruning.result'
--- a/mysql-test/r/partition_pruning.result	2008-07-22 10:51:13 +0000
+++ b/mysql-test/r/partition_pruning.result	2008-07-23 13:17:13 +0000
@@ -342,7 +342,7 @@ id	select_type	table	partitions	type	pos
 explain partitions
 select * from t1 X, t1 Y where X.a = Y.a and (X.a=1 or X.a=2);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	X	p1,p2	ALL	a	NULL	NULL	NULL	4	Using where
+1	SIMPLE	X	p1,p2	ALL	a	NULL	NULL	NULL	2	Using where
 1	SIMPLE	Y	p1,p2	ref	a	a	4	test.X.a	2	
 drop table t1;
 create table t1 (a int) partition by hash(a) partitions 20;