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

Add support for bootstrapping from init_db.sql, which is used in

Browse Source 
early versions of 5.1 and 5.0
Fix usage instruction of defaults_extra_file
This commit is contained in:
unknown
2008-04-24 14:14:11 +02:00
parent 9b936dae90
commit d21e7383d1
1 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mysql-test/mysql-test-run.pl
View File

@ -2020,6 +2020,9 @@ sub sql_to_bootstrap {
next; next;
} }
# Replace @HOSTNAME with localhost
$line=~ s/\'\@HOSTNAME\@\'/localhost/;
# Default, just add the line without newline # Default, just add the line without newline
# but with a space as separator # but with a space as separator
$result.= "$line "; $result.= "$line ";
@ -2071,6 +2074,8 @@ sub mysql_install_db {
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql";
if (-f "$path_sql_dir/mysql_system_tables.sql")
{
# Use the mysql database for system tables # Use the mysql database for system tables
mtr_tofile($bootstrap_sql_file, "use mysql\n"); mtr_tofile($bootstrap_sql_file, "use mysql\n");
@ -2090,6 +2095,20 @@ sub mysql_install_db {
mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql", mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql",
$bootstrap_sql_file); $bootstrap_sql_file);
}
else
{
# Install db from init_db.sql that exist in early 5.1 and 5.0
# versions of MySQL
my $init_file= "$basedir/mysql-test/lib/init_db.sql";
mtr_report(" - from '$init_file'");
my $text= mtr_grab_file($init_file) or
mtr_error("Can't open '$init_file': $!");
mtr_tofile($bootstrap_sql_file,
sql_to_bootstrap($text));
}
# Fill help tables, just an empty file when running from bk repo # Fill help tables, just an empty file when running from bk repo
# but will be replaced by a real fill_help_tables.sql when # but will be replaced by a real fill_help_tables.sql when
# building the source dist # building the source dist
@ -3741,7 +3760,7 @@ Options to control what engine/variation to run
config|defaults-file=<config template> Use fixed config template for all config|defaults-file=<config template> Use fixed config template for all
tests tests
extra_defaults_file=<config template> Extra config template to add to defaults_extra_file=<config template> Extra config template to add to
all generated configs all generated configs
Options to control directories to use Options to control directories to use