diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 20:25:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 20:25:46 +0200 |
| commit | 0991e19e9d38f7475390276c0557c2390e4d93c9 (patch) | |
| tree | 89944fd1518b252227ab4e6a6353916cf1b47008 /sql/item_func.h | |
| parent | 2a45fa900b5916e9b789b1a4052ffd7c724f4166 (diff) | |
| parent | 63c834e7c44d45acceb2110a1970c9719655fdc6 (diff) | |
| download | mariadb-git-0991e19e9d38f7475390276c0557c2390e4d93c9.tar.gz | |
Merge branch 'bb-5.5-serg' into 5.5mariadb-5.5.49
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 9776ec0a5b7..667be3c0438 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1,7 +1,7 @@ #ifndef ITEM_FUNC_INCLUDED #define ITEM_FUNC_INCLUDED -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2014, MariaDB +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2009, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -246,7 +246,7 @@ public: char buf[256]; String str(buf, sizeof(buf), system_charset_info); str.length(0); - print(&str, QT_ORDINARY); + print(&str, QT_NO_DATA_EXPANSION); my_error(ER_DATA_OUT_OF_RANGE, MYF(0), type_name, str.c_ptr_safe()); } inline double raise_float_overflow() |