database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

Browse Source 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
This commit is contained in:
bell@sanja.is.com.ua
2005-12-03 08:56:00 +02:00
parent 52bb91cceb 58c581ab62
commit 3d2d9c2259
12 changed files with 306 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_cache.cc
View File

@ -996,9 +996,9 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
check all such queries, too.
*/
if ((my_toupper(system_charset_info, sql[i]) != 'S' ||
my_toupper(system_charset_info, sql[i + 1]) != 'E' ||
my_toupper(system_charset_info, sql[i + 2]) != 'L') &&
sql[0] != '/')
my_toupper(system_charset_info, sql[i + 1]) != 'E' ||
my_toupper(system_charset_info, sql[i + 2]) != 'L') &&
sql[0] != '/')
{
DBUG_PRINT("qcache", ("The statement is not a SELECT; Not cached"));
goto err;
@ -2196,7 +2196,7 @@ Query_cache::register_tables_from_list(TABLE_LIST *tables_used,
tables_used;
tables_used= tables_used->next_global, n++, block_table++)
{
if (tables_used->derived)
if (tables_used->derived && !tables_used->view)
{
DBUG_PRINT("qcache", ("derived table skipped"));
n--;