database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Add magic database access to test and test_% and removing the script

Browse Source 
from mysql-test-run.
This commit is contained in:
Oleksandr Byelkin
2022-10-21 16:50:55 +02:00
committed by Sergei Golubchik
parent 0537ce4e9f
commit 093ec49b6b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/mariadb-test-run.pl
View File

@@ -3132,9 +3132,8 @@ sub mysql_install_db {
# Append sys schema # Append sys schema
mtr_appendfile_to_file("$gis_sp_path/mysql_sys_schema.sql", mtr_appendfile_to_file("$gis_sp_path/mysql_sys_schema.sql",
$bootstrap_sql_file); $bootstrap_sql_file);
# Create test database
mtr_appendfile_to_file("$sql_dir/mysql_test_db.sql", mtr_tofile($bootstrap_sql_file, "CREATE DATABASE IF NOT EXISTS test CHARACTER SET latin1 COLLATE latin1_swedish_ci;\n");
$bootstrap_sql_file);
# mysql.gtid_slave_pos was created in InnoDB, but many tests # mysql.gtid_slave_pos was created in InnoDB, but many tests
# run without InnoDB. Alter it to Aria now # run without InnoDB. Alter it to Aria now

9
scripts/mysql_test_db.sql
View File

@@ -15,6 +15,15 @@
CREATE DATABASE IF NOT EXISTS test CHARACTER SET latin1 COLLATE latin1_swedish_ci; CREATE DATABASE IF NOT EXISTS test CHARACTER SET latin1 COLLATE latin1_swedish_ci;
--- Fill "db" table with default grants for anyone to
--- access database 'test' and 'test_%' if "db" table didn't exist
INSERT INTO mysql.global_priv VALUES ('', 'PUBLIC', '{"access":0,"is_role":true}');
CREATE TEMPORARY TABLE tmp_db LIKE db;
INSERT INTO tmp_db VALUES ('','test','PUBLIC','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
INSERT INTO tmp_db VALUES ('','test\_%','PUBLIC','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
DROP TABLE tmp_db;
-- Anonymous user with no privileges. -- Anonymous user with no privileges.
CREATE TEMPORARY TABLE tmp_user_anonymous LIKE global_priv; CREATE TEMPORARY TABLE tmp_user_anonymous LIKE global_priv;
INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost',''); INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost','');