diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-01-28 13:00:50 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-01-28 13:00:50 +0400 |
| commit | 94868914b84bd96ea946fc583862126ab8bda3a0 (patch) | |
| tree | a68946a384440ffe86e19126899e50cc42250f22 /sql/item_strfunc.h | |
| parent | 4bf002d6a02943bc94d918216d5dc86f2f00a0de (diff) | |
| parent | f189ed5009cfd4149aa90ba18bfc9c80de9f0a39 (diff) | |
| download | mariadb-git-94868914b84bd96ea946fc583862126ab8bda3a0.tar.gz | |
merge 5.3 -> 5.5
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index e0566b1d8c9..1731fcf7e99 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1061,6 +1061,4 @@ public: String *val_str(String *); }; -extern String my_empty_string; - #endif /* ITEM_STRFUNC_INCLUDED */ |