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/thr_malloc.h | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'sql/thr_malloc.h')
| -rw-r--r-- | sql/thr_malloc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/thr_malloc.h b/sql/thr_malloc.h index 6b372a285a2..52e6752ab70 100644 --- a/sql/thr_malloc.h +++ b/sql/thr_malloc.h @@ -18,7 +18,6 @@ #include "my_global.h" // uint, size_t -typedef struct charset_info_st CHARSET_INFO; typedef struct st_mem_root MEM_ROOT; void init_sql_alloc(MEM_ROOT *root, uint block_size, uint pre_alloc_size); |