Percona Server moved to https://jira.percona.com/projects/PS

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

  1. bug721176
  2. Merge into 5.5
Proposed by Oleg Tsarev
Status: Rejected
Rejected by: Oleg Tsarev
Proposed branch: lp:~tsarev/percona-server/bug721176
Merge into: lp:percona-server/5.5
Diff against target: 369 lines (+78/-68)
5 files modified
patches/memory_dynamic_rows.patch (+20/-0)
patches/mysql-test.diff (+11/-11)
patches/processlist_row_stats.patch (+35/-44)
patches/slow_extended.patch (+4/-5)
patches/userstat.patch (+8/-8)
To merge this branch: bzr merge lp:~tsarev/percona-server/bug721176
Reviewer Review Type Date Requested Status
Vadim Tkachenko Disapprove
Review via email: mp+74994@code.launchpad.net

This proposal supersedes a proposal from 2011-09-06.

Description of the change

Removed "Rows_read" attribute from Slow Query Log (slow_extended.patch)
Removed "Rows_read" column from PROCESSLIST (processlist_row_stats.patch)
Refreshed patches memory_dynamic_rows.patch, response_time_distribution.patch, userstat.patch (make regenerate)

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote :

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

Revision history for this message
Vadim Tkachenko (vadim-tk) wrote :

What do you mean "removed" ?
We can't remove columns in existing production release, it breaks compatibility.
I can't accept it.

review: Disapprove
Revision history for this message
Oleg Tsarev (tsarev) wrote :

> What do you mean "removed" ?
> We can't remove columns in existing production release, it breaks
> compatibility.
> I can't accept it.

Vadim,

We planned remove "Rows_read" attribute frow slow query log/show processlist.
Do we not planned this now?

Revision history for this message
Vadim Tkachenko (vadim-tk) wrote :

If we planned, it needed to be done before production release.
We can't remove columns in production release.

On Mon, Sep 12, 2011 at 7:43 AM, Oleg Tsarev <email address hidden>wrote:

> > What do you mean "removed" ?
> > We can't remove columns in existing production release, it breaks
> > compatibility.
> > I can't accept it.
>
> Vadim,
>
> We planned remove "Rows_read" attribute frow slow query log/show
> processlist.
> Do we not planned this now?
> --
> https://code.launchpad.net/~tsarev/percona-server/bug721176/+merge/74994
> You are reviewing the proposed merge of lp:~tsarev/percona-server/bug721176
> into lp:percona-server.
>

--
Vadim Tkachenko, CTO, Percona Inc.
Phone +1-888-401-3403, Skype: vadimtk153
Schedule meeting: http://tungle.me/VadimTkachenko

Join us at Percona Live London!
http://www.percona.com/live/london-2011/

Revision history for this message
Oleg Tsarev (tsarev) wrote :

Vadim,,

Do you mean before 5.5 (major) release or before 5.5.15 (minor) release?
> If we planned, it needed to be done before production release.
> We can't remove columns in production release.
>
>
> On Mon, Sep 12, 2011 at 7:43 AM, Oleg Tsarev <email address hidden>wrote:
>
> > > What do you mean "removed" ?
> > > We can't remove columns in existing production release, it breaks
> > > compatibility.
> > > I can't accept it.
> >
> > Vadim,
> >
> > We planned remove "Rows_read" attribute frow slow query log/show
> > processlist.
> > Do we not planned this now?
> > --
> > https://code.launchpad.net/~tsarev/percona-server/bug721176/+merge/74994
> > You are reviewing the proposed merge of lp:~tsarev/percona-server/bug721176
> > into lp:percona-server.
> >
>
>
>
> --
> Vadim Tkachenko, CTO, Percona Inc.
> Phone +1-888-401-3403, Skype: vadimtk153
> Schedule meeting: http://tungle.me/VadimTkachenko
>
> Join us at Percona Live London!
> http://www.percona.com/live/london-2011/

Revision history for this message
Vadim Tkachenko (vadim-tk) wrote :

before major 5.5

On Mon, Sep 12, 2011 at 8:52 AM, Oleg Tsarev <email address hidden>wrote:

> Vadim,,
>
> Do you mean before 5.5 (major) release or before 5.5.15 (minor) release?
> > If we planned, it needed to be done before production release.
> > We can't remove columns in production release.
> >
> >
> > On Mon, Sep 12, 2011 at 7:43 AM, Oleg Tsarev <<email address hidden>
> >wrote:
> >
> > > > What do you mean "removed" ?
> > > > We can't remove columns in existing production release, it breaks
> > > > compatibility.
> > > > I can't accept it.
> > >
> > > Vadim,
> > >
> > > We planned remove "Rows_read" attribute frow slow query log/show
> > > processlist.
> > > Do we not planned this now?
> > > --
> > >
> https://code.launchpad.net/~tsarev/percona-server/bug721176/+merge/74994
> > > You are reviewing the proposed merge of
> lp:~tsarev/percona-server/bug721176
> > > into lp:percona-server.
> > >
> >
> >
> >
> > --
> > Vadim Tkachenko, CTO, Percona Inc.
> > Phone +1-888-401-3403, Skype: vadimtk153
> > Schedule meeting: http://tungle.me/VadimTkachenko
> >
> > Join us at Percona Live London!
> > http://www.percona.com/live/london-2011/
> --
> https://code.launchpad.net/~tsarev/percona-server/bug721176/+merge/74994
> Your team Percona developers is subscribed to branch lp:percona-server.
>

--
Vadim Tkachenko, CTO, Percona Inc.
Phone +1-888-401-3403, Skype: vadimtk153
Schedule meeting: http://tungle.me/VadimTkachenko

Join us at Percona Live London!
http://www.percona.com/live/london-2011/

Unmerged revisions

157. By Oleg Tsarev

propogate lp:percona-server

156. By Oleg Tsarev

propogate lp:percona-server

155. By Oleg Tsarev

Removed "Rows_read" attribute from Slow Query Log (slow_extended.patch)
Removed "Rows_read" column from PROCESSLIST (processlist_row_stats.patch)
Refreshed patches memory_dynamic_rows.patch, response_time_distribution.patch, userstat.patch (make regenerate)

154. By Stewart Smith

merge improved HEAP engine including variable sized columns

153. By Stewart Smith

bump version number

152. By Stewart Smith

merge 5.5.15 rebase

151. By Stewart Smith

use S3 download site

150. By Stewart Smith

merge a few quilt related fixes to misc scripts we use

149. By Stewart Smith

merge atomic_cas_64 fix

148. By Stewart Smith

merge compiler warning fix for innodb comparison of unsigned expression always true

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/memory_dynamic_rows.patch'
2--- patches/memory_dynamic_rows.patch 2011-09-03 15:15:31 +0000
3+++ patches/memory_dynamic_rows.patch 2011-09-12 13:47:31 +0000
4@@ -152,6 +152,26 @@
5 create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) engine=heap;
6 ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key
7 create table not_existing_database.test (a int);
8+@@ -1744,8 +1741,7 @@
9+ `INFO` longtext,
10+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0',
11+ `ROWS_SENT` bigint(21) unsigned NOT NULL DEFAULT '0',
12+- `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0',
13+- `ROWS_READ` bigint(21) unsigned NOT NULL DEFAULT '0'
14++ `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0'
15+ ) ENGINE=MyISAM DEFAULT CHARSET=utf8
16+ drop table t1;
17+ create temporary table t1 like information_schema.processlist;
18+@@ -1762,8 +1758,7 @@
19+ `INFO` longtext,
20+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0',
21+ `ROWS_SENT` bigint(21) unsigned NOT NULL DEFAULT '0',
22+- `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0',
23+- `ROWS_READ` bigint(21) unsigned NOT NULL DEFAULT '0'
24++ `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0'
25+ ) ENGINE=MyISAM DEFAULT CHARSET=utf8
26+ drop table t1;
27+ create table t1 like information_schema.character_sets;
28 --- a/mysql-test/r/ctype_utf8mb4_heap.result
29 +++ b/mysql-test/r/ctype_utf8mb4_heap.result
30 @@ -1124,6 +1124,8 @@
31
32=== modified file 'patches/mysql-test.diff'
33--- patches/mysql-test.diff 2011-09-07 14:00:24 +0000
34+++ patches/mysql-test.diff 2011-09-12 13:47:31 +0000
35@@ -655,17 +655,17 @@
36 -Id User Host db Command Time State Info
37 -### root ### test Query ### ### SHOW PROCESSLIST
38 -### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
39-+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
40-+### root ### test Query ### ### SHOW PROCESSLIST ### ### ###
41-+### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ###
42++Id User Host db Command Time State Info Rows_sent Rows_examined
43++### root ### test Query ### ### SHOW PROCESSLIST ### ###
44++### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ###
45 SET NAMES utf8;
46 SHOW PROCESSLIST;
47 -Id User Host db Command Time State Info
48 -### root ### test Query ### ### SHOW PROCESSLIST
49 -### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
50-+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
51-+### root ### test Query ### ### SHOW PROCESSLIST ### ### ###
52-+### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ###
53++Id User Host db Command Time State Info Rows_sent Rows_examined
54++### root ### test Query ### ### SHOW PROCESSLIST ### ###
55++### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ###
56 SELECT RELEASE_LOCK('t');
57 RELEASE_LOCK('t')
58 1
59@@ -680,11 +680,11 @@
60 -# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2
61 -# root localhost test Query # NULL show processlist
62 -# root localhost test Sleep # NULL
63-+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
64-+# root localhost test Sleep # NULL # # #
65-+# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 # # #
66-+# root localhost test Query # NULL show processlist # # #
67-+# root localhost test Sleep # NULL # # #
68++Id User Host db Command Time State Info Rows_sent Rows_examined
69++# root localhost test Sleep # NULL # #
70++# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 # #
71++# root localhost test Query # NULL show processlist # #
72++# root localhost test Sleep # NULL # #
73 unlock tables;
74 drop procedure bug9486;
75 drop table t1, t2;
76
77=== modified file 'patches/processlist_row_stats.patch'
78--- patches/processlist_row_stats.patch 2011-09-03 15:15:31 +0000
79+++ patches/processlist_row_stats.patch 2011-09-12 13:47:31 +0000
80@@ -23,7 +23,7 @@
81 Return info about all processes
82 - returns for each thread: thread id, user, host, db, command, info
83 + returns for each thread: thread id, user, host, db, command, info,
84-+ rows_sent, rows_examined, rows_read
85++ rows_sent, rows_examined
86 ****************************************************************************/
87
88 class thread_info :public ilink {
89@@ -31,11 +31,11 @@
90 uint command;
91 const char *user,*host,*db,*proc_info,*state_info;
92 CSET_STRING query_string;
93-+ ulonglong rows_sent, rows_examined, rows_read;
94++ ulonglong rows_sent, rows_examined;
95 };
96
97 #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
98-@@ -1836,6 +1838,15 @@
99+@@ -1836,6 +1838,12 @@
100 field->maybe_null=1;
101 field_list.push_back(field=new Item_empty_string("Info",max_query_length));
102 field->maybe_null=1;
103@@ -45,33 +45,28 @@
104 + field_list.push_back(field= new Item_return_int("Rows_examined",
105 + MY_INT64_NUM_DECIMAL_DIGITS,
106 + MYSQL_TYPE_LONGLONG));
107-+ field_list.push_back(field= new Item_return_int("Rows_read",
108-+ MY_INT64_NUM_DECIMAL_DIGITS,
109-+ MYSQL_TYPE_LONGLONG));
110 if (protocol->send_result_set_metadata(&field_list,
111 Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
112 DBUG_VOID_RETURN;
113-@@ -1889,6 +1900,9 @@
114+@@ -1889,6 +1897,8 @@
115 thd_info->query_string=
116 CSET_STRING(q, q ? length : 0, tmp->query_charset());
117 }
118 + thd_info->rows_sent= tmp->sent_row_count;
119 + thd_info->rows_examined= tmp->examined_row_count;
120-+ thd_info->rows_read= tmp->warning_info->current_row_for_warning();
121 mysql_mutex_unlock(&tmp->LOCK_thd_data);
122 thd_info->start_time= tmp->start_time;
123 thread_infos.append(thd_info);
124-@@ -1917,6 +1931,9 @@
125+@@ -1917,6 +1927,8 @@
126 protocol->store(thd_info->state_info, system_charset_info);
127 protocol->store(thd_info->query_string.str(),
128 thd_info->query_string.charset());
129 + protocol->store(thd_info->rows_sent);
130 + protocol->store(thd_info->rows_examined);
131-+ protocol->store(thd_info->rows_read);
132 if (protocol->write())
133 break; /* purecov: inspected */
134 }
135-@@ -2027,6 +2044,15 @@
136+@@ -2027,6 +2039,13 @@
137 table->field[8]->store(((tmp->start_utime ?
138 now_utime - tmp->start_utime : 0)/ 1000));
139
140@@ -80,14 +75,12 @@
141 + table->field[9]->store((ulonglong) tmp->sent_row_count);
142 + /* ROWS_EXAMINED */
143 + table->field[10]->store((ulonglong) tmp->examined_row_count);
144-+ /* ROWS_READ */
145-+ table->field[11]->store((ulonglong) tmp->warning_info->current_row_for_warning());
146 + mysql_mutex_unlock(&tmp->LOCK_thd_data);
147 +
148 if (schema_table_store_record(thd, table))
149 {
150 mysql_mutex_unlock(&LOCK_thread_count);
151-@@ -8117,6 +8143,12 @@
152+@@ -8117,6 +8136,10 @@
153 SKIP_OPEN_TABLE},
154 {"TIME_MS", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG,
155 0, 0, "Time_ms", SKIP_OPEN_TABLE},
156@@ -95,8 +88,6 @@
157 + MY_I_S_UNSIGNED, "Rows_sent", SKIP_OPEN_TABLE},
158 + {"ROWS_EXAMINED", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
159 + MY_I_S_UNSIGNED, "Rows_examined", SKIP_OPEN_TABLE},
160-+ {"ROWS_READ", MY_INT64_NUM_DECIMAL_DIGITS, MYSQL_TYPE_LONGLONG, 0,
161-+ MY_I_S_UNSIGNED, "Rows_read", SKIP_OPEN_TABLE},
162 {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
163 };
164
165@@ -107,7 +98,7 @@
166 +SHOW PROCESSLIST;
167 +
168 +--replace_column 1 ###
169-+SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
170++SELECT id, info, rows_sent, rows_examined FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
171 +
172 +SET DEBUG_SYNC= 'now SIGNAL threads_dumped';
173 --- /dev/null
174@@ -128,15 +119,15 @@
175 +SELECT a FROM t2 WHERE a > 15;
176 +SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready';
177 +SHOW PROCESSLIST;
178-+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
179-+### root ### test Query ### ### SHOW PROCESSLIST 0 0 2
180-+### root ### test Query ### ### CREATE TABLE t1 (a INT) 0 0 1
181-+### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 2 5 6
182-+SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
183-+id info rows_sent rows_examined rows_read
184-+### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1
185-+### CREATE TABLE t1 (a INT) 0 0 1
186-+### SELECT a FROM t2 WHERE a > 15 2 5 6
187++Id User Host db Command Time State Info Rows_sent Rows_examined
188++### root ### test Query ### ### SHOW PROCESSLIST 0 0
189++### root ### test Query ### ### CREATE TABLE t1 (a INT) 0 0
190++### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 2 5
191++SELECT id, info, rows_sent, rows_examined FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
192++id info rows_sent rows_examined
193++### SELECT id, info, rows_sent, rows_examined FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0
194++### CREATE TABLE t1 (a INT) 0 0
195++### SELECT a FROM t2 WHERE a > 15 2 5
196 +SET DEBUG_SYNC= 'now SIGNAL threads_dumped';
197 +a
198 +20
199@@ -148,15 +139,15 @@
200 +SELECT a FROM t2 WHERE a > 15;
201 +SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready';
202 +SHOW PROCESSLIST;
203-+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
204-+### root ### test Query ### ### SHOW PROCESSLIST 0 0 4
205-+### root ### test Query ### ### SELECT a FROM t2 WHERE a < 15 1 0 1
206-+### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 1 0 3
207-+SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
208-+id info rows_sent rows_examined rows_read
209-+### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1
210-+### SELECT a FROM t2 WHERE a < 15 1 0 1
211-+### SELECT a FROM t2 WHERE a > 15 1 0 3
212++Id User Host db Command Time State Info Rows_sent Rows_examined
213++### root ### test Query ### ### SHOW PROCESSLIST 0 0
214++### root ### test Query ### ### SELECT a FROM t2 WHERE a < 15 1 0
215++### root ### test Query ### ### SELECT a FROM t2 WHERE a > 15 1 0
216++SELECT id, info, rows_sent, rows_examined FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
217++id info rows_sent rows_examined
218++### SELECT id, info, rows_sent, rows_examined FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0
219++### SELECT a FROM t2 WHERE a < 15 1 0
220++### SELECT a FROM t2 WHERE a > 15 1 0
221 +SET DEBUG_SYNC= 'now SIGNAL threads_dumped';
222 +a
223 +10
224@@ -172,15 +163,15 @@
225 +UPDATE t2 SET a = 15 WHERE a = 10;
226 +SET DEBUG_SYNC= 'now WAIT_FOR thread2_ready';
227 +SHOW PROCESSLIST;
228-+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
229-+### root ### test Query ### ### SHOW PROCESSLIST 0 0 4
230-+### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 20 0 5 6
231-+### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 10 0 5 6
232-+SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
233-+id info rows_sent rows_examined rows_read
234-+### SELECT id, info, rows_sent, rows_examined, rows_read FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0 1
235-+### UPDATE t2 SET a = 15 WHERE a = 20 0 5 6
236-+### UPDATE t2 SET a = 15 WHERE a = 10 0 5 6
237++Id User Host db Command Time State Info Rows_sent Rows_examined
238++### root ### test Query ### ### SHOW PROCESSLIST 0 0
239++### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 20 0 5
240++### root ### test Query ### ### UPDATE t2 SET a = 15 WHERE a = 10 0 5
241++SELECT id, info, rows_sent, rows_examined FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id;
242++id info rows_sent rows_examined
243++### SELECT id, info, rows_sent, rows_examined FROM INFORMATION_SCHEMA.PROCESSLIST ORDER BY id 0 0
244++### UPDATE t2 SET a = 15 WHERE a = 20 0 5
245++### UPDATE t2 SET a = 15 WHERE a = 10 0 5
246 +SET DEBUG_SYNC= 'now SIGNAL threads_dumped';
247 +DROP TABLES t1, t2;
248 --- /dev/null
249
250=== modified file 'patches/slow_extended.patch'
251--- patches/slow_extended.patch 2011-09-07 14:00:24 +0000
252+++ patches/slow_extended.patch 2011-09-12 13:47:31 +0000
253@@ -300,14 +300,14 @@
254
255 /* Note that my_b_write() assumes it knows the length for this */
256 if (my_b_write(&log_file, (uchar*) buff, buff_len))
257-@@ -2711,12 +2751,69 @@
258+@@ -2711,12 +2751,68 @@
259 sprintf(query_time_buff, "%.6f", ulonglong2double(query_utime)/1000000.0);
260 sprintf(lock_time_buff, "%.6f", ulonglong2double(lock_utime)/1000000.0);
261 if (my_b_printf(&log_file,
262 - "# Query_time: %s Lock_time: %s"
263 - " Rows_sent: %lu Rows_examined: %lu\n",
264 + "# Thread_id: %lu Schema: %s Last_errno: %u Killed: %u\n" \
265-+ "# Query_time: %s Lock_time: %s Rows_sent: %lu Rows_examined: %lu Rows_affected: %lu Rows_read: %lu\n"
266++ "# Query_time: %s Lock_time: %s Rows_sent: %lu Rows_examined: %lu Rows_affected: %lu\n"
267 + "# Bytes_sent: %lu Tmp_tables: %lu Tmp_disk_tables: %lu Tmp_table_sizes: %lu\n",
268 + (ulong) thd->thread_id, (thd->db ? thd->db : ""),
269 + thd->last_errno, (uint) thd->killed,
270@@ -316,7 +316,6 @@
271 - (ulong) thd->examined_row_count) == (uint) -1)
272 + (ulong) thd->examined_row_count,
273 + ((long) thd->get_row_count_func() > 0 ) ? (ulong) thd->get_row_count_func() : 0,
274-+ (ulong) thd->sent_row_count,
275 + (ulong) (thd->status_var.bytes_sent - thd->bytes_sent_old),
276 + (ulong) thd->tmp_tables_used,
277 + (ulong) thd->tmp_tables_disk_used,
278@@ -1407,13 +1406,13 @@
279 +1
280 +# User@Host: root[root] @ localhost []
281 +# Thread_id: X Schema: test Last_errno: X Killed: X
282-+# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
283++# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X
284 +# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X
285 +# Profile_starting: X.X Profile_starting_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
286 +# Profile_total: X.X Profile_total_cpu: X.X
287 +# User@Host: root[root] @ localhost []
288 +# Thread_id: X Schema: test Last_errno: X Killed: X
289-+# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X Rows_read: X
290++# Query_time: X.X Lock_time: X.X Rows_sent: X Rows_examined: X Rows_affected: X
291 +# Bytes_sent: X Tmp_tables: X Tmp_disk_tables: X Tmp_table_sizes: X
292 +# Profile_starting: X.X Profile_starting_cpu: X.X Profile_checking_permissions: X.X Profile_checking_permissions_cpu: X.X Profile_Opening_tables: X.X Profile_Opening_tables_cpu: X.X Profile_init: X.X Profile_init_cpu: X.X Profile_optimizing: X.X Profile_optimizing_cpu: X.X Profile_executing: X.X Profile_executing_cpu: X.X Profile_end: X.X Profile_end_cpu: X.X Profile_query_end: X.X Profile_query_end_cpu: X.X Profile_closing_tables: X.X Profile_closing_tables_cpu: X.X Profile_freeing_items: X.X Profile_freeing_items_cpu: X.X Profile_logging_slow_query: X.X Profile_logging_slow_query_cpu: X.X
293 +# Profile_total: X.X Profile_total_cpu: X.X
294
295=== modified file 'patches/userstat.patch'
296--- patches/userstat.patch 2011-09-07 14:00:24 +0000
297+++ patches/userstat.patch 2011-09-12 13:47:31 +0000
298@@ -363,7 +363,7 @@
299 /*
300 Log error with all enabled log event handlers
301
302-@@ -5040,6 +5047,8 @@
303+@@ -5039,6 +5046,8 @@
304 thd->first_successful_insert_id_in_prev_stmt_for_binlog);
305 if (e.write(file))
306 goto err;
307@@ -372,7 +372,7 @@
308 }
309 if (thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements() > 0)
310 {
311-@@ -5051,12 +5060,16 @@
312+@@ -5050,12 +5059,16 @@
313 minimum());
314 if (e.write(file))
315 goto err;
316@@ -389,7 +389,7 @@
317 }
318 if (thd->user_var_events.elements)
319 {
320-@@ -5079,6 +5092,8 @@
321+@@ -5078,6 +5091,8 @@
322 flags);
323 if (e.write(file))
324 goto err;
325@@ -398,7 +398,7 @@
326 }
327 }
328 }
329-@@ -5090,6 +5105,8 @@
330+@@ -5089,6 +5104,8 @@
331 if (event_info->write(file) ||
332 DBUG_EVALUATE_IF("injecting_fault_writing", 1, 0))
333 goto err;
334@@ -407,7 +407,7 @@
335
336 error= 0;
337 err:
338-@@ -5275,7 +5292,8 @@
339+@@ -5274,7 +5291,8 @@
340 be reset as a READ_CACHE to be able to read the contents from it.
341 */
342
343@@ -417,7 +417,7 @@
344 {
345 Mutex_sentry sentry(lock_log ? &LOCK_log : NULL);
346
347-@@ -5322,6 +5340,7 @@
348+@@ -5321,6 +5339,7 @@
349 /* write the first half of the split header */
350 if (my_b_write(&log_file, header, carry))
351 return ER_ERROR_ON_WRITE;
352@@ -425,7 +425,7 @@
353
354 /*
355 copy fixed second half of header to cache so the correct
356-@@ -5390,6 +5409,7 @@
357+@@ -5389,6 +5408,7 @@
358 /* Write data to the binary log file */
359 if (my_b_write(&log_file, cache->read_pos, length))
360 return ER_ERROR_ON_WRITE;
361@@ -433,7 +433,7 @@
362 cache->read_pos=cache->read_end; // Mark buffer used up
363 } while ((length= my_b_fill(cache)));
364
365-@@ -5504,20 +5524,23 @@
366+@@ -5503,20 +5523,23 @@
367 Query_log_event qinfo(thd, STRING_WITH_LEN("BEGIN"), TRUE, FALSE, TRUE, 0);
368 if (qinfo.write(&log_file))
369 goto err;

Subscribers

People subscribed via source and target branches