Merge lp:~tsarev/percona-server/test55_830199 into lp:percona-server/5.5

[Oleg Tsarev]

Fix bug #830199 - thd->last_errno was not updated on handle_condition (bug was introduced while porting slow_extended.patch 5.1 to 5.5)

[Oleg Tsarev (tsarev)]

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/120

=== modified file 'patches/slow_extended.patch'
--- patches/slow_extended.patch	2011-09-21 08:35:45 +0000
+++ patches/slow_extended.patch	2011-09-21 11:36:23 +0000
@@ -549,15 +549,16 @@
  
  /**
    Dumps a text description of a thread, its security context
-@@ -912,6 +943,7 @@
+@@ -907,6 +938,8 @@
+                            const char* msg,
+                            MYSQL_ERROR ** cond_hdl)
+ {
++  last_errno= sql_errno;
++
+   if (!m_internal_handler)
+   {
      *cond_hdl= NULL;
-     return FALSE;
-   }
-+  last_errno= sql_errno;
- 
-   for (Internal_error_handler *error_handler= m_internal_handler;
-        error_handler;
-@@ -3656,6 +3688,12 @@
+@@ -3656,6 +3689,12 @@
      first_successful_insert_id_in_prev_stmt;
    backup->first_successful_insert_id_in_cur_stmt= 
      first_successful_insert_id_in_cur_stmt;
@@ -570,7 +571,7 @@
  
    if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) &&
        !is_current_stmt_binlog_format_row())
-@@ -3676,6 +3714,14 @@
+@@ -3676,6 +3715,14 @@
    cuted_fields= 0;
    transaction.savepoints= 0;
    first_successful_insert_id_in_cur_stmt= 0;
@@ -585,7 +586,7 @@
  }
  
  
-@@ -3738,6 +3784,12 @@
+@@ -3738,6 +3785,12 @@
    */
    examined_row_count+= backup->examined_row_count;
    cuted_fields+=       backup->cuted_fields;
@@ -1332,7 +1333,7 @@
  };
  
  
-@@ -276,9 +280,11 @@
+@@ -276,10 +280,11 @@
  
    /* SHOW PROFILES */
    bool show_profiles();
@@ -1383,7 +1384,6 @@
 +EVAL SET GLOBAL slow_query_log_file="$log_file_full_path";
 +SET GLOBAL slow_query_log=ON;
 +--enable_query_log
-\ No newline at end of file
 --- /dev/null
 +++ b/mysql-test/include/log_stop.inc
 @@ -0,0 +1,7 @@
@@ -2384,3 +2384,43 @@
 +++ b/mysql-test/t/percona_log_slow_global_control_default.test
 @@ -0,0 +1 @@
 +SET GLOBAL slow_query_log_use_global_control=default;
+--- /dev/null
++++ b/mysql-test/r/percona_slow_extended_log_error.result
+@@ -0,0 +1,11 @@
++SET GLOBAL long_query_time=0;
++SET GLOBAL slow_query_log_timestamp_always=ON;
++SET long_query_time=0;
++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_slow_extended_log_error.test
+@@ -0,0 +1,23 @@
++--let log_file=percona.slow_extended.error_on_quit
++
++SET GLOBAL long_query_time=0;
++SET GLOBAL slow_query_log_timestamp_always=ON;
++
++connect (conn1,localhost,root,,);
++connection conn1;
++SET long_query_time=0;
++--disable_warnings
++DROP TABLE IF EXISTS t1;
++--enable_warnings
++CREATE TABLE t1 (a INT);
++--source include/log_start.inc
++--error ER_TABLE_EXISTS_ERROR
++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 slow_query_log_timestamp_always=default;
++DROP TABLE t1;