summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-02-22 13:22:34 +0100
committerunknown <lars@mysql.com>2005-02-22 13:22:34 +0100
commit6f6bf32afa7aa2876f1ab5e555438f7baf514d42 (patch)
tree08c7ae6ff93769414869eccedfcab6468afdd88c /sql/mysql_priv.h
parent2fb807d1d0a817c177e02cee7b508b6122ce832e (diff)
parent7d766fdbeb1418488f99125b510dce5942b7f79f (diff)
downloadmariadb-git-6f6bf32afa7aa2876f1ab5e555438f7baf514d42.tar.gz
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index f851e36dcad..6c77a8934dd 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -212,6 +212,10 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
#define OPTION_RELAXED_UNIQUE_CHECKS (1L << 27)
#define SELECT_NO_UNLOCK (1L << 28)
+/* If set to 0, then the thread will ignore all warnings with level notes.
+ Set by executing SET SQL_NOTES=1 */
+#define OPTION_SQL_NOTES (1L << 31)
+
/* Bits for different SQL modes modes (including ANSI mode) */
#define MODE_REAL_AS_FLOAT 1
#define MODE_PIPES_AS_CONCAT 2