bk commit into 5.1 tree (acurtis:1.2190)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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.2190 06/03/16 03:01:57 acurtis@stripped +5 -0
  Merge xiphis.org:/home/antony/work2/p1-bug14575.1
  into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg

  sql/mysqld.cc
    1.547 06/03/16 03:01:53 acurtis@stripped +0 -1
    resolve conflict from backported patch

  sql/mysql_priv.h
    1.385 06/03/16 03:01:53 acurtis@stripped +0 -47
    resolve conflict from backported patch

  sql/sql_select.cc
    1.392 06/03/16 02:57:50 acurtis@stripped +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.138 06/03/16 02:57:49 acurtis@stripped +0 -0
    Auto merged

  include/config-win.h
    1.82 06/03/16 02:57:49 acurtis@stripped +0 -0
    Auto merged

# 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:	acurtis
# Host:	localhost.(none)
# Root:	/home/antony/work2/p1-bug14575.1-mrg/RESYNC

--- 1.81/include/config-win.h	2006-02-28 13:46:20 -08:00
+++ 1.82/include/config-win.h	2006-03-16 02:57:49 -08:00
@@ -429,8 +429,8 @@ inline double ulonglong2double(ulonglong
 #define HAVE_RTREE_KEYS 1
 #define HAVE_ROW_BASED_REPLICATION 1
 
-/* #undef HAVE_OPENSSL */
-/* #undef HAVE_YASSL */
+#define HAVE_OPENSSL 1
+#define HAVE_YASSL 1
 
 /* Define charsets you want */
 /* #undef HAVE_CHARSET_armscii8 */

--- 1.546/sql/mysqld.cc	2006-03-14 11:28:18 -08:00
+++ 1.547/sql/mysqld.cc	2006-03-16 03:01:53 -08:00
@@ -8137,6 +8137,30 @@ SHOW_COMP_OPTION have_federated_db= SHOW
 SHOW_COMP_OPTION have_partition_db= SHOW_OPTION_NO;
 SHOW_COMP_OPTION have_blackhole_db= SHOW_OPTION_NO;
 
+
+/*****************************************************************************
+  Instantiate have_xyx for missing storage engines
+*****************************************************************************/
+#undef have_berkeley_db
+#undef have_innodb
+#undef have_ndbcluster
+#undef have_example_db
+#undef have_archive_db
+#undef have_csv_db
+#undef have_federated_db
+#undef have_partition_db
+#undef have_blackhole_db
+
+SHOW_COMP_OPTION have_berkeley_db= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_innodb= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_ndbcluster= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_example_db= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_archive_db= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_csv_db= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_federated_db= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_partition_db= SHOW_OPTION_NO;
+SHOW_COMP_OPTION have_blackhole_db= SHOW_OPTION_NO;
+
 #ifndef WITH_BERKELEY_STORAGE_ENGINE
 bool berkeley_shared_data;
 ulong berkeley_max_lock, berkeley_log_buffer_size;

--- 1.391/sql/sql_select.cc	2006-02-22 00:27:17 -08:00
+++ 1.392/sql/sql_select.cc	2006-03-16 02:57:50 -08:00
@@ -7114,7 +7114,10 @@ static Item *eliminate_item_equal(COND *
   if (!cond)
     cond= new Item_cond_and(eq_list);
   else
+  {
+    DBUG_ASSERT(cond->type() == Item::COND_ITEM);
     ((Item_cond *) cond)->add_at_head(&eq_list);
+  }
 
   cond->quick_fix_field();
   cond->update_used_tables();
@@ -7199,6 +7202,11 @@ static COND* substitute_for_best_equal_f
       while ((item_equal= it++))
       {
         cond= eliminate_item_equal(cond, cond_equal->upper_levels, item_equal);
+        // This occurs when eliminate_item_equal() founds that cond is
+        // always false and substitues it with Item_int 0.
+        // Due to this, value of item_equal will be 0, so just return it.
+        if (cond->type() != Item::COND_ITEM)
+          break;
       }
     }
   }

--- 1.137/mysql-test/r/subselect.result	2006-03-06 02:35:33 -08:00
+++ 1.138/mysql-test/r/subselect.result	2006-03-16 02:57:49 -08:00
@@ -3156,3 +3156,10 @@ id	select_type	table	type	possible_keys	
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	9	Using where
 2	DEPENDENT SUBQUERY	t1	index	NULL	a	8	NULL	9	Using filesort
 DROP TABLE t1;
+create table t1( f1 int,f2 int);
+insert into t1 values (1,1),(2,2);
+select tt.t from (select 'crash1' as t, f2 from t1) as tt left join t1 on tt.t = 'crash2'
and tt.f2 = t1.f2 where tt.t = 'crash1';
+t
+crash1
+crash1
+drop table t1;