diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /sql/rpl_filter.cc | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'sql/rpl_filter.cc')
| -rw-r--r-- | sql/rpl_filter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_filter.cc b/sql/rpl_filter.cc index 1f0b752c8c8..a8ed9cfffe0 100644 --- a/sql/rpl_filter.cc +++ b/sql/rpl_filter.cc @@ -14,7 +14,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sql_priv.h" -//#include "unireg.h" // REQUIRED by other includes +#include "mysqld.h" // system_charset_info #include "rpl_filter.h" #include "hash.h" // my_hash_free #include "table.h" // TABLE_LIST |