summaryrefslogtreecommitdiff
path: root/sql/sql_error.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2013-08-15 15:24:34 +0400
committerAlexander Barkov <bar@mariadb.org>2013-08-15 15:24:34 +0400
commite9ca686137f0498cc1bc25d1c67fb32769d88218 (patch)
treeeb16367beb707e7f00d4d9afe1d31575b1e1f87e /sql/sql_error.h
parent3462b6d3d29eebc246dbf8942baffd0ae5dd0b4f (diff)
downloadmariadb-git-e9ca686137f0498cc1bc25d1c67fb32769d88218.tar.gz
MDEV-4871 Temporal literals do not accept nanoseconds
Diffstat (limited to 'sql/sql_error.h')
-rw-r--r--sql/sql_error.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h
index 0a75d7a392d..4c1ebf432c4 100644
--- a/sql/sql_error.h
+++ b/sql/sql_error.h
@@ -47,6 +47,16 @@ public:
{ WARN_LEVEL_NOTE, WARN_LEVEL_WARN, WARN_LEVEL_ERROR, WARN_LEVEL_END};
/**
+ Convert a bitmask consisting of MYSQL_TIME_{NOTE|WARN}_XXX bits
+ to WARN_LEVEL_XXX
+ */
+ static enum_warning_level time_warn_level(int warnings)
+ {
+ return MYSQL_TIME_WARN_HAVE_WARNINGS(warnings) ?
+ WARN_LEVEL_WARN : WARN_LEVEL_NOTE;
+ }
+
+ /**
Get the MESSAGE_TEXT of this condition.
@return the message text.
*/