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
commit99fe5e523ef6e2f11f8b554884dae8d4e90d0067 (patch)
tree04503adb6ad910396548512efc886ad0f8873922 /sql/mysql_priv.h
parent238c5bfa2f031d09bc41c0b772f827ce53e8cd58 (diff)
parent63bca358caf61f52f46366dc7eb8c8b9ca9fb731 (diff)
downloadmariadb-git-99fe5e523ef6e2f11f8b554884dae8d4e90d0067.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)