database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2024-05-09 13:59:22 +02:00
parent 383ee364dc 887bb3f735
commit a6b2f820e0
346 changed files with 9046 additions and 2264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mysql-test/main/mysql.result
View File

@ -552,6 +552,7 @@ Table Create Table
a1\`b1 CREATE TABLE `a1\``b1` (
`a` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
/*!999999\- enable the sandbox mode */
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `a1\``b1` (
@ -583,6 +584,7 @@ Table Create Table
a1\"b1 CREATE TABLE "a1\""b1" (
"a" int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
/*!999999\- enable the sandbox mode */
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE "a1\""b1" (
@ -607,11 +609,11 @@ set sql_mode=default;
create table t1 (a text);
select count(*) from t1;
count(*)
43
44
truncate table t1;
select count(*) from t1;
count(*)
43
44
truncate table t1;
select count(*) from t1;
count(*)
@ -623,7 +625,7 @@ count(*)
truncate table t1;
select count(*) from t1;
count(*)
43
44
truncate table t1;
select count(*) from t1;
count(*)
@ -637,3 +639,27 @@ drop table t1;
WARNING: option '--enable-cleartext-plugin' is obsolete.
1
1
# End of 10.3 tests
#
# MDEV-21778 Disable system commands in mysql/mariadb client
#
ERROR at line 1: Not allowed in the sandbox mode
1
ERROR at line 1: Not allowed in the sandbox mode
2
ERROR at line 1: Not allowed in the sandbox mode
3
1
entering sandbox
system
tee
source
^^^
2
entering sandbox
system
tee
source
^^^
3
# End of 10.5 tests