diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-11 16:13:14 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-11 16:13:14 +0500 |
| commit | 937504e7a04fde9c776f0ce06c7c5c03da5f1905 (patch) | |
| tree | ceb4905902b6a1c3130c1349e1eadc3c4b2a3092 /sql/item_strfunc.h | |
| parent | cbe03180802538699441efc97e04902289dbca1c (diff) | |
| parent | f30eacb223f581ece4bce02b3c4dfac1310f9f72 (diff) | |
| download | mariadb-git-937504e7a04fde9c776f0ce06c7c5c03da5f1905.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_yacc.yy:
manual merge
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 155f8457156..30a9ba4492d 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -35,7 +35,6 @@ public: my_decimal *val_decimal(my_decimal *); enum Item_result result_type () const { return STRING_RESULT; } void left_right_max_length(); - String *check_well_formed_result(String *str); bool fix_fields(THD *thd, Item **ref); }; |