diff options
| author | unknown <monty@mishka.mysql.fi> | 2003-10-06 22:56:34 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.mysql.fi> | 2003-10-06 22:56:34 +0300 |
| commit | 0e93376e71bd719658bbf99e413d51d7ee349dee (patch) | |
| tree | 42623f3710505740b5171a6d3e6cdcb4aa119084 /include | |
| parent | bd7470241b0883b5bacc0f741e828a13773e7eec (diff) | |
| download | mariadb-git-0e93376e71bd719658bbf99e413d51d7ee349dee.tar.gz | |
Move init_compiled_charsets to own file
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
client/mysql.cc:
Fixed indentation
include/my_sys.h:
Move init_compiled_charsets to own file
include/mysql.h:
Remove compiler warning
libmysql/Makefile.shared:
Move init_compiled_charsets to own file
mysys/Makefile.am:
Move init_compiled_charsets to own file
mysys/charset.c:
Move init_compiled_charsets to own file
mysys/my_init.c:
Remove dependency of charsets
scripts/mysql_create_system_tables.sh:
Remove run time warning
scripts/mysql_fix_privilege_tables.sql:
Add help tables
sql/sql_insert.cc:
Code cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 3 | ||||
| -rw-r--r-- | include/mysql.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 6f04b766aec..331ff3d60c9 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -220,7 +220,8 @@ extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, extern void free_charsets(void); extern char *get_charsets_dir(char *buf); extern my_bool my_charset_same(CHARSET_INFO *cs1, CHARSET_INFO *cs2); - +extern my_bool init_compiled_charsets(myf flags); +extern void add_compiled_collation(CHARSET_INFO *cs); /* statistics */ extern ulong my_cache_w_requests, my_cache_write, my_cache_r_requests, diff --git a/include/mysql.h b/include/mysql.h index 95f480b41c1..5672744729a 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -278,7 +278,7 @@ typedef struct st_mysql_res { #define MANAGER_CLIENT_ERR 450 #define MANAGER_INTERNAL_ERR 500 -#ifndef MYSQL_SERVER +#if !defined(MYSQL_SERVER) && !defined(MYSQL_CLIENT) #define MYSQL_CLIENT #endif |