diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /sql/gstream.h | |
parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz |
lots of post-merge changes
Diffstat (limited to 'sql/gstream.h')
-rw-r--r-- | sql/gstream.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/gstream.h b/sql/gstream.h index 6bb3c9bac10..7c079c7bdb3 100644 --- a/sql/gstream.h +++ b/sql/gstream.h @@ -21,9 +21,6 @@ #include "my_sys.h" /* MY_ALLOW_ZERO_PTR */ #include "m_ctype.h" /* my_charset_latin1, my_charset_bin */ -typedef struct charset_info_st CHARSET_INFO; -typedef struct st_mysql_lex_string LEX_STRING; - class Gis_read_stream { public: |