diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
| commit | 23d8586dbfdfdf02fa2f801b9dad91db53025a64 (patch) | |
| tree | 19f32879e77ada23d733f35173a25f410d655ebe /sql/sql_string.h | |
| parent | d7dd2fc92f042596c2e72a96934bb207270e7419 (diff) | |
| download | mariadb-git-23d8586dbfdfdf02fa2f801b9dad91db53025a64.tar.gz | |
WL#5030: Split and remove mysql_priv.h
This patch:
- Moves all definitions from the mysql_priv.h file into
header files for the component where the variable is
defined
- Creates header files if the component lacks one
- Eliminates all include directives from mysql_priv.h
- Eliminates all circular include cycles
- Rename time.cc to sql_time.cc
- Rename mysql_priv.h to sql_priv.h
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 38f843e7e8f..f67d6de9a0f 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -22,7 +22,15 @@ #pragma interface /* gcc class implementation */ #endif +#include "m_ctype.h" /* my_charset_bin */ +#include "my_sys.h" /* alloc_root, my_free, my_realloc */ +#include "m_string.h" /* TRASH */ + class String; +typedef struct charset_info_st CHARSET_INFO; +typedef struct st_io_cache IO_CACHE; +typedef struct st_mem_root MEM_ROOT; + int sortcmp(const String *a,const String *b, CHARSET_INFO *cs); String *copy_if_not_alloced(String *a,String *b,uint32 arg_length); uint32 copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, |