Skip to content

Commit 55b3dce

Browse files
dr-mdr-m
committed
Merge 11.8 into 12.3
2 parents 669e7aa + 1a144f7 commit 55b3dce

File tree

133 files changed

+2805
-1478
lines changed

Some content is hidden

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

133 files changed

+2805
-1478
lines changed

‎client/mysqldump.cc‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2817,7 +2817,7 @@ static uint dump_events_for_db(char *db)
28172817
C_STRING_WITH_LEN(" EVENT"));
28182818

28192819
fprintf(sql_file,
2820-
"/*!50106 %s */ %s\n",
2820+
"/*!50106 %s \n*/ %s\n",
28212821
(const char *) (query_str != NULL ? query_str : row[3]),
28222822
(const char *) delimiter);
28232823

@@ -3043,7 +3043,8 @@ static uint dump_routines_for_db(char *db)
30433043

30443044
fprintf(sql_file,
30453045
"DELIMITER ;;\n"
3046-
"%s ;;\n"
3046+
"%s\n"
3047+
";;\n"
30473048
"DELIMITER ;\n",
30483049
(const char *) row[2]);
30493050

@@ -3420,13 +3421,13 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
34203421
The actual column value doesn't matter anyway, since the view will
34213422
be dropped at run time.
34223423
*/
3423-
fprintf(sql_file, " 1 AS %s",
3424+
fprintf(sql_file, " NULL AS %s",
34243425
quote_name(row[0], name_buff, 0));
34253426

34263427
while((row= mysql_fetch_row(result)))
34273428
{
34283429
/* col name, col type */
3429-
fprintf(sql_file, ",\n 1 AS %s",
3430+
fprintf(sql_file, ",\n NULL AS %s",
34303431
quote_name(row[0], name_buff, 0));
34313432
}
34323433

@@ -3981,7 +3982,7 @@ static int dump_trigger(FILE *sql_file, MYSQL_RES *show_create_trigger_rs,
39813982
C_STRING_WITH_LEN(" TRIGGER"));
39823983
fprintf(sql_file,
39833984
"DELIMITER ;;\n"
3984-
"/*!50003 %s */;;\n"
3985+
"/*!50003 %s \n*/;;\n"
39853986
"DELIMITER ;\n",
39863987
(const char *) (query_str != NULL ? query_str : row[2]));
39873988

‎client/mysqltest.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6286,7 +6286,7 @@ void func_abs(Expression_value args[], int count, Expression_value *result)
62866286
if (!args[0].is_numeric)
62876287
die("abs() requires numeric argument");
62886288

6289-
result->set_int(abs(args[0].to_int()));
6289+
result->set_int(llabs(args[0].to_int()));
62906290
}
62916291

62926292

‎debian/mariadb-server.links‎

100644100755
File mode changed.

‎extra/mariabackup/ds_local.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,9 @@ local_close(ds_file_t *file)
281281
ret = set_eof(fd);
282282
}
283283

284-
my_close(fd, MYF(MY_WME));
284+
if (my_close(fd, MYF(MY_WME)) != 0)
285+
ret= 1;
286+
285287
my_free(file);
286288
return ret;
287289
}

‎mysql-test/main/analyze_format_json.result‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,3 +1889,74 @@ ANALYZE
18891889
}
18901890
}
18911891
drop table t1, t2;
1892+
#
1893+
# MDEV#37904: Valgrind warning - uninitialized value in tag_to_json()
1894+
#
1895+
CREATE TABLE t1 (a VARCHAR(8)) DEFAULT CHARSET latin7;
1896+
INSERT INTO t1 VALUES ('x'),('xx');
1897+
CREATE TABLE t2 (b varchar(8)) DEFAULT CHARSET latin7;
1898+
INSERT INTO t2 VALUES ('foo'),('bar');
1899+
ANALYZE FORMAT=JSON
1900+
SELECT b FROM t2 WHERE 'x' IN (SELECT a FROM t1);
1901+
ANALYZE
1902+
{
1903+
"query_optimization": {
1904+
"r_total_time_ms": "REPLACED"
1905+
},
1906+
"query_block": {
1907+
"select_id": 1,
1908+
"cost": "REPLACED",
1909+
"r_loops": 1,
1910+
"r_total_time_ms": "REPLACED",
1911+
"nested_loop": [
1912+
{
1913+
"table": {
1914+
"table_name": "t1",
1915+
"access_type": "ALL",
1916+
"loops": 1,
1917+
"r_loops": 1,
1918+
"rows": 2,
1919+
"r_rows": 1,
1920+
"cost": "REPLACED",
1921+
"r_table_time_ms": "REPLACED",
1922+
"r_other_time_ms": "REPLACED",
1923+
"r_engine_stats": REPLACED,
1924+
"filtered": 50,
1925+
"r_total_filtered": 100,
1926+
"attached_condition": "t1.a = 'x'",
1927+
"r_filtered": 100,
1928+
"first_match": ""
1929+
}
1930+
},
1931+
{
1932+
"block-nl-join": {
1933+
"table": {
1934+
"table_name": "t2",
1935+
"access_type": "ALL",
1936+
"loops": 1,
1937+
"r_loops": 1,
1938+
"rows": 2,
1939+
"r_rows": 2,
1940+
"cost": "REPLACED",
1941+
"r_table_time_ms": "REPLACED",
1942+
"r_other_time_ms": "REPLACED",
1943+
"r_engine_stats": REPLACED,
1944+
"filtered": 100,
1945+
"r_total_filtered": 100,
1946+
"r_filtered": 100
1947+
},
1948+
"buffer_type": "flat",
1949+
"buffer_size": "120",
1950+
"join_type": "BNL",
1951+
"r_loops": 1,
1952+
"r_filtered": 100,
1953+
"r_unpack_time_ms": "REPLACED",
1954+
"r_other_time_ms": "REPLACED",
1955+
"r_effective_rows": 2
1956+
}
1957+
}
1958+
]
1959+
}
1960+
}
1961+
DROP TABLE t1, t2;
1962+
End of 10.11 tests

‎mysql-test/main/analyze_format_json.test‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,3 +369,19 @@ delete from t1
369369
where t1.pk > (select max(a) from t2 where t2.pk+1 = t1.pk+1 ) - 10;
370370

371371
drop table t1, t2;
372+
373+
--echo #
374+
--echo # MDEV#37904: Valgrind warning - uninitialized value in tag_to_json()
375+
--echo #
376+
377+
CREATE TABLE t1 (a VARCHAR(8)) DEFAULT CHARSET latin7;
378+
INSERT INTO t1 VALUES ('x'),('xx');
379+
CREATE TABLE t2 (b varchar(8)) DEFAULT CHARSET latin7;
380+
INSERT INTO t2 VALUES ('foo'),('bar');
381+
--source include/analyze-format.inc
382+
ANALYZE FORMAT=JSON
383+
SELECT b FROM t2 WHERE 'x' IN (SELECT a FROM t1);
384+
385+
DROP TABLE t1, t2;
386+
387+
--echo End of 10.11 tests

‎mysql-test/main/ddl_i18n_koi8r.result‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,8 @@ COLLATION(_utf8 'текст') AS c6,
751751
@@character_set_client AS c8;
752752
SET �����1 = 'a';
753753
SET �����2 = 'b';
754-
END ;;
754+
END
755+
;;
755756
DELIMITER ;
756757
/*!50003 SET sql_mode = @saved_sql_mode */ ;
757758
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -785,7 +786,8 @@ COLLATION(_utf8 'текст') AS c6,
785786
@@character_set_client AS c8;
786787
SET �����1 = 'a';
787788
SET �����2 = 'b';
788-
END ;;
789+
END
790+
;;
789791
DELIMITER ;
790792
/*!50003 SET sql_mode = @saved_sql_mode */ ;
791793
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -828,7 +830,8 @@ COLLATION(_utf8 'текст') AS c6,
828830
@@character_set_client AS c8;
829831
SET �����1 = 'a';
830832
SET �����2 = 'b';
831-
END ;;
833+
END
834+
;;
832835
DELIMITER ;
833836
/*!50003 SET sql_mode = @saved_sql_mode */ ;
834837
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -862,7 +865,8 @@ COLLATION(_utf8 'текст') AS c6,
862865
@@character_set_client AS c8;
863866
SET �����1 = 'a';
864867
SET �����2 = 'b';
865-
END ;;
868+
END
869+
;;
866870
DELIMITER ;
867871
/*!50003 SET sql_mode = @saved_sql_mode */ ;
868872
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1768,7 +1772,8 @@ INSERT INTO log VALUES(@@character_set_client);
17681772
SET @a1 = '�����';
17691773
SET @a1 = _koi8r '�����';
17701774
SET @a2 = _utf8 'текст';
1771-
END */;;
1775+
END
1776+
*/;;
17721777
DELIMITER ;
17731778
/*!50003 SET sql_mode = @saved_sql_mode */ ;
17741779
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1797,7 +1802,8 @@ INSERT INTO log VALUES(@@character_set_client);
17971802
SET @b1 = '�����';
17981803
SET @b1 = _koi8r '�����';
17991804
SET @b2 = _utf8 'текст';
1800-
END */;;
1805+
END
1806+
*/;;
18011807
DELIMITER ;
18021808
/*!50003 SET sql_mode = @saved_sql_mode */ ;
18031809
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1851,7 +1857,8 @@ INSERT INTO log VALUES(@@character_set_client);
18511857
SET @a1 = '�����';
18521858
SET @a1 = _koi8r '�����';
18531859
SET @a2 = _utf8 'текст';
1854-
END */;;
1860+
END
1861+
*/;;
18551862
DELIMITER ;
18561863
/*!50003 SET sql_mode = @saved_sql_mode */ ;
18571864
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1880,7 +1887,8 @@ INSERT INTO log VALUES(@@character_set_client);
18801887
SET @b1 = '�����';
18811888
SET @b1 = _koi8r '�����';
18821889
SET @b2 = _utf8 'текст';
1883-
END */;;
1890+
END
1891+
*/;;
18841892
DELIMITER ;
18851893
/*!50003 SET sql_mode = @saved_sql_mode */ ;
18861894
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -2522,7 +2530,8 @@ COLLATION(_koi8r '
25222530
COLLATION(_utf8 'текст') AS c4,
25232531
@@collation_connection AS c5,
25242532
@@character_set_client AS c6;
2525-
END */ ;;
2533+
END
2534+
*/ ;;
25262535
/*!50003 SET time_zone = @saved_time_zone */ ;;
25272536
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
25282537
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -2550,7 +2559,8 @@ COLLATION(_koi8r '
25502559
COLLATION(_utf8 'текст') AS c4,
25512560
@@collation_connection AS c5,
25522561
@@character_set_client AS c6;
2553-
END */ ;;
2562+
END
2563+
*/ ;;
25542564
/*!50003 SET time_zone = @saved_time_zone */ ;;
25552565
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
25562566
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -2590,7 +2600,8 @@ COLLATION(_koi8r '
25902600
COLLATION(_utf8 'текст') AS c4,
25912601
@@collation_connection AS c5,
25922602
@@character_set_client AS c6;
2593-
END */ ;;
2603+
END
2604+
*/ ;;
25942605
/*!50003 SET time_zone = @saved_time_zone */ ;;
25952606
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
25962607
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -2618,7 +2629,8 @@ COLLATION(_koi8r '
26182629
COLLATION(_utf8 'текст') AS c4,
26192630
@@collation_connection AS c5,
26202631
@@character_set_client AS c6;
2621-
END */ ;;
2632+
END
2633+
*/ ;;
26222634
/*!50003 SET time_zone = @saved_time_zone */ ;;
26232635
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
26242636
/*!50003 SET character_set_client = @saved_cs_client */ ;;

‎mysql-test/main/ddl_i18n_utf8.result‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,8 @@ COLLATION(_koi8r '
751751
@@character_set_client AS c8;
752752
SET парам1 = 'a';
753753
SET парам2 = 'b';
754-
END ;;
754+
END
755+
;;
755756
DELIMITER ;
756757
/*!50003 SET sql_mode = @saved_sql_mode */ ;
757758
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -785,7 +786,8 @@ COLLATION(_koi8r '
785786
@@character_set_client AS c8;
786787
SET парам1 = 'a';
787788
SET парам2 = 'b';
788-
END ;;
789+
END
790+
;;
789791
DELIMITER ;
790792
/*!50003 SET sql_mode = @saved_sql_mode */ ;
791793
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -828,7 +830,8 @@ COLLATION(_koi8r '
828830
@@character_set_client AS c8;
829831
SET парам1 = 'a';
830832
SET парам2 = 'b';
831-
END ;;
833+
END
834+
;;
832835
DELIMITER ;
833836
/*!50003 SET sql_mode = @saved_sql_mode */ ;
834837
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -862,7 +865,8 @@ COLLATION(_koi8r '
862865
@@character_set_client AS c8;
863866
SET парам1 = 'a';
864867
SET парам2 = 'b';
865-
END ;;
868+
END
869+
;;
866870
DELIMITER ;
867871
/*!50003 SET sql_mode = @saved_sql_mode */ ;
868872
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1768,7 +1772,8 @@ INSERT INTO log VALUES(@@character_set_client);
17681772
SET @a1 = 'текст';
17691773
SET @a2 = _utf8 'текст';
17701774
SET @a3 = _koi8r '�����';
1771-
END */;;
1775+
END
1776+
*/;;
17721777
DELIMITER ;
17731778
/*!50003 SET sql_mode = @saved_sql_mode */ ;
17741779
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1797,7 +1802,8 @@ INSERT INTO log VALUES(@@character_set_client);
17971802
SET @b1 = 'текст';
17981803
SET @b2 = _utf8 'текст';
17991804
SET @b3 = _koi8r '�����';
1800-
END */;;
1805+
END
1806+
*/;;
18011807
DELIMITER ;
18021808
/*!50003 SET sql_mode = @saved_sql_mode */ ;
18031809
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1851,7 +1857,8 @@ INSERT INTO log VALUES(@@character_set_client);
18511857
SET @a1 = 'текст';
18521858
SET @a2 = _utf8 'текст';
18531859
SET @a3 = _koi8r '�����';
1854-
END */;;
1860+
END
1861+
*/;;
18551862
DELIMITER ;
18561863
/*!50003 SET sql_mode = @saved_sql_mode */ ;
18571864
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1880,7 +1887,8 @@ INSERT INTO log VALUES(@@character_set_client);
18801887
SET @b1 = 'текст';
18811888
SET @b2 = _utf8 'текст';
18821889
SET @b3 = _koi8r '�����';
1883-
END */;;
1890+
END
1891+
*/;;
18841892
DELIMITER ;
18851893
/*!50003 SET sql_mode = @saved_sql_mode */ ;
18861894
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -2522,7 +2530,8 @@ COLLATION(_utf8 'текст') AS c3,
25222530
COLLATION(_koi8r '�����') AS c4,
25232531
@@collation_connection AS c5,
25242532
@@character_set_client AS c6;
2525-
END */ ;;
2533+
END
2534+
*/ ;;
25262535
/*!50003 SET time_zone = @saved_time_zone */ ;;
25272536
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
25282537
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -2550,7 +2559,8 @@ COLLATION(_utf8 'текст') AS c3,
25502559
COLLATION(_koi8r '�����') AS c4,
25512560
@@collation_connection AS c5,
25522561
@@character_set_client AS c6;
2553-
END */ ;;
2562+
END
2563+
*/ ;;
25542564
/*!50003 SET time_zone = @saved_time_zone */ ;;
25552565
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
25562566
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -2590,7 +2600,8 @@ COLLATION(_utf8 'текст') AS c3,
25902600
COLLATION(_koi8r '�����') AS c4,
25912601
@@collation_connection AS c5,
25922602
@@character_set_client AS c6;
2593-
END */ ;;
2603+
END
2604+
*/ ;;
25942605
/*!50003 SET time_zone = @saved_time_zone */ ;;
25952606
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
25962607
/*!50003 SET character_set_client = @saved_cs_client */ ;;
@@ -2618,7 +2629,8 @@ COLLATION(_utf8 'текст') AS c3,
26182629
COLLATION(_koi8r '�����') AS c4,
26192630
@@collation_connection AS c5,
26202631
@@character_set_client AS c6;
2621-
END */ ;;
2632+
END
2633+
*/ ;;
26222634
/*!50003 SET time_zone = @saved_time_zone */ ;;
26232635
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
26242636
/*!50003 SET character_set_client = @saved_cs_client */ ;;

0 commit comments

Comments
 (0)
⚡