Skip to content

Commit 7c7ac6d

Browse files
dr-mdr-m
committed
Merge 10.6 into 10.7
2 parents b73c70c + 789f55c commit 7c7ac6d

File tree

1,191 files changed

+30926
-30105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,191 files changed

+30926
-30105
lines changed

‎cmake/build_configurations/mysql_release.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ ELSEIF(RPM)
107107
SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
108108
SET(WITH_PCRE system CACHE STRING "")
109109
SET(CLIENT_PLUGIN_ZSTD OFF)
110-
IF(RPM MATCHES "fedora|centos|rhel")
110+
IF(RPM MATCHES "fedora|centos|rhel|rocky|alma")
111111
SET(WITH_ROCKSDB_BZip2 OFF CACHE STRING "")
112112
ENDIF()
113-
IF(RPM MATCHES "opensuse|sles|centos|rhel")
113+
IF(RPM MATCHES "opensuse|sles|centos|rhel|rocky|alma")
114114
SET(WITH_ROCKSDB_LZ4 OFF CACHE STRING "")
115115
ENDIF()
116116
ELSEIF(DEB)

‎extra/mariabackup/changed_page_bitmap.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ log_online_open_bitmap_file_read_only(
455455
bitmap_file->size = os_file_get_size(bitmap_file->file);
456456
bitmap_file->offset = 0;
457457

458-
#ifdef UNIV_LINUX
458+
#ifdef __linux__
459459
posix_fadvise(bitmap_file->file, 0, 0, POSIX_FADV_SEQUENTIAL);
460460
posix_fadvise(bitmap_file->file, 0, 0, POSIX_FADV_NOREUSE);
461461
#endif

‎extra/mariabackup/xtrabackup.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2424,7 +2424,8 @@ xb_read_delta_metadata(const char *filepath, xb_delta_info_t *info)
24242424
msg("page_size is required in %s", filepath);
24252425
r = FALSE;
24262426
} else {
2427-
info->page_size = zip_size ? zip_size : page_size;
2427+
info->page_size = page_size;
2428+
info->zip_size = zip_size;
24282429
}
24292430

24302431
if (info->space_id == UINT32_MAX) {

‎include/my_global.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,10 +1053,12 @@ typedef ulong myf; /* Type of MyFlags in my_funcs */
10531053
static inline char *dlerror(void)
10541054
{
10551055
static char win_errormsg[2048];
1056-
FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM
1057-
| FORMAT_MESSAGE_IGNORE_INSERTS
1058-
| FORMAT_MESSAGE_MAX_WIDTH_MASK,
1059-
0, GetLastError(), 0, win_errormsg, 2048, NULL);
1056+
FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
1057+
FORMAT_MESSAGE_IGNORE_INSERTS |
1058+
FORMAT_MESSAGE_MAX_WIDTH_MASK,
1059+
0, GetLastError(),
1060+
MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
1061+
win_errormsg, 2048, NULL);
10601062
return win_errormsg;
10611063
}
10621064
#define HAVE_DLOPEN 1

‎mysql-test/main/alias.result

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -257,15 +257,15 @@ Table Create Table
257257
t1 CREATE TABLE `t1` (
258258
`x'FF32'` varbinary(2) NOT NULL,
259259
`CONCAT(x'FF32')` varbinary(2) DEFAULT NULL
260-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
260+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
261261
DROP TABLE t1;
262262
CALL test_inject(x'FF32');
263263
�2 CONCAT('�2')
264264
Table Create Table
265265
t1 CREATE TABLE `t1` (
266266
`�2` varchar(2) NOT NULL,
267267
`CONCAT('�2')` varchar(2) DEFAULT NULL
268-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
268+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
269269
SELECT x'32FF', CONCAT(x'32FF') LIMIT 0;
270270
x'32FF' CONCAT(x'32FF')
271271
CREATE TABLE t1 AS SELECT x'32FF', CONCAT(x'32FF');
@@ -274,15 +274,15 @@ Table Create Table
274274
t1 CREATE TABLE `t1` (
275275
`x'32FF'` varbinary(2) NOT NULL,
276276
`CONCAT(x'32FF')` varbinary(2) DEFAULT NULL
277-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
277+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
278278
DROP TABLE t1;
279279
CALL test_inject(x'32FF');
280280
2� CONCAT('2�')
281281
Table Create Table
282282
t1 CREATE TABLE `t1` (
283283
`2�` varchar(2) NOT NULL,
284284
`CONCAT('2�')` varchar(2) DEFAULT NULL
285-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
285+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
286286
SELECT x'0032', CONCAT(x'0032') LIMIT 0;
287287
x'0032' CONCAT(x'0032')
288288
CREATE TABLE t1 AS SELECT x'0032', CONCAT(x'0032');
@@ -291,15 +291,15 @@ Table Create Table
291291
t1 CREATE TABLE `t1` (
292292
`x'0032'` varbinary(2) NOT NULL,
293293
`CONCAT(x'0032')` varbinary(2) DEFAULT NULL
294-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
294+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
295295
DROP TABLE t1;
296296
CALL test_inject(x'0032');
297297
2 CONCAT('\x002')
298298
Table Create Table
299299
t1 CREATE TABLE `t1` (
300300
`2` varchar(2) NOT NULL,
301301
`CONCAT('\x002')` varchar(2) DEFAULT NULL
302-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
302+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
303303
SELECT x'3200', CONCAT(x'3200') LIMIT 0;
304304
x'3200' CONCAT(x'3200')
305305
CREATE TABLE t1 AS SELECT x'3200', CONCAT(x'3200');
@@ -308,15 +308,15 @@ Table Create Table
308308
t1 CREATE TABLE `t1` (
309309
`x'3200'` varbinary(2) NOT NULL,
310310
`CONCAT(x'3200')` varbinary(2) DEFAULT NULL
311-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
311+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
312312
DROP TABLE t1;
313313
CALL test_inject(x'3200');
314314
2\x00 CONCAT('2\x00')
315315
Table Create Table
316316
t1 CREATE TABLE `t1` (
317317
`2\x00` varchar(2) NOT NULL,
318318
`CONCAT('2\x00')` varchar(2) DEFAULT NULL
319-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
319+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
320320
SELECT '0\a', CONCAT('0\a') LIMIT 0;
321321
0a CONCAT('0\a')
322322
CREATE TABLE t1 AS SELECT '0\a', CONCAT('0\a');
@@ -325,15 +325,15 @@ Table Create Table
325325
t1 CREATE TABLE `t1` (
326326
`0a` varchar(2) NOT NULL,
327327
`CONCAT('0\a')` varchar(2) DEFAULT NULL
328-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
328+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
329329
DROP TABLE t1;
330330
CALL test_inject('0\a');
331331
0a CONCAT('0a')
332332
Table Create Table
333333
t1 CREATE TABLE `t1` (
334334
`0a` varchar(2) NOT NULL,
335335
`CONCAT('0a')` varchar(2) DEFAULT NULL
336-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
336+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
337337
SELECT 'a\0', CONCAT('a\0') LIMIT 0;
338338
a\x00 CONCAT('a\0')
339339
CREATE TABLE t1 AS SELECT 'a\0', CONCAT('a\0');
@@ -342,15 +342,15 @@ Table Create Table
342342
t1 CREATE TABLE `t1` (
343343
`a\x00` varchar(2) NOT NULL,
344344
`CONCAT('a\0')` varchar(2) DEFAULT NULL
345-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
345+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
346346
DROP TABLE t1;
347347
CALL test_inject('a\0');
348348
a\x00 CONCAT('a\x00')
349349
Table Create Table
350350
t1 CREATE TABLE `t1` (
351351
`a\x00` varchar(2) NOT NULL,
352352
`CONCAT('a\x00')` varchar(2) DEFAULT NULL
353-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
353+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
354354
SELECT 'a\0b', CONCAT('a\0b') LIMIT 0;
355355
a\x00b CONCAT('a\0b')
356356
CREATE TABLE t1 AS SELECT 'a\0b', CONCAT('a\0b');
@@ -359,15 +359,15 @@ Table Create Table
359359
t1 CREATE TABLE `t1` (
360360
`a\x00b` varchar(3) NOT NULL,
361361
`CONCAT('a\0b')` varchar(3) DEFAULT NULL
362-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
362+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
363363
DROP TABLE t1;
364364
CALL test_inject('a\0b');
365365
a\x00b CONCAT('a\x00b')
366366
Table Create Table
367367
t1 CREATE TABLE `t1` (
368368
`a\x00b` varchar(3) NOT NULL,
369369
`CONCAT('a\x00b')` varchar(3) DEFAULT NULL
370-
) ENGINE=MyISAM DEFAULT CHARSET=latin1
370+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
371371
DROP PROCEDURE test_inject;
372372
#
373373
# MDEV-23519

0 commit comments

Comments
 (0)