diff options
| author | guilhem@gbichot4.local <> | 2008-02-18 23:36:57 +0100 |
|---|---|---|
| committer | guilhem@gbichot4.local <> | 2008-02-18 23:36:57 +0100 |
| commit | 045f3c4a5d92dc0acd43db6c5248a69cb421cfcb (patch) | |
| tree | eb84c87b6b3703ffc18f62934e35f2c3a7986c4a /mysys/charset.c | |
| parent | a6d50c102c36f0ffbfb7182673f4c04995412e02 (diff) | |
| parent | 9e2b31b0268a05a94032ba96c0830536ce983685 (diff) | |
| download | mariadb-git-045f3c4a5d92dc0acd43db6c5248a69cb421cfcb.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 692d7867fe0..9bd8de4316a 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -606,9 +606,9 @@ CHARSET_INFO *get_charset_by_csname(const char *cs_name, is no character set with given name. */ -bool resolve_charset(const char *cs_name, - CHARSET_INFO *default_cs, - CHARSET_INFO **cs) +my_bool resolve_charset(const char *cs_name, + CHARSET_INFO *default_cs, + CHARSET_INFO **cs) { *cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0)); @@ -638,9 +638,9 @@ bool resolve_charset(const char *cs_name, collation with given name. */ -bool resolve_collation(const char *cl_name, - CHARSET_INFO *default_cl, - CHARSET_INFO **cl) +my_bool resolve_collation(const char *cl_name, + CHARSET_INFO *default_cl, + CHARSET_INFO **cl) { *cl= get_charset_by_name(cl_name, MYF(0)); |