Merge lp:~tsarev/percona-server/test51_716210 into lp:percona-server/5.1

[Oleg Tsarev]

Fixed bug #716210 - incorrect last_errno in slow-query-log

[Oleg Tsarev (tsarev)]

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/133/

[lp:~tsarev/percona-server/test51_716210]

281. By Oleg Tsarev on 2011-09-12

1) move tests from mysql-test/ to patches
2) remove install_tests script and call of script from Makefile

282. By Oleg Tsarev on 2011-09-12

Fixed bug #716210 - incorrect last_errno in slow-query-log

Unmerged revisions

282. By Oleg Tsarev on 2011-09-12

Fixed bug #716210 - incorrect last_errno in slow-query-log

281. By Oleg Tsarev on 2011-09-12

1) move tests from mysql-test/ to patches
2) remove install_tests script and call of script from Makefile

=== modified file 'patches/slow_extended.patch'
--- patches/slow_extended.patch	2011-08-09 13:35:34 +0000
+++ patches/slow_extended.patch	2011-09-06 08:42:23 +0000
@@ -1388,7 +1388,15 @@
  
  const char *any_db="*any*";	// Special symbol for check_access
  
-@@ -1700,6 +1701,50 @@
+@@ -999,6 +1000,7 @@
+     the slow log only if opt_log_slow_admin_statements is set.
+   */
+   thd->enable_slow_log= TRUE;
++  thd->last_errno= 0;
+   thd->lex->sql_command= SQLCOM_END; /* to avoid confusing VIEW detectors */
+   thd->set_time();
+   if (!thd->is_valid_time())
+@@ -1700,6 +1702,50 @@
    DBUG_RETURN(error);
  }
  
@@ -1439,7 +1447,7 @@
  
  void log_slow_statement(THD *thd)
  {
-@@ -1713,17 +1758,51 @@
+@@ -1713,17 +1759,51 @@
    if (unlikely(thd->in_sub_stmt))
      DBUG_VOID_RETURN;                           // Don't set time for sub stmt
  
@@ -1494,7 +1502,7 @@
           ((thd->server_status &
             (SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED)) &&
            opt_log_queries_not_using_indexes &&
-@@ -2099,6 +2178,9 @@
+@@ -2099,6 +2179,9 @@
      context.resolve_in_table_list_only(select_lex->
                                         table_list.first);
  
@@ -1504,7 +1512,7 @@
    /*
      Reset warning count for each query that uses tables
      A better approach would be to reset this for any commands
-@@ -5827,6 +5909,21 @@
+@@ -5827,6 +5910,21 @@
    thd->rand_used= 0;
    thd->sent_row_count= thd->examined_row_count= 0;
  
@@ -2575,3 +2583,44 @@
  /* Intvar event post-header */
  
  /* Intvar event data */
+--- /dev/null
++++ b/mysql-test/r/percona_log_slow_parse_error.result
+@@ -0,0 +1,11 @@
++SET GLOBAL long_query_time=0;
++SET GLOBAL use_global_long_query_time=1;
++SET GLOBAL log_slow_timestamp_every=1;
++DROP TABLE IF EXISTS t1;
++CREATE TABLE t1 (a INT);
++[log_start.inc] percona.slow_extended.error_on_quit
++CREATE TABLE t1 (a INT);
++ERROR 42S01: Table 't1' already exists
++[log_stop.inc] percona.slow_extended.error_on_quit
++[log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Last_errno: 1050
++[log_grep.inc] lines:   1
+--- /dev/null
++++ b/mysql-test/t/percona_log_slow_parse_error.test
+@@ -0,0 +1,24 @@
++--let log_file=percona.slow_extended.error_on_quit
++
++SET GLOBAL long_query_time=0;
++SET GLOBAL use_global_long_query_time=1;
++SET GLOBAL log_slow_timestamp_every=1;
++
++connect (conn1,localhost,root,,);
++connection conn1;
++--disable_warnings
++DROP TABLE IF EXISTS t1;
++--enable_warnings
++CREATE TABLE t1 (a INT);
++--source include/log_start.inc
++--error 1050
++CREATE TABLE t1 (a INT);
++disconnect conn1;
++connection default;
++--source include/log_stop.inc
++--let grep_pattern = Last_errno: 1050
++--source include/log_grep.inc
++SET GLOBAL long_query_time=default;
++SET GLOBAL use_global_long_query_time=default;
++SET GLOBAL log_slow_timestamp_every=default;
++DROP TABLE t1;