bk commit into 4.1 tree (konstantin:1.2346)

[konstantin]

Below is the list of changes that have just been committed into a local
4.1 repository of kostja. When kostja 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.2346 05/07/13 17:39:48 konstantin@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/opt/local/work/mysql-4.1-11458

  sql/mysql_priv.h
    1.355 05/07/13 17:39:43 konstantin@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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-4.1-11458/RESYNC

--- 1.354/sql/mysql_priv.h	2005-07-07 22:47:40 +04:00
+++ 1.355/sql/mysql_priv.h	2005-07-13 17:39:43 +04:00
@@ -251,6 +251,8 @@
 #define UNCACHEABLE_SIDEEFFECT	4
 // forcing to save JOIN for explain
 #define UNCACHEABLE_EXPLAIN     8
+/* Don't evaluate subqueries in prepare even if they're not correlated */
+#define UNCACHEABLE_PREPARE    16
 
 #ifdef EXTRA_DEBUG
 /*