From: Date: November 15 2007 10:24am
Subject: bk commit into 6.0 tree (gluh:1.2670)
List-Archive: http://lists.mysql.com/commits/37834
Message-Id: <20071115092401.3B32724A0096@eagle.localdomain>

Below is the list of changes that have just been committed into a local
6.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-11-15 13:23:55+04:00, gluh@stripped +1 -0
  updated result file(bacause of wrong merge)

  mysql-test/r/select.result@stripped, 2007-11-15 13:23:53+04:00, gluh@stripped +39 -39
    updated result file(bacause of wrong merge)

diff -Nrup a/mysql-test/r/select.result b/mysql-test/r/select.result
--- a/mysql-test/r/select.result	2007-11-15 12:14:47 +04:00
+++ b/mysql-test/r/select.result	2007-11-15 13:23:53 +04:00
@@ -4087,6 +4087,45 @@ x
 ALTER VIEW v1 AS SELECT 1 AS ` `;
 ERROR 42000: Incorrect column name ' '
 DROP VIEW v1;
+CREATE TABLE t1 (c11 INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY);
+CREATE TABLE t2 (c21 INT UNSIGNED NOT NULL, 
+c22 INT DEFAULT NULL, 
+KEY(c21, c22));
+CREATE TABLE t3 (c31 INT UNSIGNED NOT NULL DEFAULT 0, 
+c32 INT DEFAULT NULL, 
+c33 INT NOT NULL, 
+c34 INT UNSIGNED DEFAULT 0,
+KEY (c33, c34, c32));
+INSERT INTO t1 values (),(),(),(),();
+INSERT INTO t2 SELECT a.c11, b.c11 FROM t1 a, t1 b;
+INSERT INTO t3 VALUES (1, 1, 1, 0), 
+(2, 2, 0, 0), 
+(3, 3, 1, 0), 
+(4, 4, 0, 0), 
+(5, 5, 1, 0);
+SELECT c32 FROM t1, t2, t3 WHERE t1.c11 IN (1, 3, 5) AND 
+t3.c31 = t1.c11 AND t2.c21 = t1.c11 AND 
+t3.c33 = 1 AND t2.c22 in (1, 3) 
+ORDER BY c32;
+c32
+1
+1
+3
+3
+5
+5
+SELECT c32 FROM t1, t2, t3 WHERE t1.c11 IN (1, 3, 5) AND 
+t3.c31 = t1.c11 AND t2.c21 = t1.c11 AND 
+t3.c33 = 1 AND t2.c22 in (1, 3) 
+ORDER BY c32 DESC;
+c32
+5
+5
+3
+3
+1
+1
+DROP TABLE t1, t2, t3;
 select str_to_date('2007-10-09','%Y-%m-%d') between '2007/10/01 00:00:00 GMT'
                                                 and '2007/10/20 00:00:00 GMT';
 str_to_date('2007-10-09','%Y-%m-%d') between '2007/10/01 00:00:00 GMT'
@@ -4233,45 +4272,6 @@ str_to_date('1000-01-01','%Y-%m-%d') bet
 select str_to_date('1000-01-01','%Y-%m-%d') between NULL and NULL;
 str_to_date('1000-01-01','%Y-%m-%d') between NULL and NULL
 0
-CREATE TABLE t1 (c11 INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY);
-CREATE TABLE t2 (c21 INT UNSIGNED NOT NULL, 
-c22 INT DEFAULT NULL, 
-KEY(c21, c22));
-CREATE TABLE t3 (c31 INT UNSIGNED NOT NULL DEFAULT 0, 
-c32 INT DEFAULT NULL, 
-c33 INT NOT NULL, 
-c34 INT UNSIGNED DEFAULT 0,
-KEY (c33, c34, c32));
-INSERT INTO t1 values (),(),(),(),();
-INSERT INTO t2 SELECT a.c11, b.c11 FROM t1 a, t1 b;
-INSERT INTO t3 VALUES (1, 1, 1, 0), 
-(2, 2, 0, 0), 
-(3, 3, 1, 0), 
-(4, 4, 0, 0), 
-(5, 5, 1, 0);
-SELECT c32 FROM t1, t2, t3 WHERE t1.c11 IN (1, 3, 5) AND 
-t3.c31 = t1.c11 AND t2.c21 = t1.c11 AND 
-t3.c33 = 1 AND t2.c22 in (1, 3) 
-ORDER BY c32;
-c32
-1
-1
-3
-3
-5
-5
-SELECT c32 FROM t1, t2, t3 WHERE t1.c11 IN (1, 3, 5) AND 
-t3.c31 = t1.c11 AND t2.c21 = t1.c11 AND 
-t3.c33 = 1 AND t2.c22 in (1, 3) 
-ORDER BY c32 DESC;
-c32
-5
-5
-3
-3
-1
-1
-DROP TABLE t1, t2, t3;
 
 #
 # Bug#30736: Row Size Too Large Error Creating a Table and