diff options
| author | holyfoot@deer.(none) <> | 2006-06-19 22:11:01 +0500 |
|---|---|---|
| committer | holyfoot@deer.(none) <> | 2006-06-19 22:11:01 +0500 |
| commit | d8d42948b2baad475754abc260dfed7ac3012452 (patch) | |
| tree | 20d968927ec70e5b39ffcb4c3320841f23309a5b /include/sql_common.h | |
| parent | 47bb56997910d9c580e5b49c8db92489380fd4bf (diff) | |
| download | mariadb-git-d8d42948b2baad475754abc260dfed7ac3012452.tar.gz | |
bug #20318 (ctype_ucs2_def test fails with embedded)
there was two problems about charsets in embedded server
1. mysys/charset.c - defined there default_charset_info variable is
modified by both server and client code (particularly when
--default-charset option is handled)
In embedded server we get two codelines modifying one variable.
I created separate default_client_charset_info for client code
2. mysql->charset and mysql->options.charset initialization isn't
properly done for embedded server - necessary calls added
Diffstat (limited to 'include/sql_common.h')
| -rw-r--r-- | include/sql_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index c07a4a831bb..9fc8d4f457b 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -22,6 +22,7 @@ extern const char *not_error_sqlstate; extern "C" { #endif +extern CHARSET_INFO *default_client_charset_info; MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, my_bool default_value, uint server_capabilities); void free_rows(MYSQL_DATA *cur); |