summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2012-10-18 15:57:12 +0300
committerunknown <timour@askmonty.org>2012-10-18 15:57:12 +0300
commit69a7b04add1d8102b9f5add88ae691d8b04727bc (patch)
treed8767b9ac1dd83919fd194feb3e0cb6451064c0a /include
parent807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff)
parentbc4a456758c8077e5377b8cfaed60af4311653a0 (diff)
downloadmariadb-git-69a7b04add1d8102b9f5add88ae691d8b04727bc.tar.gz
Merge mdev-452 with the latest 10.0-base.
Diffstat (limited to 'include')
-rw-r--r--include/mysql_com.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 0988d20f97f..80ce1b4b014 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -128,6 +128,8 @@ enum enum_server_command
reserved by MySQL Cluster */
#define FIELD_FLAGS_COLUMN_FORMAT 24 /* Field column format, bit 24-25,
reserved by MySQL Cluster */
+#define HAS_EXPLICIT_DEFAULT (1 << 26) /* An INSERT/UPDATE operation supplied
+ an explicit default value */
#define REFRESH_GRANT 1 /* Refresh grant tables */
#define REFRESH_LOG 2 /* Start on new log file */