summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.h
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-11-25 10:08:00 +0400
committerunknown <bar@mysql.com>2005-11-25 10:08:00 +0400
commite69de4f677ff5a3cd8cd89373e6e270d2ad219a4 (patch)
tree797562813a5a4ef9d4e35c01e3bc69203df1a7f7 /sql/item_strfunc.h
parent1be7a7afa58d241895e73a45292c4a111c98a74c (diff)
parent85cc43802bee44bcf02b459812ac8d77aa83a85f (diff)
downloadmariadb-git-e69de4f677ff5a3cd8cd89373e6e270d2ad219a4.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.b14146 sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r--sql/item_strfunc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 81f809d2b67..522b17bf80e 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -35,6 +35,7 @@ public:
double val_real();
enum Item_result result_type () const { return STRING_RESULT; }
void left_right_max_length();
+ String *check_well_formed_result(String *str);
};
class Item_func_md5 :public Item_str_func