Fix for BUG#20023: mysql_change_user() resets the value
of SQL_BIG_SELECTS. The bug was that SQL_BIG_SELECTS was not properly set in COM_CHANGE_USER. The fix is to update SQL_BIG_SELECTS properly. sql/mysql_priv.h: Cleanup: make prepare_new_connection_state() private for module. sql/sql_class.cc: Update THD::options with the respect to SQL_BIG_SELECTS in COM_CHANGE_USER. sql/sql_connect.cc: Cleanup: make prepare_new_connection_state() private for module. tests/mysql_client_test.c: Add a test case BUG#20023.
This commit is contained in:
parent
45f590d206
commit
3b4b925ea7
@ -917,7 +917,6 @@ void decrease_user_connections(USER_CONN *uc);
|
|||||||
void thd_init_client_charset(THD *thd, uint cs_number);
|
void thd_init_client_charset(THD *thd, uint cs_number);
|
||||||
bool setup_connection_thread_globals(THD *thd);
|
bool setup_connection_thread_globals(THD *thd);
|
||||||
bool login_connection(THD *thd);
|
bool login_connection(THD *thd);
|
||||||
void prepare_new_connection_state(THD* thd);
|
|
||||||
void end_connection(THD *thd);
|
void end_connection(THD *thd);
|
||||||
|
|
||||||
bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create, bool silent);
|
bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create, bool silent);
|
||||||
|
@ -585,6 +585,12 @@ void THD::init(void)
|
|||||||
if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)
|
if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES)
|
||||||
server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES;
|
server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES;
|
||||||
options= thd_startup_options;
|
options= thd_startup_options;
|
||||||
|
|
||||||
|
if (variables.max_join_size == HA_POS_ERROR)
|
||||||
|
options |= OPTION_BIG_SELECTS;
|
||||||
|
else
|
||||||
|
options &= ~OPTION_BIG_SELECTS;
|
||||||
|
|
||||||
transaction.all.modified_non_trans_table= transaction.stmt.modified_non_trans_table= FALSE;
|
transaction.all.modified_non_trans_table= transaction.stmt.modified_non_trans_table= FALSE;
|
||||||
open_options=ha_open_options;
|
open_options=ha_open_options;
|
||||||
update_lock_default= (variables.low_priority_updates ?
|
update_lock_default= (variables.low_priority_updates ?
|
||||||
|
@ -933,7 +933,7 @@ bool login_connection(THD *thd)
|
|||||||
NET *net= &thd->net;
|
NET *net= &thd->net;
|
||||||
Security_context *sctx= thd->security_ctx;
|
Security_context *sctx= thd->security_ctx;
|
||||||
DBUG_ENTER("login_connection");
|
DBUG_ENTER("login_connection");
|
||||||
DBUG_PRINT("info", ("handle_one_connection called by thread %lu",
|
DBUG_PRINT("info", ("login_connection called by thread %lu",
|
||||||
thd->thread_id));
|
thd->thread_id));
|
||||||
|
|
||||||
net->no_send_error= 0;
|
net->no_send_error= 0;
|
||||||
@ -1003,7 +1003,7 @@ void end_connection(THD *thd)
|
|||||||
Initialize THD to handle queries
|
Initialize THD to handle queries
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void prepare_new_connection_state(THD* thd)
|
static void prepare_new_connection_state(THD* thd)
|
||||||
{
|
{
|
||||||
Security_context *sctx= thd->security_ctx;
|
Security_context *sctx= thd->security_ctx;
|
||||||
|
|
||||||
|
@ -16819,6 +16819,176 @@ static void test_bug30472()
|
|||||||
mysql_close(&con);
|
mysql_close(&con);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void bug20023_change_user(MYSQL *con)
|
||||||
|
{
|
||||||
|
DIE_IF(mysql_change_user(con,
|
||||||
|
opt_user,
|
||||||
|
opt_password,
|
||||||
|
opt_db ? opt_db : "test"));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void bug20023_query_int_variable(MYSQL *con,
|
||||||
|
const char *var_name,
|
||||||
|
int *var_value)
|
||||||
|
{
|
||||||
|
MYSQL_RES *rs;
|
||||||
|
MYSQL_ROW row;
|
||||||
|
|
||||||
|
char query_buffer[MAX_TEST_QUERY_LENGTH];
|
||||||
|
|
||||||
|
my_snprintf(query_buffer,
|
||||||
|
sizeof (query_buffer),
|
||||||
|
"SELECT @@%s",
|
||||||
|
(const char *) var_name);
|
||||||
|
|
||||||
|
DIE_IF(mysql_query(con, query_buffer));
|
||||||
|
DIE_UNLESS(rs= mysql_store_result(con));
|
||||||
|
DIE_UNLESS(row= mysql_fetch_row(rs));
|
||||||
|
*var_value= atoi(row[0]);
|
||||||
|
mysql_free_result(rs);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_bug20023()
|
||||||
|
{
|
||||||
|
MYSQL con;
|
||||||
|
|
||||||
|
int sql_big_selects_orig;
|
||||||
|
int max_join_size_orig;
|
||||||
|
|
||||||
|
int sql_big_selects_2;
|
||||||
|
int sql_big_selects_3;
|
||||||
|
int sql_big_selects_4;
|
||||||
|
int sql_big_selects_5;
|
||||||
|
|
||||||
|
char query_buffer[MAX_TEST_QUERY_LENGTH];
|
||||||
|
|
||||||
|
/* Create a new connection. */
|
||||||
|
|
||||||
|
DIE_UNLESS(mysql_init(&con));
|
||||||
|
|
||||||
|
DIE_UNLESS(mysql_real_connect(&con,
|
||||||
|
opt_host,
|
||||||
|
opt_user,
|
||||||
|
opt_password,
|
||||||
|
opt_db ? opt_db : "test",
|
||||||
|
opt_port,
|
||||||
|
opt_unix_socket,
|
||||||
|
CLIENT_FOUND_ROWS));
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
Remember original SQL_BIG_SELECTS, MAX_JOIN_SIZE values.
|
||||||
|
***********************************************************************/
|
||||||
|
|
||||||
|
bug20023_query_int_variable(&con,
|
||||||
|
"session.sql_big_selects",
|
||||||
|
&sql_big_selects_orig);
|
||||||
|
|
||||||
|
bug20023_query_int_variable(&con,
|
||||||
|
"global.max_join_size",
|
||||||
|
&max_join_size_orig);
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
Test that COM_CHANGE_USER resets the SQL_BIG_SELECTS to the initial value.
|
||||||
|
***********************************************************************/
|
||||||
|
|
||||||
|
/* Issue COM_CHANGE_USER. */
|
||||||
|
|
||||||
|
bug20023_change_user(&con);
|
||||||
|
|
||||||
|
/* Query SQL_BIG_SELECTS. */
|
||||||
|
|
||||||
|
bug20023_query_int_variable(&con,
|
||||||
|
"session.sql_big_selects",
|
||||||
|
&sql_big_selects_2);
|
||||||
|
|
||||||
|
/* Check that SQL_BIG_SELECTS is reset properly. */
|
||||||
|
|
||||||
|
DIE_UNLESS(sql_big_selects_orig == sql_big_selects_2);
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
Test that if MAX_JOIN_SIZE set to non-default value,
|
||||||
|
SQL_BIG_SELECTS will be 0.
|
||||||
|
***********************************************************************/
|
||||||
|
|
||||||
|
/* Set MAX_JOIN_SIZE to some non-default value. */
|
||||||
|
|
||||||
|
DIE_IF(mysql_query(&con, "SET @@global.max_join_size = 10000"));
|
||||||
|
DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default"));
|
||||||
|
|
||||||
|
/* Issue COM_CHANGE_USER. */
|
||||||
|
|
||||||
|
bug20023_change_user(&con);
|
||||||
|
|
||||||
|
/* Query SQL_BIG_SELECTS. */
|
||||||
|
|
||||||
|
bug20023_query_int_variable(&con,
|
||||||
|
"session.sql_big_selects",
|
||||||
|
&sql_big_selects_3);
|
||||||
|
|
||||||
|
/* Check that SQL_BIG_SELECTS is 0. */
|
||||||
|
|
||||||
|
DIE_UNLESS(sql_big_selects_3 == 0);
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
Test that if MAX_JOIN_SIZE set to default value,
|
||||||
|
SQL_BIG_SELECTS will be 1.
|
||||||
|
***********************************************************************/
|
||||||
|
|
||||||
|
/* Set MAX_JOIN_SIZE to the default value (-1). */
|
||||||
|
|
||||||
|
DIE_IF(mysql_query(&con, "SET @@global.max_join_size = -1"));
|
||||||
|
DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default"));
|
||||||
|
|
||||||
|
/* Issue COM_CHANGE_USER. */
|
||||||
|
|
||||||
|
bug20023_change_user(&con);
|
||||||
|
|
||||||
|
/* Query SQL_BIG_SELECTS. */
|
||||||
|
|
||||||
|
bug20023_query_int_variable(&con,
|
||||||
|
"session.sql_big_selects",
|
||||||
|
&sql_big_selects_4);
|
||||||
|
|
||||||
|
/* Check that SQL_BIG_SELECTS is 1. */
|
||||||
|
|
||||||
|
DIE_UNLESS(sql_big_selects_4 == 1);
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
Restore MAX_JOIN_SIZE.
|
||||||
|
Check that SQL_BIG_SELECTS will be the original one.
|
||||||
|
***********************************************************************/
|
||||||
|
|
||||||
|
/* Restore MAX_JOIN_SIZE. */
|
||||||
|
|
||||||
|
my_snprintf(query_buffer,
|
||||||
|
sizeof (query_buffer),
|
||||||
|
"SET @@global.max_join_size = %d",
|
||||||
|
(int) max_join_size_orig);
|
||||||
|
|
||||||
|
DIE_IF(mysql_query(&con, query_buffer));
|
||||||
|
DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default"));
|
||||||
|
|
||||||
|
/* Issue COM_CHANGE_USER. */
|
||||||
|
|
||||||
|
bug20023_change_user(&con);
|
||||||
|
|
||||||
|
/* Query SQL_BIG_SELECTS. */
|
||||||
|
|
||||||
|
bug20023_query_int_variable(&con,
|
||||||
|
"session.sql_big_selects",
|
||||||
|
&sql_big_selects_5);
|
||||||
|
|
||||||
|
/* Check that SQL_BIG_SELECTS is 1. */
|
||||||
|
|
||||||
|
DIE_UNLESS(sql_big_selects_5 == sql_big_selects_orig);
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
That's it. Cleanup.
|
||||||
|
***********************************************************************/
|
||||||
|
|
||||||
|
mysql_close(&con);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Read and parse arguments and MySQL options from my.cnf
|
Read and parse arguments and MySQL options from my.cnf
|
||||||
@ -17115,6 +17285,7 @@ static struct my_tests_st my_tests[]= {
|
|||||||
{ "test_bug29306", test_bug29306 },
|
{ "test_bug29306", test_bug29306 },
|
||||||
{ "test_change_user", test_change_user },
|
{ "test_change_user", test_change_user },
|
||||||
{ "test_bug30472", test_bug30472 },
|
{ "test_bug30472", test_bug30472 },
|
||||||
|
{ "test_bug20023", test_bug20023 },
|
||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user