bk commit into 4.1 tree (bell:1.2270) BUG#10020

[sanja]

Below is the list of changes that have just been committed into a local
4.1 repository of bell. When bell 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.2270 05/05/16 12:19:10 bell@stripped +4 -0
  relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020)

  BitKeeper/etc/logging_ok
    1.392 05/05/16 12:19:08 bell@stripped +1 -0
    Logging to logging@stripped accepted

  sql/item.cc
    1.202 05/05/16 12:18:53 bell@stripped +1 -1
    any constant allowed here BUG#10020)

  mysql-test/t/subselect.test
    1.144 05/05/16 12:18:53 bell@stripped +24 -0
    bug 10020 test suite

  mysql-test/r/subselect.result
    1.165 05/05/16 12:18:52 bell@stripped +24 -0
    test fro bug 10020

# 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:	bell
# Host:	book.sanja.is.com.ua
# Root:	/Users/bell/mysql/bk/work-4.1

--- 1.201/sql/item.cc	2005-05-06 16:25:49 +03:00
+++ 1.202/sql/item.cc	2005-05-16 12:18:53 +03:00
@@ -2034,7 +2034,7 @@
 
 Item *Item_int_with_ref::new_item()
 {
-  DBUG_ASSERT(ref->basic_const_item());
+  DBUG_ASSERT(ref->const_item());
   /*
     We need to evaluate the constant to make sure it works with
     parameter markers.

--- 1.164/mysql-test/r/subselect.result	2005-03-30 10:07:04 +03:00
+++ 1.165/mysql-test/r/subselect.result	2005-05-16 12:18:52 +03:00
@@ -2697,3 +2697,27 @@
 ERROR 21000: Operand should contain 3 column(s)
 select (select * from t1) = (1,2,3);
 ERROR 21000: Operand should contain 2 column(s)
+drop table t1
+#;
+CREATE TABLE `t1` (
+`itemid` bigint(20) unsigned NOT NULL auto_increment,
+`sessionid` bigint(20) unsigned default NULL,
+`time` int(10) unsigned NOT NULL default '0',
+`type` set('A','D','E','F','G','I','L','N','U') collate latin1_general_ci NOT
+NULL default '',
+`data` text collate latin1_general_ci NOT NULL,
+PRIMARY KEY  (`itemid`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+INSERT INTO `t1` VALUES (1, 1, 1, 'D', '');
+CREATE TABLE `t2` (
+`sessionid` bigint(20) unsigned NOT NULL auto_increment,
+`pid` int(10) unsigned NOT NULL default '0',
+`date` int(10) unsigned NOT NULL default '0',
+`ip` varchar(15) collate latin1_general_ci NOT NULL default '',
+PRIMARY KEY  (`sessionid`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+INSERT INTO `t2` VALUES (1, 1, 1, '10.10.10.1');
+SELECT s.ip, count( e.itemid ) FROM `t1` e JOIN t2 s ON s.sessionid = e.sessionid WHERE
e.sessionid = ( SELECT sessionid FROM t2 ORDER BY sessionid DESC LIMIT 1 ) GROUP BY s.ip
HAVING count( e.itemid ) >0 LIMIT 0 , 30;
+ip	count( e.itemid )
+10.10.10.1	1
+drop tables t1,t2;

--- 1.143/mysql-test/t/subselect.test	2005-03-30 10:07:04 +03:00
+++ 1.144/mysql-test/t/subselect.test	2005-05-16 12:18:53 +03:00
@@ -1722,3 +1722,27 @@
 -- error 1241
 select (select * from t1) = (1,2,3);
 drop table t1
+
+#
+# Item_int_with_ref check (BUG#10020)
+#
+CREATE TABLE `t1` (
+  `itemid` bigint(20) unsigned NOT NULL auto_increment,
+  `sessionid` bigint(20) unsigned default NULL,
+  `time` int(10) unsigned NOT NULL default '0',
+  `type` set('A','D','E','F','G','I','L','N','U') collate latin1_general_ci NOT
+NULL default '',
+  `data` text collate latin1_general_ci NOT NULL,
+  PRIMARY KEY  (`itemid`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+INSERT INTO `t1` VALUES (1, 1, 1, 'D', '');
+CREATE TABLE `t2` (
+  `sessionid` bigint(20) unsigned NOT NULL auto_increment,
+  `pid` int(10) unsigned NOT NULL default '0',
+  `date` int(10) unsigned NOT NULL default '0',
+  `ip` varchar(15) collate latin1_general_ci NOT NULL default '',
+  PRIMARY KEY  (`sessionid`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+INSERT INTO `t2` VALUES (1, 1, 1, '10.10.10.1');
+SELECT s.ip, count( e.itemid ) FROM `t1` e JOIN t2 s ON s.sessionid = e.sessionid WHERE
e.sessionid = ( SELECT sessionid FROM t2 ORDER BY sessionid DESC LIMIT 1 ) GROUP BY s.ip
HAVING count( e.itemid ) >0 LIMIT 0 , 30;
+drop tables t1,t2;

--- 1.391/BitKeeper/etc/logging_ok	2005-05-13 23:32:30 +03:00
+++ 1.392/BitKeeper/etc/logging_ok	2005-05-16 12:19:08 +03:00
@@ -29,6 +29,7 @@
 bar@stripped
 bar@stripped
 bell@stripped
+bell@stripped
 bell@stripped
 bell@stripped
 bk@stripped