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/sql_string.h | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 880edce0e77..c25a9cd8214 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -31,7 +31,6 @@ #endif class String; -typedef struct charset_info_st CHARSET_INFO; typedef struct st_io_cache IO_CACHE; typedef struct st_mem_root MEM_ROOT; |