diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
| commit | ee09f9721165ff04c645516651a4ae3892ce7231 (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /sql/item_strfunc.h | |
| parent | 54f3f65601142d7d942c4a81e953ae5439d0014f (diff) | |
| parent | 2283e1b510998ea904f118b0da50986ec4047de2 (diff) | |
| download | mariadb-git-ee09f9721165ff04c645516651a4ae3892ce7231.tar.gz | |
Manual merge of mysql-5.1-bugteam to
mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 7447d2a79c2..a72d6ba1340 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -23,6 +23,8 @@ #pragma interface /* gcc class implementation */ #endif +class MY_LOCALE; + class Item_str_func :public Item_func { public: @@ -878,4 +880,6 @@ public: String *val_str(String *); }; +extern String my_empty_string; + #endif /* ITEM_STRFUNC_INCLUDED */ |