Commit 2c576fa9 authored by Kristofer Pettersson's avatar Kristofer Pettersson
Browse files

automerge

parents c3d3f3ec 218c4e15

mysql-test/r/status2.result

0 → 100644
+64 −0
Original line number Diff line number Diff line 
#

# Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines

#

FLUSH STATUS;

DROP TABLE IF EXISTS t1,t2;

DROP PROCEDURE IF EXISTS p1;

DROP FUNCTION IF EXISTS f1;

CREATE FUNCTION f1() RETURNS INTEGER

BEGIN

DECLARE foo INTEGER;

DECLARE bar INTEGER;

SET foo=1;

SET bar=2;

RETURN foo;

END $$

CREATE PROCEDURE p1()

BEGIN

SELECT 1;

END $$

CREATE TABLE t1 (c1 INT);

CREATE TABLE t2 (c1 INT);

INSERT INTO t1 VALUES (1);

Assert Questions == 9

SHOW STATUS LIKE 'Questions';

Variable_name	Value

Questions	9

SELECT f1();

f1()

1

Assert Questions == 11

SHOW STATUS LIKE 'Questions';

Variable_name	Value

Questions	11

CALL p1();

1

1

Assert Questions == 13

SHOW STATUS LIKE 'Questions';

Variable_name	Value

Questions	13

SELECT 1;

1

1

Assert Questions == 15

SHOW STATUS LIKE 'Questions';

Variable_name	Value

Questions	15

FLUSH STATUS;

SELECT 1;

1

1

Assert Questions == 16

SHOW STATUS LIKE 'Questions';

Variable_name	Value

Questions	16

Global status updated; Assert diff == 5

FLUSH STATUS;

SELECT 5;

5

5

DROP TABLE t1,t2;

DROP PROCEDURE p1;

DROP FUNCTION f1;

End of 6.0 tests

mysql-test/t/status2.test

0 → 100644
+64 −0
Original line number Diff line number Diff line 
--echo #

--echo # Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines

--echo #

# The bogus connection below is needed to make the gobal statement count

# deterministic when the test is run for the first time. 

connect (con1,localhost,root,,);

connection con1;

connection default;

disconnect con1;

FLUSH STATUS;

--disable_warnings

DROP TABLE IF EXISTS t1,t2;

DROP PROCEDURE IF EXISTS p1;

DROP FUNCTION IF EXISTS f1;

--enable_warnings

DELIMITER $$;

CREATE FUNCTION f1() RETURNS INTEGER

BEGIN

  DECLARE foo INTEGER;

  DECLARE bar INTEGER;

  SET foo=1;

  SET bar=2;

  RETURN foo;

END $$

CREATE PROCEDURE p1()

BEGIN

  SELECT 1;

END $$

DELIMITER ;$$

CREATE TABLE t1 (c1 INT);

CREATE TABLE t2 (c1 INT);

INSERT INTO t1 VALUES (1);

--echo Assert Questions == 9

SHOW STATUS LIKE 'Questions';

SELECT f1();

--echo Assert Questions == 11

SHOW STATUS LIKE 'Questions';

CALL p1();

--echo Assert Questions == 13

SHOW STATUS LIKE 'Questions';

SELECT 1;

--echo Assert Questions == 15

SHOW STATUS LIKE 'Questions';

connect (con1,localhost,root,,);

connection con1;

FLUSH STATUS;

let $org_questions= `SHOW GLOBAL STATUS LIKE 'questions'`;

SELECT 1;

connection default;

disconnect con1;

--echo Assert Questions == 16

SHOW STATUS LIKE 'Questions';

--echo Global status updated; Assert diff == 5

FLUSH STATUS;

let $new_questions= `SHOW GLOBAL STATUS LIKE 'questions'`;

--disable_log

let $diff= `SELECT SUBSTRING('$new_questions',10)-SUBSTRING('$org_questions',10)`;

--enable_log

eval SELECT $diff;

DROP TABLE t1,t2;

DROP PROCEDURE p1;

DROP FUNCTION f1;

--echo End of 6.0 tests

sql/mysqld.cc

+3 −1
Original line number Diff line number Diff line
@@ -6573,7 +6573,9 @@ struct show_var_st status_vars[]= { 
  {"Qcache_queries_in_cache",  (char*) &query_cache.queries_in_cache, SHOW_LONG_CONST},

  {"Qcache_total_blocks",      (char*) &query_cache.total_blocks, SHOW_LONG_CONST},

#endif /*HAVE_QUERY_CACHE*/

  {"Questions",                (char*) 0,                       SHOW_QUESTION},

  {"Questions",                (char*) offsetof(STATUS_VAR, questions),

   SHOW_LONG_STATUS},



  {"Rpl_status",               (char*) 0,                 SHOW_RPL_STATUS},

  {"Select_full_join",         (char*) offsetof(STATUS_VAR, select_full_join_count), SHOW_LONG_STATUS},

  {"Select_full_range_join",   (char*) offsetof(STATUS_VAR, select_full_range_join_count), SHOW_LONG_STATUS},

sql/sql_class.h

+10 −3
Original line number Diff line number Diff line
@@ -664,10 +664,17 @@ typedef struct system_status_var 
  ulong com_stmt_fetch;

  ulong com_stmt_reset;

  ulong com_stmt_close;

  /*

    Number of statements sent from the client

  */

  ulong questions;



  /*

    Status variables which it does not make sense to add to

    global status variable counter

    IMPORTANT!

    SEE last_system_status_var DEFINITION BELOW.



    Below 'last_system_status_var' are all variables which doesn't make any

    sense to add to the /global/ status variable counter.

  */

  double last_query_cost;

} STATUS_VAR;
@@ -678,7 +685,7 @@ typedef struct system_status_var 
  counter

*/



#define last_system_status_var com_stmt_close

#define last_system_status_var questions





void free_tmp_table(THD *thd, TABLE *entry);

sql/sql_parse.cc

+22 −1
Original line number Diff line number Diff line
@@ -1690,8 +1690,24 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
  thd->set_time();

  VOID(pthread_mutex_lock(&LOCK_thread_count));

  thd->query_id= global_query_id;

  if (command != COM_STATISTICS && command != COM_PING)

  

  switch( command ) {

  /* Ignore these statements. */

  case COM_STATISTICS:

  case COM_PING:

    break;

  /* Only increase id on these statements but don't count them. */

  case COM_STMT_PREPARE: 

  case COM_STMT_CLOSE:

  case COM_STMT_RESET:

    next_query_id();

    break;

  /* Increase id and count all other statements. */

  default:

    statistic_increment(thd->status_var.questions, &LOCK_status);

    next_query_id();

  }

  

  thread_running++;

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

  VOID(pthread_mutex_unlock(&LOCK_thread_count));
@@ -1896,6 +1912,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
      VOID(pthread_mutex_lock(&LOCK_thread_count));

      thd->query_length= length;

      thd->query= next_packet;

      /*

        Count each statement from the client.

      */

      statistic_increment(thd->status_var.questions, &LOCK_status);



      thd->query_id= next_query_id();

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

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