bk commit into 5.0 tree (kent:1.2464) BUG#27870

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of mysqldev. When mysqldev 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-04-19 22:56:04+02:00, kent@stripped +2 -0
  mysql.sln:
    Enable 'mysys' build if target 'Enterprise'
  item_subselect.h:
    Fixed bug #27870. The bug that causes crashes manifests itself at some
    conditions when executing an equijoin query with WHERE condition
    containing a subquery predicate of the form join_attr NOT IN (SELECT ...).

  VC++Files/mysql.sln@stripped, 2007-04-19 10:48:20+02:00, kent@stripped +1 -0
    Enable 'mysys' build if target 'Enterprise'

  sql/item_subselect.h@stripped, 2007-04-19 22:54:44+02:00, kent@stripped +5 -1
    Fixed bug #27870. The bug that causes crashes manifests itself at some
    conditions when executing an equijoin query with WHERE condition
    containing a subquery predicate of the form join_attr NOT IN (SELECT ...).

# 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:	kent
# Host:	production.mysql.com
# Root:	/data0/mysqldev/my/build-200704170906-5.0.40/mysql-5.0-release

--- 1.88/sql/item_subselect.h	2007-04-19 22:56:17 +02:00
+++ 1.89/sql/item_subselect.h	2007-04-19 22:56:17 +02:00
@@ -276,7 +276,11 @@
   {
     return pushed_cond_guards ? pushed_cond_guards + i : NULL;
   }
-  void set_cond_guard_var(int i, bool v) { pushed_cond_guards[i]= v; }
+  void set_cond_guard_var(int i, bool v) 
+  { 
+    if ( pushed_cond_guards)
+      pushed_cond_guards[i]= v;
+  }
   bool have_guarded_conds() { return test(pushed_cond_guards); }
 
   Item_func_not_all *upper_item; // point on NOT/NOP before ALL/SOME subquery

--- 1.17/VC++Files/mysql.sln	2007-04-19 22:56:17 +02:00
+++ 1.18/VC++Files/mysql.sln	2007-04-19 22:56:17 +02:00
@@ -733,6 +733,7 @@
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug 98.ActiveCfg = Debug 98|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug 98.Build.0 = Debug 98|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise.ActiveCfg = Release|Win32
+		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise.Build.0 = Release|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise Debug.ActiveCfg = Debug|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise Debug.Build.0 = Debug|Win32
 		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise GPL.ActiveCfg = Release|Win32