mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
f4beb92940
Problem: ucs2 was correctly disallowed in "SET NAMES" only,
while mysql_real_connect() and mysql_change_user() still allowed
to use ucs2, which made server crash.
Fix: disallow ucs2 in mysql_real_connect() and mysql_change_user().
@ sql/set_var.cc
Using new function.
@ sql/sql_acl.cc
- Return error if character set initialization failed
- Getting rid of pointer aliasing:
Initialize user_name to NULL, to avoid double free().
@ sql/sql_connect.cc
- in case of unsupported client character set send error and return true
- in case of success return false
@ sql/sql_connect.h
- changing return type for thd_init_client_charset() to bool,
to return errors to the caller
@ sql/sql_parse.h
- introducing a new function, to reuse in all places where we need
to check client character set.
@ tests/mysql_client_test.c
Adding test
50 lines
2 KiB
C++
50 lines
2 KiB
C++
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
|
|
|
|
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; version 2 of the License.
|
|
|
|
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#ifndef SQL_CONNECT_INCLUDED
|
|
#define SQL_CONNECT_INCLUDED
|
|
|
|
#include "my_sys.h" /* pthread_handler_t */
|
|
#include "mysql_com.h" /* enum_server_command */
|
|
|
|
class THD;
|
|
typedef struct st_lex_user LEX_USER;
|
|
typedef struct user_conn USER_CONN;
|
|
|
|
void init_max_user_conn(void);
|
|
void free_max_user_conn(void);
|
|
|
|
pthread_handler_t handle_one_connection(void *arg);
|
|
void do_handle_one_connection(THD *thd_arg);
|
|
bool init_new_connection_handler_thread();
|
|
void reset_mqh(LEX_USER *lu, bool get_them);
|
|
bool check_mqh(THD *thd, uint check_command);
|
|
void time_out_user_resource_limits(THD *thd, USER_CONN *uc);
|
|
void decrease_user_connections(USER_CONN *uc);
|
|
bool thd_init_client_charset(THD *thd, uint cs_number);
|
|
bool setup_connection_thread_globals(THD *thd);
|
|
|
|
int check_user(THD *thd, enum enum_server_command command,
|
|
const char *passwd, uint passwd_len, const char *db,
|
|
bool check_count);
|
|
|
|
bool login_connection(THD *thd);
|
|
void prepare_new_connection_state(THD* thd);
|
|
void end_connection(THD *thd);
|
|
int get_or_create_user_conn(THD *thd, const char *user,
|
|
const char *host, const USER_RESOURCES *mqh);
|
|
int check_for_max_user_connections(THD *thd, USER_CONN *uc);
|
|
|
|
#endif /* SQL_CONNECT_INCLUDED */
|