database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-01-30 09:46:52 +01:00
parent 12cad0c346 41a163ac5c
commit a576a1cea5
440 changed files with 7883 additions and 3481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
View File

@ -14,7 +14,7 @@
#
--source include/have_innodb.inc
--source include/is_embedded.inc
--source include/is_embedded_no_privileges.inc
let $my_where = WHERE table_schema = 'information_schema'
AND table_name <> 'profiling' AND table_name not like 'innodb_%';

6
mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
View File

@ -10,10 +10,8 @@
# 2008-06-06 mleich Create this this variant for the embedded server.
#
if (`SELECT VERSION() NOT LIKE '%embedded%'`)
{
--skip Test requires: embedded server
}
--source include/is_embedded_no_privileges.inc
let $engine_type= MyISAM;
SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
--source suite/funcs_1/datadict/datadict_load.inc

5
mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
View File

@ -10,10 +10,7 @@
# 2008-06-06 mleich Create this variant for the embedded server
#
if (`SELECT VERSION() NOT LIKE '%embedded%'`)
{
--skip Test requires: embedded server
}
--source include/is_embedded_no_privileges.inc
let $my_where = WHERE table_schema = 'mysql';
--source suite/funcs_1/datadict/columns.inc