diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
| commit | 2ccf247e939b39d1f84908a56b8717150e5fd1b4 (patch) | |
| tree | c0a9a318a055f87e13206656d7765f96d3293d9f /sql/item_func.cc | |
| parent | 6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8 (diff) | |
| download | mariadb-git-2ccf247e939b39d1f84908a56b8717150e5fd1b4.tar.gz | |
after merge changes:
* rename all debugging related command-line options
and variables to start from "debug-", and made them all
OFF by default.
* replace "MySQL" with "MariaDB" in error messages
* "Cast ... converted ... integer to it's ... complement"
is now a note, not a warning
* @@query_cache_strip_comments now has a session scope,
not global.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 251ecd00242..1d3a32ba4f1 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1064,7 +1064,7 @@ longlong Item_func_signed::val_int() return value; err: - push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_UNKNOWN_ERROR, "Cast to signed converted positive out-of-range integer to " "it's negative complement"); return value; @@ -1120,7 +1120,7 @@ longlong Item_func_unsigned::val_int() return value; err: - push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_UNKNOWN_ERROR, "Cast to unsigned converted negative integer to it's " "positive complement"); return value; |