Skip to content

Commit a629d3b

Browse files
vuvovavuvova
committed
Merge branch '10.9' into 10.10
2 parents dcb780d + 1529211 commit a629d3b

16 files changed

+163
-79
lines changed

‎debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ Description: CrackLib Password Validation Plugin for MariaDB
970970
Package: mariadb-plugin-hashicorp-key-management
971971
Architecture: any
972972
Depends: libcurl4,
973-
mariadb-server (= ${server:Version}),
973+
mariadb-server,
974974
${misc:Depends},
975975
${shlibs:Depends}
976976
Description: Hashicorp Key Management plugin for MariaDB

‎debian/not-installed

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ usr/bin/mariadb-embedded # Shipping the embedded server in distro packaging does
1515
usr/bin/mysql_config # Debian packaging has mysql_config as symlink to mariadb_config
1616
usr/bin/mysql_embedded # Symlink to mariadb-embeded which is intentionally not included
1717
usr/bin/sst_dump # Use the one from rocksdb-tools package
18+
usr/lib/aarch64-linux-gnu/libdbbc.a # ColumnStore header file
19+
usr/lib/aarch64-linux-gnu/libidbboot.a # ColumnStore header file
20+
usr/lib/aarch64-linux-gnu/libprocessor.a # ColumnStore header file
21+
usr/lib/aarch64-linux-gnu/libwe_xml.a # ColumnStore header file
1822
usr/lib/x86_64-linux-gnu/libdbbc.a # ColumnStore header file
1923
usr/lib/x86_64-linux-gnu/libidbboot.a # ColumnStore header file
2024
usr/lib/x86_64-linux-gnu/libprocessor.a # ColumnStore header file

‎mysql-test/suite/sys_vars/r/character_set_client_basic.result

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,9 @@ SET @@character_set_client = 1;
383383
SELECT @@character_set_client;
384384
@@character_set_client
385385
big5
386+
# latin2_czech_cs is not a default collation
386387
SET @@character_set_client = 2;
387-
SELECT @@character_set_client;
388-
@@character_set_client
389-
latin2
388+
ERROR 42000: Unknown character set: '2'
390389
SET @@character_set_client = 3;
391390
SELECT @@character_set_client;
392391
@@character_set_client
@@ -395,20 +394,19 @@ SET @@character_set_client = 36;
395394
SELECT @@character_set_client;
396395
@@character_set_client
397396
cp866
397+
# cp1250_polish_ci is not a default collation
398398
SET @@character_set_client = 99;
399-
SELECT @@character_set_client;
400-
@@character_set_client
401-
cp1250
399+
ERROR 42000: Unknown character set: '99'
400+
# Collation ID 100 does not exist
402401
SET @@character_set_client = 100;
403402
ERROR 42000: Unknown character set: '100'
404403
SET @@global.character_set_client = 1;
405404
SELECT @@global.character_set_client;
406405
@@global.character_set_client
407406
big5
407+
# latin2_czech_cs is not a default collation
408408
SET @@global.character_set_client = 2;
409-
SELECT @@global.character_set_client;
410-
@@global.character_set_client
411-
latin2
409+
ERROR 42000: Unknown character set: '2'
412410
SET @@global.character_set_client = 3;
413411
SELECT @@global.character_set_client;
414412
@@global.character_set_client
@@ -417,10 +415,10 @@ SET @@global.character_set_client = 36;
417415
SELECT @@global.character_set_client;
418416
@@global.character_set_client
419417
cp866
418+
# cp1250_polish_ci is not a default collation
420419
SET @@global.character_set_client = 99;
421-
SELECT @@global.character_set_client;
422-
@@global.character_set_client
423-
cp1250
420+
ERROR 42000: Unknown character set: '99'
421+
# Collation ID 100 does not exist
424422
SET @@global.character_set_client = 100;
425423
ERROR 42000: Unknown character set: '100'
426424
SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
@@ -497,5 +495,10 @@ SELECT @@session.character_set_client =
497495
WHERE VARIABLE_NAME='character_set_client') AS res;
498496
res
499497
1
498+
#
499+
# MDEV-28769 Assertion `(m_ci->state & 32) || m_with_collate' failed in Lex_exact_charset_opt_extended_collate::Lex_exact_charset_opt_extended_collate on SET NAMES
500+
#
501+
SET GLOBAL character_set_client=2;
502+
ERROR 42000: Unknown character set: '2'
500503
SET @@global.character_set_client = @global_start_value;
501504
SET @@session.character_set_client = @session_start_value;

‎mysql-test/suite/sys_vars/r/character_set_connection_basic.result

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -378,10 +378,9 @@ SET @@character_set_connection = 1;
378378
SELECT @@character_set_connection;
379379
@@character_set_connection
380380
big5
381+
# latin2_czech_cs is not a default collation
381382
SET @@character_set_connection = 2;
382-
SELECT @@character_set_connection;
383-
@@character_set_connection
384-
latin2
383+
ERROR 42000: Unknown character set: '2'
385384
SET @@character_set_connection = 3;
386385
SELECT @@character_set_connection;
387386
@@character_set_connection
@@ -390,20 +389,19 @@ SET @@character_set_connection = 36;
390389
SELECT @@character_set_connection;
391390
@@character_set_connection
392391
cp866
392+
# cp1250_polish_ci is not a default collation
393393
SET @@character_set_connection = 99;
394-
SELECT @@character_set_connection;
395-
@@character_set_connection
396-
cp1250
394+
ERROR 42000: Unknown character set: '99'
395+
# Collation ID 100 does not exist
397396
SET @@character_set_connection = 100;
398397
ERROR 42000: Unknown character set: '100'
399398
SET @@global.character_set_connection = 1;
400399
SELECT @@global.character_set_connection;
401400
@@global.character_set_connection
402401
big5
402+
# latin2_czech_cs is not a default collation
403403
SET @@global.character_set_connection = 2;
404-
SELECT @@global.character_set_connection;
405-
@@global.character_set_connection
406-
latin2
404+
ERROR 42000: Unknown character set: '2'
407405
SET @@global.character_set_connection = 3;
408406
SELECT @@global.character_set_connection;
409407
@@global.character_set_connection
@@ -412,10 +410,10 @@ SET @@global.character_set_connection = 36;
412410
SELECT @@global.character_set_connection;
413411
@@global.character_set_connection
414412
cp866
413+
# cp1250_polish_ci is not a default collation
415414
SET @@global.character_set_connection = 99;
416-
SELECT @@global.character_set_connection;
417-
@@global.character_set_connection
418-
cp1250
415+
ERROR 42000: Unknown character set: '99'
416+
# Collation ID 100 does not exist
419417
SET @@global.character_set_connection = 100;
420418
ERROR 42000: Unknown character set: '100'
421419
SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
@@ -435,8 +433,12 @@ SET @@character_set_connection = -1;
435433
ERROR 42000: Unknown character set: '-1'
436434
SET @@character_set_connection = 'utf8 ';
437435
ERROR 42000: Unknown character set: 'utf8 '
436+
SET @@character_set_connection=cp1250;
438437
SET @@character_set_connection = 'l�tin2';
439438
ERROR 42000: Unknown character set: 'l�tin2'
439+
SET @@character_set_connection=cp866;
440+
SET @@character_set_connection = 'l�tin2';
441+
ERROR 42000: Unknown character set: 'l?tin2'
440442
SET @@character_set_connection = true;
441443
SELECT @@character_set_connection AS res_with_true;
442444
res_with_true

‎mysql-test/suite/sys_vars/r/character_set_database_basic.result

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,9 @@ SET @@character_set_database = 1;
380380
SELECT @@character_set_database;
381381
@@character_set_database
382382
big5
383+
# latin2_czech_cs is not a default collation
383384
SET @@character_set_database = 2;
384-
SELECT @@character_set_database;
385-
@@character_set_database
386-
latin2
385+
ERROR 42000: Unknown character set: '2'
387386
SET @@character_set_database = 3;
388387
SELECT @@character_set_database;
389388
@@character_set_database
@@ -392,20 +391,19 @@ SET @@character_set_database = 36;
392391
SELECT @@character_set_database;
393392
@@character_set_database
394393
cp866
394+
# cp1250_polish_ci is not a default collation
395395
SET @@character_set_database = 99;
396-
SELECT @@character_set_database;
397-
@@character_set_database
398-
cp1250
396+
ERROR 42000: Unknown character set: '99'
397+
# Collation ID 100 does not exist
399398
SET @@character_set_database = 100;
400399
ERROR 42000: Unknown character set: '100'
401400
SET @@global.character_set_database = 1;
402401
SELECT @@global.character_set_database;
403402
@@global.character_set_database
404403
big5
404+
# latin2_czech_cs is not a default collation
405405
SET @@global.character_set_database = 2;
406-
SELECT @@global.character_set_database;
407-
@@global.character_set_database
408-
latin2
406+
ERROR 42000: Unknown character set: '2'
409407
SET @@global.character_set_database = 3;
410408
SELECT @@global.character_set_database;
411409
@@global.character_set_database
@@ -414,10 +412,10 @@ SET @@global.character_set_database = 36;
414412
SELECT @@global.character_set_database;
415413
@@global.character_set_database
416414
cp866
415+
# cp1250_polish_ci is not a default collation
417416
SET @@global.character_set_database = 99;
418-
SELECT @@global.character_set_database;
419-
@@global.character_set_database
420-
cp1250
417+
ERROR 42000: Unknown character set: '99'
418+
# Collation ID 100 does not exist
421419
SET @@global.character_set_database = 100;
422420
ERROR 42000: Unknown character set: '100'
423421
SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);

‎mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,9 @@ SET @@character_set_filesystem = 1;
379379
SELECT @@character_set_filesystem;
380380
@@character_set_filesystem
381381
big5
382+
# latin2_czech_cs is not a default collation
382383
SET @@character_set_filesystem = 2;
383-
SELECT @@character_set_filesystem;
384-
@@character_set_filesystem
385-
latin2
384+
ERROR 42000: Unknown character set: '2'
386385
SET @@character_set_filesystem = 3;
387386
SELECT @@character_set_filesystem;
388387
@@character_set_filesystem
@@ -391,10 +390,10 @@ SET @@character_set_filesystem = 36;
391390
SELECT @@character_set_filesystem;
392391
@@character_set_filesystem
393392
cp866
393+
# cp1250_polish_ci is not a default collation
394394
SET @@character_set_filesystem = 99;
395-
SELECT @@character_set_filesystem;
396-
@@character_set_filesystem
397-
cp1250
395+
ERROR 42000: Unknown character set: '99'
396+
# Collation ID 100 does not exist
398397
SET @@character_set_filesystem = 100;
399398
ERROR 42000: Unknown character set: '100'
400399
SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);

‎mysql-test/suite/sys_vars/r/character_set_results_basic.result

132 Bytes
Binary file not shown.

‎mysql-test/suite/sys_vars/r/character_set_server_basic.result

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,9 @@ SET @@character_set_server = 1;
382382
SELECT @@character_set_server;
383383
@@character_set_server
384384
big5
385+
# latin2_czech_cs is not a default collation
385386
SET @@character_set_server = 2;
386-
SELECT @@character_set_server;
387-
@@character_set_server
388-
latin2
387+
ERROR 42000: Unknown character set: '2'
389388
SET @@character_set_server = 3;
390389
SELECT @@character_set_server;
391390
@@character_set_server
@@ -394,28 +393,27 @@ SET @@character_set_server = 36;
394393
SELECT @@character_set_server;
395394
@@character_set_server
396395
cp866
396+
# cp1250_polish_ci is not a default collation
397397
SET @@character_set_server = 99;
398-
SELECT @@character_set_server;
399-
@@character_set_server
400-
cp1250
398+
ERROR 42000: Unknown character set: '99'
399+
# Collation ID 100 does not exist
401400
SET @@character_set_server = 100;
402401
ERROR 42000: Unknown character set: '100'
403402
SET @@global.character_set_server = 1;
404403
SELECT @@global.character_set_server;
405404
@@global.character_set_server
406405
big5
406+
# latin2_czech_cs is not a default collation
407407
SET @@global.character_set_server = 2;
408-
SELECT @@global.character_set_server;
409-
@@global.character_set_server
410-
latin2
408+
ERROR 42000: Unknown character set: '2'
411409
SET @@global.character_set_server = 36;
412410
SELECT @@global.character_set_server;
413411
@@global.character_set_server
414412
cp866
413+
# cp1250_polish_ci is not a default collation
415414
SET @@global.character_set_server = 99;
416-
SELECT @@global.character_set_server;
417-
@@global.character_set_server
418-
cp1250
415+
ERROR 42000: Unknown character set: '99'
416+
# Collation ID 100 does not exist
419417
SET @@global.character_set_server = 100;
420418
ERROR 42000: Unknown character set: '100'
421419
'#--------------------FN_DYNVARS_009_10-------------------------#'

‎mysql-test/suite/sys_vars/t/character_set_client_basic.test

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,33 +229,44 @@ SELECT @@global.character_set_client;
229229
##############################################################
230230
SET @@character_set_client = 1;
231231
SELECT @@character_set_client;
232+
233+
--echo # latin2_czech_cs is not a default collation
234+
--error ER_UNKNOWN_CHARACTER_SET
232235
SET @@character_set_client = 2;
233-
SELECT @@character_set_client;
236+
234237
SET @@character_set_client = 3;
235238
SELECT @@character_set_client;
236239
SET @@character_set_client = 36;
237240
SELECT @@character_set_client;
241+
242+
--echo # cp1250_polish_ci is not a default collation
243+
--error ER_UNKNOWN_CHARACTER_SET
238244
SET @@character_set_client = 99;
239-
SELECT @@character_set_client;
240245

246+
--echo # Collation ID 100 does not exist
241247
--Error ER_UNKNOWN_CHARACTER_SET
242248
SET @@character_set_client = 100;
243249

244250
SET @@global.character_set_client = 1;
245251
SELECT @@global.character_set_client;
252+
253+
--echo # latin2_czech_cs is not a default collation
254+
--error ER_UNKNOWN_CHARACTER_SET
246255
SET @@global.character_set_client = 2;
247-
SELECT @@global.character_set_client;
256+
248257
SET @@global.character_set_client = 3;
249258
SELECT @@global.character_set_client;
250259
SET @@global.character_set_client = 36;
251260
SELECT @@global.character_set_client;
261+
262+
--echo # cp1250_polish_ci is not a default collation
263+
--error ER_UNKNOWN_CHARACTER_SET
252264
SET @@global.character_set_client = 99;
253-
SELECT @@global.character_set_client;
254265

266+
--echo # Collation ID 100 does not exist
255267
--Error ER_UNKNOWN_CHARACTER_SET
256268
SET @@global.character_set_client = 100;
257269

258-
259270
SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
260271
SELECT @total_charset;
261272

@@ -332,6 +343,13 @@ SELECT @@session.character_set_client =
332343
(SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
333344
WHERE VARIABLE_NAME='character_set_client') AS res;
334345

346+
--echo #
347+
--echo # MDEV-28769 Assertion `(m_ci->state & 32) || m_with_collate' failed in Lex_exact_charset_opt_extended_collate::Lex_exact_charset_opt_extended_collate on SET NAMES
348+
--echo #
349+
350+
--error ER_UNKNOWN_CHARACTER_SET
351+
SET GLOBAL character_set_client=2;
352+
335353
####################################
336354
# Restore initial value #
337355
####################################

0 commit comments

Comments
 (0)