Commit 881ce362 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-8475 

into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_parse.cc:
  Auto merged
parents 9b646221 ae9166cd

mysql-test/r/multi_statement.result

+17 −0
Original line number Diff line number Diff line
@@ -31,3 +31,20 @@ select 5'abcd' 
select 'finish';

finish

finish

flush status;

create table t1 (i int);

insert into t1 values (1);

select * from t1 where i = 1;

insert into t1 values (2),(3),(4);

select * from t1 where i = 2;

select * from t1 where i = 3||||

i

1

i

2

i

3

show status like 'Slow_queries'||||

Variable_name	Value

Slow_queries	2

drop table t1||||

mysql-test/t/multi_statement-master.opt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
--log-slow-queries=slow.log

--log-queries-not-using-indexes

mysql-test/t/multi_statement.test

+15 −0
Original line number Diff line number Diff line
@@ -14,3 +14,18 @@ select "abcd'";'abcd'select "'abcd";'abcd' 
select 5'abcd'

delimiter ;'abcd'

select 'finish';



# Bug #8475: Make sure every statement that is a slow query in

# a multi-statement query gets logged as a slow query.

flush status;

delimiter ||||;

create table t1 (i int);

insert into t1 values (1);

select * from t1 where i = 1;

insert into t1 values (2),(3),(4);

select * from t1 where i = 2;

select * from t1 where i = 3||||

show status like 'Slow_queries'||||

drop table t1||||



delimiter ;||||

sql/sql_parse.cc

+22 −11
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static void remove_escape(char *name); 
static void refresh_status(void);

static bool append_file_to_dir(THD *thd, const char **filename_ptr,

			       const char *table_name);

static void log_slow_query(THD *thd);



const char *any_db="*any*";	// Special symbol for check_access
@@ -1516,6 +1517,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
#endif

      ulong length= (ulong)(packet_end-packet);



      log_slow_query(thd);



      /* Remove garbage at start of query */

      while (my_isspace(thd->charset(), *packet) && length > 0)

      {
@@ -1526,6 +1529,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
      thd->query_length= length;

      thd->query= packet;

      thd->query_id= query_id++;

      thd->set_time(); /* Reset the query start time. */

      /* TODO: set thd->lex->sql_command to SQLCOM_END here */

      VOID(pthread_mutex_unlock(&LOCK_thread_count));

#ifndef EMBEDDED_LIBRARY
@@ -1822,6 +1826,24 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
  if (thd->is_fatal_error)

    send_error(thd,0);				// End of memory ?



  log_slow_query(thd);



  thd->proc_info="cleaning up";

  VOID(pthread_mutex_lock(&LOCK_thread_count)); // For process list

  thd->proc_info=0;

  thd->command=COM_SLEEP;

  thd->query=0;

  thd->query_length=0;

  thread_running--;

  VOID(pthread_mutex_unlock(&LOCK_thread_count));

  thd->packet.shrink(thd->variables.net_buffer_length);	// Reclaim some memory

  free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));

  DBUG_RETURN(error);

}





static void log_slow_query(THD *thd)

{

  time_t start_of_query=thd->start_time;

  thd->end_time();				// Set start time
@@ -1840,17 +1862,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
      mysql_slow_log.write(thd, thd->query, thd->query_length, start_of_query);

    }

  }

  thd->proc_info="cleaning up";

  VOID(pthread_mutex_lock(&LOCK_thread_count)); // For process list

  thd->proc_info=0;

  thd->command=COM_SLEEP;

  thd->query=0;

  thd->query_length=0;

  thread_running--;

  VOID(pthread_mutex_unlock(&LOCK_thread_count));

  thd->packet.shrink(thd->variables.net_buffer_length);	// Reclaim some memory

  free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));

  DBUG_RETURN(error);

}