mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.11 into 11.0

Browse source
This commit is contained in:
Marko Mäkelä 2023-03-20 10:39:15 +02:00
commit 221b5d77ef
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/mysql_install_db.sh
View file

@ -24,7 +24,6 @@ builddir=""
ldata="@localstatedir@" ldata="@localstatedir@"
langdir="" langdir=""
srcdir="" srcdir=""
log_error=""
args="" args=""
defaults="" defaults=""
@ -557,12 +556,20 @@ else
filter_cmd_line="cat" filter_cmd_line="cat"
fi fi
# Disable log error if the user don't have write access to the directory. # Disable log error if the user don't have right to write/create the file
# This is common when a user tries to install a personal mariadbd server # This is common when a user tries to install a personal mariadbd server and
if test -n $log_error # the global config in /etc is using --log-error.
# The server will internally change log-error to stderr to stderr if it cannot
# write the the log file. This code only disables the error message from a not
# writable log-error, which can be confusing.
if test -n "$log_error"
then then
if test ! -w $log_error if test \( -e "$log_error" -a \! -w "$log_error" \) -o \( ! -e "$log_error" -a ! -w "`dirname "$log_error"`" \)
then then
if test -n "$verbose"
then
echo "resetting log-error '$log_error' because no write access"
fi
log_error="" log_error=""
args="$args --skip-log-error" args="$args --skip-log-error"
fi fi

1
storage/innobase/buf/buf0flu.cc
View file

@ -2419,7 +2419,6 @@ static void buf_flush_page_cleaner()
break; break;
const ulint dirty_blocks= UT_LIST_GET_LEN(buf_pool.flush_list); const ulint dirty_blocks= UT_LIST_GET_LEN(buf_pool.flush_list);
ut_ad(dirty_blocks);
/* We perform dirty reads of the LRU+free list lengths here. /* We perform dirty reads of the LRU+free list lengths here.
Division by zero is not possible, because buf_pool.flush_list is Division by zero is not possible, because buf_pool.flush_list is
guaranteed to be nonempty, and it is a subset of buf_pool.LRU. */ guaranteed to be nonempty, and it is a subset of buf_pool.LRU. */