bk commit into 6.0 tree (dkatz:1.2776)

[damien]

Below is the list of changes that have just been committed into a local
6.0 repository of dkatz. When dkatz 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-12-19 14:40:26-05:00, dkatz@stripped +1 -0
  Fixed test failures caused by the pool_of_threads.result file not being up to date with
the output of include/common-tests.inc

  mysql-test/r/pool_of_threads.result@stripped, 2007-12-19 14:40:21-05:00,
dkatz@stripped +0 -15
    Fixed test failures caused by the pool_of_threads.result file not being up to date
with the output of include/common-tests.inc

diff -Nrup a/mysql-test/r/pool_of_threads.result b/mysql-test/r/pool_of_threads.result
--- a/mysql-test/r/pool_of_threads.result	2007-11-21 00:26:16 -05:00
+++ b/mysql-test/r/pool_of_threads.result	2007-12-19 14:40:21 -05:00
@@ -2151,18 +2151,3 @@ Privat (Private Nutzung)	Mobilfunk
 Warnings:
 Warning	1052	Column 'kundentyp' in group statement is ambiguous
 drop table t1;
-drop table if exists t1,t2,t3;
-create table t1 (a int not null);
-insert into t1 values (1);
-insert into t1 values (a+2);
-insert into t1 values (a+3),(a+4);
-insert into t1 values (5),(a+6);
-select * from t1;
-a
-1
-2
-3
-4
-5
-6
-drop table t1;