mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for bug lp:1039277 "Crash in sql_cache.cc".

Browse source 
The crash happend when combining query cache, prepared statements and using a read only cursor.

sql/sql_cache.cc:
  Fixed unlikely error when one adjust query cache size in middle of operation
sql/sql_cursor.cc:
  Disable query cache when using cursors. This fixed lp:1039277
tests/mysql_client_test.c:
  Test case for lp:1039277
This commit is contained in:
Michael Widenius 2012-08-21 08:46:32 +03:00
parent 75e8ce6d73
commit a45c451e40
3 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_cache.cc
View file

@ -1813,7 +1813,10 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
goto err;
if (query_cache_size == 0)
{
thd->query_cache_is_applicable= 0; // Query can't be cached
goto err_unlock;
}
Query_cache_block *query_block;
if (thd->variables.query_cache_strip_comments)

2
sql/sql_cursor.cc
View file

@ -115,6 +115,8 @@ int mysql_open_cursor(THD *thd, select_result *result,
&thd->security_ctx->priv_user[0],
(char *) thd->security_ctx->host_or_ip,
2);
/* Mark that we can't use query cache with cursors */
thd->query_cache_is_applicable= 0;
rc= mysql_execute_command(thd);
MYSQL_QUERY_EXEC_DONE(rc);

47
tests/mysql_client_test.c
View file

@ -357,6 +357,7 @@ static void test_prepare_insert_update()
myquery(rc);
}
/* Test simple prepares of all DML statements */
static void test_prepare_simple()
@ -2308,6 +2309,7 @@ static void test_ps_query_cache()
if (!opt_silent)
fprintf(stdout, "OK");
break;
}
strmov(query, "select id1, value1 from t1 where id1= ? or "
@ -13024,6 +13026,49 @@ static void test_bug8880()
mysql_stmt_close(*stmt);
}
/*
Test executing a query with prepared statements while query cache is active
*/
static void test_open_cursor_prepared_statement_query_cache()
{
MYSQL_STMT *stmt;
int rc;
MYSQL_RES *result;
myheader("test_open_cursor_prepared_statement_query_cache");
if (! is_query_cache_available())
{
fprintf(stdout, "Skipping test_open_cursor_prepared_statement_query_cache: Query cache not available.\n");
return;
}
rc= mysql_query(mysql, "set global query_cache_size=1000000");
myquery(rc);
mysql_query(mysql, "drop table if exists t1");
mysql_query(mysql, "create table t1 (a int not null primary key, b int)");
rc= mysql_query(mysql, "insert into t1 values (1,1)");
myquery(rc); /* one check is enough */
/* Store query in query cache */
rc= mysql_query(mysql, "SELECT * FROM t1");
myquery(rc);
result= mysql_store_result(mysql);
mytest(result);
(void) my_process_result_set(result);
mysql_free_result(result);
/* Test using a cursor */
stmt= open_cursor("select a from t1");
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
mysql_stmt_close(stmt);
rc= mysql_query(mysql, "set global query_cache_size=1000000");
myquery(rc);
}
static void test_bug9159()
{
@ -18917,6 +18962,8 @@ static struct my_tests_st my_tests[]= {
{ "test_bug8378", test_bug8378 },
{ "test_bug8722", test_bug8722 },
{ "test_bug8880", test_bug8880 },
{ "test_open_cursor_prepared_statement_query_cache",
test_open_cursor_prepared_statement_query_cache },
{ "test_bug9159", test_bug9159 },
{ "test_bug9520", test_bug9520 },
{ "test_bug9478", test_bug9478 },