mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
This commit is contained in:
@ -1586,6 +1586,7 @@ sub command_line_setup {
|
||||
$opt_manual_debug || $opt_dbx || $opt_client_dbx || $opt_manual_dbx ||
|
||||
$opt_debugger || $opt_client_debugger )
|
||||
{
|
||||
$ENV{ASAN_OPTIONS}= 'abort_on_error=1:'.($ENV{ASAN_OPTIONS} || '');
|
||||
if ( using_extern() )
|
||||
{
|
||||
mtr_error("Can't use --extern when using debugger");
|
||||
@ -3185,6 +3186,9 @@ sub mysql_install_db {
|
||||
mtr_appendfile_to_file("$sql_dir/mysql_performance_tables.sql",
|
||||
$bootstrap_sql_file);
|
||||
|
||||
# Don't install anonymous users
|
||||
mtr_tofile($bootstrap_sql_file, "set \@skip_auth_anonymous=1;\n");
|
||||
|
||||
# Add the mysql system tables initial data
|
||||
# for a production system
|
||||
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
|
||||
@ -3219,10 +3223,6 @@ sub mysql_install_db {
|
||||
sql_to_bootstrap($text));
|
||||
}
|
||||
|
||||
# Remove anonymous users
|
||||
mtr_tofile($bootstrap_sql_file,
|
||||
"DELETE FROM mysql.user where user= '';\n");
|
||||
|
||||
# Create mtr database
|
||||
mtr_tofile($bootstrap_sql_file,
|
||||
"CREATE DATABASE mtr CHARSET=latin1;\n");
|
||||
@ -5030,7 +5030,7 @@ sub mysqld_start ($$) {
|
||||
my $args;
|
||||
mtr_init_args(\$args);
|
||||
|
||||
if ( $opt_valgrind_mysqld )
|
||||
if ( $opt_valgrind_mysqld and not $opt_gdb and not $opt_manual_gdb )
|
||||
{
|
||||
valgrind_arguments($args, \$exe);
|
||||
}
|
||||
@ -5618,11 +5618,20 @@ sub gdb_arguments {
|
||||
unlink($gdb_init_file);
|
||||
|
||||
# Put $args into a single string
|
||||
my $str= join(" ", @$$args);
|
||||
$input = $input ? "< $input" : "";
|
||||
|
||||
# write init file for mysqld or client
|
||||
mtr_tofile($gdb_init_file, "set args $str $input\n");
|
||||
if ($type ne 'client' and $opt_valgrind_mysqld) {
|
||||
my $v = $$exe;
|
||||
my $vargs = [];
|
||||
valgrind_arguments($vargs, \$v);
|
||||
mtr_tofile($gdb_init_file, <<EOF);
|
||||
shell @My::SafeProcess::safe_process_cmd --parent-pid=`pgrep -x gdb` -- $v --vgdb-error=0 @$vargs @$$args &
|
||||
shell sleep 1
|
||||
target remote | /usr/lib64/valgrind/../../bin/vgdb
|
||||
EOF
|
||||
} else {
|
||||
mtr_tofile($gdb_init_file, "set args @$$args $input\n");
|
||||
}
|
||||
|
||||
if ( $opt_manual_gdb )
|
||||
{
|
||||
|
Reference in New Issue
Block a user