summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2008-11-27 17:17:16 +0100
committerTatiana A. Nurnberg <azundris@mysql.com>2008-11-27 17:17:16 +0100
commit21e8210a4b36f19152c72d9ab5f4de9c331cdb65 (patch)
tree04503adb6ad910396548512efc886ad0f8873922 /sql/mysql_priv.h
parent1ef31b37eea16d5c4d0ecd001d78b9725b49b8f9 (diff)
parent8a5273b89956337c24bbf25a89e3a992c5d82b5f (diff)
downloadmariadb-git-21e8210a4b36f19152c72d9ab5f4de9c331cdb65.tar.gz
auto-merge
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index d112c2b2f39..520d97b5e9f 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -435,6 +435,7 @@ MY_LOCALE *my_locale_by_number(uint number);
#define UNCACHEABLE_PREPARE 16
/* For uncorrelated SELECT in an UNION with some correlated SELECTs */
#define UNCACHEABLE_UNITED 32
+#define UNCACHEABLE_CHECKOPTION 64
/* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */
#define UNDEF_POS (-1)