Merge lp:~akopytov/percona-server/bug830286-5.1 into lp:percona-server/5.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/455/

[Vlad Lesin (vlad-lesin)]

Looks good.

review: Approve

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Laurynas Biveinis (laurynas-biveinis)]

Comment typo at diff line 78: s/= 0;/= 1;/

Can you repush the branch with it fixed? No need to resubmit, retest, etc.

review: Approve

=== added file 'Percona-Server/mysql-test/r/percona_bug830286.result'
--- Percona-Server/mysql-test/r/percona_bug830286.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug830286.result	2012-10-27 06:45:26 +0000
@@ -0,0 +1,15 @@
+SET @old_slow_query_log_file=@@global.slow_query_log_file;
+SET GLOBAL slow_query_log=ON;
+SET LOCAL long_query_time=0;
+SET GLOBAL slow_query_log_file='MYSQLTEST_VARDIR/percona_bug830286_slow.log';;
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+SELECT * FROM t1 LIMIT 1;
+a
+1
+Rows_read: 0
+Rows_read: 0
+Rows_read: 0
+Rows_read: 1
+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
+DROP TABLE t1;

=== modified file 'Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result'
--- Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result	2011-11-24 01:59:42 +0000
+++ Percona-Server/mysql-test/r/percona_slow_extended_error_on_quit.result	2012-10-27 06:45:26 +0000
@@ -33,9 +33,9 @@
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
 [log_grep.inc] lines:   3
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
-[log_grep.inc] lines:   3
+[log_grep.inc] lines:   0
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
-[log_grep.inc] lines:   0
+[log_grep.inc] lines:   3
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
 [log_grep.inc] lines:   2
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0
@@ -89,9 +89,9 @@
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
 [log_grep.inc] lines:   1
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
-[log_grep.inc] lines:   3
+[log_grep.inc] lines:   1
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
-[log_grep.inc] lines:   0
+[log_grep.inc] lines:   2
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
 [log_grep.inc] lines:   2
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0
@@ -145,9 +145,9 @@
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_affected: 0
 [log_grep.inc] lines:   3
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: [^0]+
-[log_grep.inc] lines:   3
+[log_grep.inc] lines:   1
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Rows_read: 0
-[log_grep.inc] lines:   0
+[log_grep.inc] lines:   2
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: [^0]+
 [log_grep.inc] lines:   2
 [log_grep.inc] file: percona.slow_extended.error_on_quit pattern: Bytes_sent: 0

=== added file 'Percona-Server/mysql-test/t/percona_bug830286.test'
--- Percona-Server/mysql-test/t/percona_bug830286.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug830286.test	2012-10-27 06:45:26 +0000
@@ -0,0 +1,58 @@
+#########################################################################
+# LP bug #830286: rows_read is overflowed when changing db
+#########################################################################
+
+#
+# This test suffers from server
+# Bug#38124 "general_log_file" variable silently unset when using expression
+# In short:
+#    SET GLOBAL general_log_file = @<whatever>
+#    SET GLOBAL slow_query_log = @<whatever>
+# cause that the value of these server system variables is set to default
+# instead of the assigned values. There comes no error message or warning.
+# If this bug is fixed please
+# 1. try this test with "let $fixed_bug38124 = 0;"
+# 2. remove all workarounds if 1. was successful.
+let $fixed_bug38124 = 0;
+
+SET @old_slow_query_log_file=@@global.slow_query_log_file;
+SET GLOBAL slow_query_log=ON;
+SET LOCAL long_query_time=0;
+
+let slogfile=$MYSQLTEST_VARDIR/percona_bug830286_slow.log;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--eval SET GLOBAL slow_query_log_file='$slogfile';
+
+--disable_ps_protocol
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+SELECT * FROM t1 LIMIT 1;
+--enable_ps_protocol
+
+perl;
+  $slogfile= $ENV{'slogfile'};
+
+  open(FILE, "$slogfile") or
+    die("Unable to read slow query log file $slogfile: $!\n");
+  while(<FILE>) {
+    next if (!/^# Query_time:/);
+    s/.*(Rows_read: [0-9]+)/$1/g;
+    print;
+  }
+
+  close(FILE);
+  open(FILE, '>', "$slogfile");
+  close(FILE);
+EOF
+
+SET GLOBAL slow_query_log_file=@old_slow_query_log_file;
+
+DROP TABLE t1;
+
+if(!$fixed_bug38124)
+{
+  --disable_query_log
+  let $my_var = `SELECT @old_slow_query_log_file`;
+  eval SET @@global.slow_query_log_file = '$my_var';
+  --enable_query_log
+}

=== modified file 'Percona-Server/sql/log.cc'
--- Percona-Server/sql/log.cc	2012-08-20 03:14:02 +0000
+++ Percona-Server/sql/log.cc	2012-10-27 06:45:26 +0000
@@ -2418,7 +2418,7 @@
                     (ulong) thd->sent_row_count,
                     (ulong) thd->examined_row_count,
                     ((long) thd->row_count_func > 0 ) ? (ulong) thd->row_count_func : 0,
-                    thd->row_count - thd->orig_row_count + 1,
+                    (ulong) thd->examined_row_count,
                     (ulong) (thd->status_var.bytes_sent - thd->bytes_sent_old),
                     (ulong) thd->tmp_tables_used,
                     (ulong) thd->tmp_tables_disk_used,

=== modified file 'Percona-Server/sql/sql_class.cc'
--- Percona-Server/sql/sql_class.cc	2012-08-20 05:18:21 +0000
+++ Percona-Server/sql/sql_class.cc	2012-10-27 06:45:26 +0000
@@ -3406,7 +3406,6 @@
 {
   DBUG_ENTER("THD::clear_slow_extended");
   sent_row_count=               0;
-  orig_row_count=               row_count;
   examined_row_count=           0;
   bytes_sent_old=               status_var.bytes_sent;
   tmp_tables_used=              0;

=== modified file 'Percona-Server/sql/sql_class.h'
--- Percona-Server/sql/sql_class.h	2012-08-20 03:14:02 +0000
+++ Percona-Server/sql/sql_class.h	2012-10-27 06:45:26 +0000
@@ -1514,11 +1514,6 @@
   */
   ulonglong  bytes_sent_old;
   /*
-    Original row_count value at the start of query execution
-    (used by the slow_extended patch).
-  */
-  ulong      orig_row_count;
-  /*
     Variables tmp_tables_*** collect statistics about usage of temporary tables
   */
   ulong      tmp_tables_used;