bk commit into 5.0 tree (evgen:1.2010) BUG#13356

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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
  1.2010 05/09/28 21:30:10 evgen@stripped +2 -0
  select.result, item.cc:
    After merge fix for bug#13356

  mysql-test/r/select.result
    1.96 05/09/28 21:29:15 evgen@stripped +9 -9
    After merge fix for bug#13356

  sql/item.cc
    1.183 05/09/28 21:28:29 evgen@stripped +1 -1
    After merge fix for bug#13356

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/13356-bug-5.0-mysql

--- 1.182/sql/item.cc	2005-09-28 17:32:01 +04:00
+++ 1.183/sql/item.cc	2005-09-28 21:28:29 +04:00
@@ -5255,6 +5255,7 @@
         }
       }
     }
+    break;
   }
   case REAL_RESULT:
   {						// It must REAL_RESULT
@@ -5276,7 +5277,6 @@
                (Item*) new Item_decimal(name, result, length, decimals));
     break;
   }
-  case ROW_RESULT:
   default:
     DBUG_ASSERT(0);
   }

--- 1.95/mysql-test/r/select.result	2005-09-28 17:32:01 +04:00
+++ 1.96/mysql-test/r/select.result	2005-09-28 21:29:15 +04:00
@@ -2620,6 +2620,15 @@
 found_rows()
 1
 DROP TABLE t1;
+create table t1(f1 int, f2 int);
+create table t2(f3 int);
+select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));
+f1
+select f1 from t1,t2 where f1=f2 and (f1,NULL) = ((1,1));
+f1
+select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));
+f1
+drop table t1,t2;
 CREATE TABLE t1 ( city char(30) );
 INSERT INTO t1 VALUES ('London');
 INSERT INTO t1 VALUES ('Paris');
@@ -3029,12 +3038,3 @@
 102
 drop table t1, t2;
 drop view v1, v2, v3;
-create table t1(f1 int, f2 int);
-create table t2(f3 int);
-select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));
-f1
-select f1 from t1,t2 where f1=f2 and (f1,NULL) = ((1,1));
-f1
-select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));
-f1
-drop table t1,t2;