diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
| commit | 3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e (patch) | |
| tree | da0e622896425203d23ecdfd1bc77b57e3502edf /sql/item_subselect.h | |
| parent | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (diff) | |
| parent | f83e594218a6d19da2fa1ea2a01d860c30fe2913 (diff) | |
| download | mariadb-git-3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e.tar.gz | |
Merge with 5.1 to get in changes from MySQL 5.1.55
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 48bfaab4e3a..16b901e1333 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -141,7 +141,6 @@ public: { return trace_unsupported_by_check_vcol_func_processor("subselect"); } - Item *safe_charset_converter(CHARSET_INFO *tocs); /** Get the SELECT_LEX structure associated with this Item. |