Commit 7a3cf493 authored by unknown's avatar unknown
Browse files

merge 


BitKeeper/deleted/.del-query_cache_notembedded.result:
  Delete: mysql-test/r/query_cache_notembedded.result
BitKeeper/deleted/.del-query_cache_notembedded.test:
  Delete: mysql-test/t/query_cache_notembedded.test
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
parents 0872e83c a724dbc0

sql/item_strfunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ String *Item_func_substr_index::val_str(String *str) 
      }

    }

    else

    {					// Start counting at end

    {

      /*

        Negative index, start counting at the end

      */

sql/sql_cache.cc

+3 −3
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) 
  TABLE_COUNTER_TYPE local_tables;

  ulong tot_length;

  DBUG_ENTER("Query_cache::store_query");

  if (query_cache_size == 0)

  if (query_cache_size == 0 || thd->locked_tables)

    DBUG_VOID_RETURN;

  uint8 tables_type= 0;
@@ -921,8 +921,8 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) 
  bool check_tables;

  DBUG_ENTER("Query_cache::send_result_to_client");



  if (query_cache_size == 0 || thd->variables.query_cache_type == 0)



  if (query_cache_size == 0 || thd->locked_tables ||

      thd->variables.query_cache_type == 0)

    goto err;



  /* Check that we haven't forgot to reset the query cache variables */