mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
8b6c2d312b
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 include/sql_common.h: client charset info default declared libmysqld/lib_sql.cc: thd_init_client_charset calls added libmysqld/libmysqld.c: check_embedded_connection moved to client.c to avoid code duplication sql-common/client.c: charset initialization moved to mysql_init_character_set to be used in embedded server sql/sql_parse.cc: thread client charset initialization moved to thd_init_client_charset to avoid code duplication
47 lines
1.8 KiB
C
47 lines
1.8 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
extern const char *unknown_sqlstate;
|
|
extern const char *not_error_sqlstate;
|
|
|
|
#ifdef __cplusplus
|
|
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);
|
|
void free_old_query(MYSQL *mysql);
|
|
void end_server(MYSQL *mysql);
|
|
my_bool mysql_reconnect(MYSQL *mysql);
|
|
void mysql_read_default_options(struct st_mysql_options *options,
|
|
const char *filename,const char *group);
|
|
my_bool
|
|
cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
|
|
const char *header, ulong header_length,
|
|
const char *arg, ulong arg_length, my_bool skip_check);
|
|
|
|
void set_stmt_errmsg(MYSQL_STMT * stmt, const char *err, int errcode,
|
|
const char *sqlstate);
|
|
void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate);
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41)
|
|
|