Skip to content

Commit d361401

Browse files
dr-mdr-m
committed
Merge 10.1 into 10.2, with some MDEV-14799 fixups
trx_undo_page_report_modify(): For SPATIAL INDEX, keep logging updated off-page columns twice, so that the minimum bounding rectangle (MBR) will be logged. Avoiding the redundant logging would require larger changes to the undo log format. row_build_index_entry_low(): Handle SPATIAL_UNKNOWN more robustly, by refusing to purge the record from the spatial index. We can get this code when processing old undo log from 10.2.10 or 10.2.11 (the releases affected by MDEV-14799, which was a regression from MDEV-14051).
2 parents 7a9fee9 + 016caa3 commit d361401

File tree

20 files changed

+642
-55
lines changed

20 files changed

+642
-55
lines changed

‎man/mysqladmin.1

Lines changed: 184 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'\" t
22
.\"
3-
.TH "\FBMYSQLADMIN\FR" "1" "3 April 2017" "MariaDB 10\&.2" "MariaDB Database System"
3+
.TH "\FBMYSQLADMIN\FR" "1" "28 December 2017" "MariaDB 10\&.2" "MariaDB Database System"
44
.\" -----------------------------------------------------------------
55
.\" * set default formatting
66
.\" -----------------------------------------------------------------
@@ -106,6 +106,97 @@ Display the server status variables and their values\&.
106106
.sp -1
107107
.IP \(bu 2.3
108108
.\}
109+
flush\-all\-statistics
110+
.sp
111+
Flush all statistics tables\&.
112+
.RE
113+
.sp
114+
.RS 4
115+
.ie n \{\
116+
\h'-04'\(bu\h'+03'\c
117+
.\}
118+
.el \{\
119+
.sp -1
120+
.IP \(bu 2.3
121+
.\}
122+
flush\-all\-status
123+
.sp
124+
Flush all status and statistics\&.
125+
.RE
126+
.sp
127+
.RS 4
128+
.ie n \{\
129+
\h'-04'\(bu\h'+03'\c
130+
.\}
131+
.el \{\
132+
.sp -1
133+
.IP \(bu 2.3
134+
.\}
135+
flush\-binary\-log
136+
.sp
137+
Flush the binary log\&.
138+
.RE
139+
.sp
140+
.RS 4
141+
.ie n \{\
142+
\h'-04'\(bu\h'+03'\c
143+
.\}
144+
.el \{\
145+
.sp -1
146+
.IP \(bu 2.3
147+
.\}
148+
flush\-client\-statistics
149+
.sp
150+
Flush client statistics\&.
151+
.RE
152+
.sp
153+
.RS 4
154+
.ie n \{\
155+
\h'-04'\(bu\h'+03'\c
156+
.\}
157+
.el \{\
158+
.sp -1
159+
.IP \(bu 2.3
160+
.\}
161+
flush\-engine\-log
162+
.sp
163+
Flush engine log\&.
164+
.RE
165+
.sp
166+
.RS 4
167+
.ie n \{\
168+
\h'-04'\(bu\h'+03'\c
169+
.\}
170+
.el \{\
171+
.sp -1
172+
.IP \(bu 2.3
173+
.\}
174+
flush\-error\-log
175+
.sp
176+
Flush error log\&.
177+
.RE
178+
.sp
179+
.RS 4
180+
.ie n \{\
181+
\h'-04'\(bu\h'+03'\c
182+
.\}
183+
.el \{\
184+
.sp -1
185+
.IP \(bu 2.3
186+
.\}
187+
flush\-general\-log
188+
.sp
189+
Flush general query log\&.
190+
.RE
191+
.sp
192+
.RS 4
193+
.ie n \{\
194+
\h'-04'\(bu\h'+03'\c
195+
.\}
196+
.el \{\
197+
.sp -1
198+
.IP \(bu 2.3
199+
.\}
109200
flush\-hosts
110201
.sp
111202
Flush all information in the host cache\&.
@@ -119,6 +210,19 @@ Flush all information in the host cache\&.
119210
.sp -1
120211
.IP \(bu 2.3
121212
.\}
213+
flush\-index\-statistics
214+
.sp
215+
Flush index statistics\&.
216+
.RE
217+
.sp
218+
.RS 4
219+
.ie n \{\
220+
\h'-04'\(bu\h'+03'\c
221+
.\}
222+
.el \{\
223+
.sp -1
224+
.IP \(bu 2.3
225+
.\}
122226
flush\-logs
123227
.sp
124228
Flush all logs\&.
@@ -146,6 +250,32 @@ reload)\&.
146250
.sp -1
147251
.IP \(bu 2.3
148252
.\}
253+
flush\-relay\-log
254+
.sp
255+
Flush relay log\&.
256+
.RE
257+
.sp
258+
.RS 4
259+
.ie n \{\
260+
\h'-04'\(bu\h'+03'\c
261+
.\}
262+
.el \{\
263+
.sp -1
264+
.IP \(bu 2.3
265+
.\}
266+
flush\-slow\-log
267+
.sp
268+
Flush slow query log\&.
269+
.RE
270+
.sp
271+
.RS 4
272+
.ie n \{\
273+
\h'-04'\(bu\h'+03'\c
274+
.\}
275+
.el \{\
276+
.sp -1
277+
.IP \(bu 2.3
278+
.\}
149279
flush\-status
150280
.sp
151281
Clear status variables\&.
@@ -159,6 +289,19 @@ Clear status variables\&.
159289
.sp -1
160290
.IP \(bu 2.3
161291
.\}
292+
flush\-table\-statistics
293+
.sp
294+
Flush table statistics\&.
295+
.RE
296+
.sp
297+
.RS 4
298+
.ie n \{\
299+
\h'-04'\(bu\h'+03'\c
300+
.\}
301+
.el \{\
302+
.sp -1
303+
.IP \(bu 2.3
304+
.\}
162305
flush\-tables
163306
.sp
164307
Flush all tables\&.
@@ -185,6 +328,19 @@ Flush the thread cache\&.
185328
.sp -1
186329
.IP \(bu 2.3
187330
.\}
331+
flush\-user\-resources
332+
.sp
333+
Flush user resources\&.
334+
.RE
335+
.sp
336+
.RS 4
337+
.ie n \{\
338+
\h'-04'\(bu\h'+03'\c
339+
.\}
340+
.el \{\
341+
.sp -1
342+
.IP \(bu 2.3
343+
.\}
188344
kill \fIid\fR,\fIid\fR,\&.\&.\&.
189345
.sp
190346
Kill server threads\&. If multiple thread ID values are given, there must be no spaces in the list\&.
@@ -344,6 +500,19 @@ Stop the server\&.
344500
.sp -1
345501
.IP \(bu 2.3
346502
.\}
503+
start\-all\-slaves
504+
.sp
505+
Start all slaves\&.
506+
.RE
507+
.sp
508+
.RS 4
509+
.ie n \{\
510+
\h'-04'\(bu\h'+03'\c
511+
.\}
512+
.el \{\
513+
.sp -1
514+
.IP \(bu 2.3
515+
.\}
347516
start\-slave
348517
.sp
349518
Start replication on a slave server\&.
@@ -370,6 +539,19 @@ Display a short server status message\&.
370539
.sp -1
371540
.IP \(bu 2.3
372541
.\}
542+
stop\-all\-slaves
543+
.sp
544+
Stop all slaves\&.
545+
.RE
546+
.sp
547+
.RS 4
548+
.ie n \{\
549+
\h'-04'\(bu\h'+03'\c
550+
.\}
551+
.el \{\
552+
.sp -1
553+
.IP \(bu 2.3
554+
.\}
373555
stop\-slave
374556
.sp
375557
Stop replication on a slave server\&.
@@ -821,7 +1003,7 @@ Connect to the MariaDB server on the given host\&.
8211003
\fB\-\-local\fR,
8221004
\fB\-l\fR
8231005
.sp
824-
Suppress the SQL command(s) from being written to the binary log by enabling sql_log_bin=0 for the session\&.
1006+
Suppress the SQL command(s) from being written to the binary log by using FLUSH LOCAL or enabling sql_log_bin=0 for the session\&.
8251007
.RE
8261008
.sp
8271009
.RS 4

‎mysql-test/include/truncate_file.inc

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
# truncate a giving file, all contents of the file are be cleared
22

3-
if (!$file)
3+
if (!$TRUNCATE_FILE)
44
{
5-
--echo Please assign a file name to $file!!
6-
exit;
5+
die TRUNCATE_FILE is not set;
76
}
87

9-
let TRUNCATE_FILE= $file;
10-
118
perl;
12-
use Env;
13-
Env::import('TRUNCATE_FILE');
14-
open FILE, '>', $TRUNCATE_FILE || die "Can not open file $file";
9+
open FILE, '>', $ENV{TRUNCATE_FILE} or die "open(>$ENV{TRUNCATE_FILE}): $!";
1510
close FILE;
1611
EOF

‎mysql-test/r/ps.result

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4345,6 +4345,24 @@ set join_cache_level=@join_cache_level_save;
43454345
deallocate prepare stmt;
43464346
drop view v1,v2,v3;
43474347
drop table t1,t2,t3;
4348+
#
4349+
# MDEV-10657: incorrect result returned with binary protocol
4350+
# (prepared statements)
4351+
#
4352+
create table t1 (code varchar(10) primary key);
4353+
INSERT INTO t1(code) VALUES ('LINE1'), ('LINE2'), ('LINE3');
4354+
SELECT X.*
4355+
FROM
4356+
(SELECT CODE, RN
4357+
FROM
4358+
(SELECT A.CODE, @cnt := @cnt + 1 AS RN
4359+
FROM t1 A, (SELECT @cnt := 0) C) T
4360+
) X;
4361+
CODE RN
4362+
LINE1 1
4363+
LINE2 2
4364+
LINE3 3
4365+
drop table t1;
43484366
# End of 5.5 tests
43494367
#
43504368
# Start of 10.2 tests

0 commit comments

Comments
 (0)