mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 16:54:15 +01:00
Merge 10.1 into 10.2
This commit is contained in:
commit
5f35e103ee
20 changed files with 528 additions and 78 deletions
cmake
include
mysql-test
extra/binlog_tests
r
suite/binlog/r
t
scripts
sql
storage
|
@ -121,6 +121,7 @@ ENDIF()
|
|||
|
||||
IF(UNIX)
|
||||
SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
|
||||
SET(PLUGIN_AUTH_PAM YES)
|
||||
|
||||
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
IF(NOT IGNORE_AIO_CHECK)
|
||||
|
|
|
@ -37,7 +37,8 @@ IF(CMAKE_VERSION VERSION_LESS "3.6.0")
|
|||
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
|
||||
ELSE()
|
||||
SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
|
||||
SET(CPACK_RPM_DEBUGINFO_PACKAGE ON CACHE INTERNAL "")
|
||||
OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON)
|
||||
MARK_AS_ADVANCED(CPACK_RPM_DEBUGINFO_PACKAGE)
|
||||
ENDIF()
|
||||
|
||||
SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")
|
||||
|
|
|
@ -120,7 +120,7 @@ longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
|
|||
static inline
|
||||
longlong double_to_datetime(double nr, MYSQL_TIME *ltime, uint flags, int *cut)
|
||||
{
|
||||
if (nr < 0 || nr > LONGLONG_MAX)
|
||||
if (nr < 0 || nr > (double)LONGLONG_MAX)
|
||||
nr= (double)LONGLONG_MAX;
|
||||
return number_to_datetime((longlong) floor(nr),
|
||||
(ulong)((nr-floor(nr))*TIME_SECOND_PART_FACTOR),
|
||||
|
|
|
@ -150,16 +150,16 @@ RESET MASTER;
|
|||
--echo # Test case for DROP query.
|
||||
|
||||
--connection default
|
||||
CREATE TABLE t1 (a INT) ENGINE=INNODB;
|
||||
CREATE TABLE t2 (a INT) ENGINE=INNODB;
|
||||
|
||||
--connection con1
|
||||
CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
|
||||
CREATE TEMPORARY TABLE t2 (b BLOB) ENGINE=INNODB;
|
||||
|
||||
--connection default
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
|
||||
--connection con1
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
|
||||
--connection default
|
||||
--exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug28642318.sql
|
||||
|
|
|
@ -863,12 +863,14 @@ SELECT group_concat(d1/(CASE 'b' WHEN 'j' THEN 'c' END))
|
|||
FROM v1 GROUP BY greatest(pk, 0, d2);
|
||||
group_concat(d1/(CASE 'b' WHEN 'j' THEN 'c' END))
|
||||
NULL
|
||||
NULL
|
||||
Warnings:
|
||||
Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`pk` at row 1
|
||||
Warning 1292 Incorrect datetime value: '2' for column `test`.`t1`.`pk` at row 1
|
||||
Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`pk` at row 1
|
||||
Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`pk` at row 1
|
||||
Warning 1292 Incorrect datetime value: '2' for column `test`.`t1`.`pk` at row 2
|
||||
Warning 1292 Incorrect datetime value: '2' for column `test`.`t1`.`pk` at row 2
|
||||
CREATE TABLE t2 AS SELECT greatest(pk, 0, d2) AS c1 FROM t1 LIMIT 0;
|
||||
SHOW CREATE TABLE t2;
|
||||
Table Create Table
|
||||
|
@ -879,5 +881,36 @@ DROP TABLE t2;
|
|||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-19699 Server crashes in Item_null_result::field_type upon SELECT with ROLLUP on constant table
|
||||
#
|
||||
CREATE TABLE t1 (d DATE) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES ('1999-11-04');
|
||||
SELECT d FROM t1 GROUP BY d WITH ROLLUP HAVING d > '1990-01-01';
|
||||
d
|
||||
1999-11-04
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-20431 GREATEST(int_col,date_col) returns wrong results in a view
|
||||
#
|
||||
CREATE TABLE t1 (pk INT NOT NULL, d DATE NOT NULL);
|
||||
CREATE VIEW v1 AS SELECT * FROM t1;
|
||||
INSERT INTO t1 VALUES (1,'2018-06-22'),(2,'2018-07-11');
|
||||
SELECT GREATEST(pk, d) FROM t1;
|
||||
GREATEST(pk, d)
|
||||
2018-06-22
|
||||
2018-07-11
|
||||
Warnings:
|
||||
Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`pk` at row 1
|
||||
Warning 1292 Incorrect datetime value: '2' for column `test`.`t1`.`pk` at row 2
|
||||
SELECT GREATEST(pk, d) FROM v1;
|
||||
GREATEST(pk, d)
|
||||
2018-06-22
|
||||
2018-07-11
|
||||
Warnings:
|
||||
Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`pk` at row 1
|
||||
Warning 1292 Incorrect datetime value: '2' for column `test`.`t1`.`pk` at row 2
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# End of 10.1 tests
|
||||
#
|
||||
|
|
|
@ -1167,6 +1167,37 @@ INSERT INTO t2 SELECT * FROM t1;
|
|||
DROP TABLE t1, t2;
|
||||
SET SQL_MODE=DEFAULT;
|
||||
#
|
||||
# MDEV-19699 Server crashes in Item_null_result::field_type upon SELECT with ROLLUP on constant table
|
||||
#
|
||||
CREATE TABLE t1 (d DATETIME) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES ('1999-11-04');
|
||||
SELECT d FROM t1 GROUP BY d WITH ROLLUP HAVING d > '1990-01-01';
|
||||
d
|
||||
1999-11-04 00:00:00
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-20431 GREATEST(int_col,date_col) returns wrong results in a view
|
||||
#
|
||||
CREATE TABLE t1 (pk INT NOT NULL, d DATETIME NOT NULL);
|
||||
CREATE VIEW v1 AS SELECT * FROM t1;
|
||||
INSERT INTO t1 VALUES (1,'2018-06-22 00:00:00'),(2,'2018-07-11 00:00:00');
|
||||
SELECT GREATEST(pk, d) FROM t1;
|
||||
GREATEST(pk, d)
|
||||
2018-06-22 00:00:00
|
||||
2018-07-11 00:00:00
|
||||
Warnings:
|
||||
Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`pk` at row 1
|
||||
Warning 1292 Incorrect datetime value: '2' for column `test`.`t1`.`pk` at row 2
|
||||
SELECT GREATEST(pk, d) FROM v1;
|
||||
GREATEST(pk, d)
|
||||
2018-06-22 00:00:00
|
||||
2018-07-11 00:00:00
|
||||
Warnings:
|
||||
Warning 1292 Incorrect datetime value: '1' for column `test`.`t1`.`pk` at row 1
|
||||
Warning 1292 Incorrect datetime value: '2' for column `test`.`t1`.`pk` at row 2
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# End of 10.1 tests
|
||||
#
|
||||
#
|
||||
|
|
|
@ -88,13 +88,13 @@ DROP TABLE IF EXISTS t1;
|
|||
RESET MASTER;
|
||||
# Test case for DROP query.
|
||||
connection default;
|
||||
CREATE TABLE t1 (a INT) ENGINE=INNODB;
|
||||
CREATE TABLE t2 (a INT) ENGINE=INNODB;
|
||||
connection con1;
|
||||
CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
|
||||
CREATE TEMPORARY TABLE t2 (b BLOB) ENGINE=INNODB;
|
||||
connection default;
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
connection con1;
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
connection default;
|
||||
# DROP table query fails with unknown table error without patch.
|
||||
# Clean up
|
||||
|
|
|
@ -116,13 +116,13 @@ DROP TABLE IF EXISTS t1;
|
|||
RESET MASTER;
|
||||
# Test case for DROP query.
|
||||
connection default;
|
||||
CREATE TABLE t1 (a INT) ENGINE=INNODB;
|
||||
CREATE TABLE t2 (a INT) ENGINE=INNODB;
|
||||
connection con1;
|
||||
CREATE TEMPORARY TABLE t1 (b BLOB) ENGINE=INNODB;
|
||||
CREATE TEMPORARY TABLE t2 (b BLOB) ENGINE=INNODB;
|
||||
connection default;
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
connection con1;
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
connection default;
|
||||
# DROP table query fails with unknown table error without patch.
|
||||
# Clean up
|
||||
|
|
|
@ -600,6 +600,30 @@ DROP TABLE t2;
|
|||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-19699 Server crashes in Item_null_result::field_type upon SELECT with ROLLUP on constant table
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (d DATE) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES ('1999-11-04');
|
||||
SELECT d FROM t1 GROUP BY d WITH ROLLUP HAVING d > '1990-01-01';
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-20431 GREATEST(int_col,date_col) returns wrong results in a view
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (pk INT NOT NULL, d DATE NOT NULL);
|
||||
CREATE VIEW v1 AS SELECT * FROM t1;
|
||||
INSERT INTO t1 VALUES (1,'2018-06-22'),(2,'2018-07-11');
|
||||
SELECT GREATEST(pk, d) FROM t1;
|
||||
SELECT GREATEST(pk, d) FROM v1;
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.1 tests
|
||||
--echo #
|
||||
|
|
|
@ -724,6 +724,29 @@ DROP TABLE t1, t2;
|
|||
SET SQL_MODE=DEFAULT;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-19699 Server crashes in Item_null_result::field_type upon SELECT with ROLLUP on constant table
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (d DATETIME) ENGINE=MyISAM;
|
||||
INSERT INTO t1 VALUES ('1999-11-04');
|
||||
SELECT d FROM t1 GROUP BY d WITH ROLLUP HAVING d > '1990-01-01';
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-20431 GREATEST(int_col,date_col) returns wrong results in a view
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (pk INT NOT NULL, d DATETIME NOT NULL);
|
||||
CREATE VIEW v1 AS SELECT * FROM t1;
|
||||
INSERT INTO t1 VALUES (1,'2018-06-22 00:00:00'),(2,'2018-07-11 00:00:00');
|
||||
SELECT GREATEST(pk, d) FROM t1;
|
||||
SELECT GREATEST(pk, d) FROM v1;
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.1 tests
|
||||
--echo #
|
||||
|
|
|
@ -166,7 +166,11 @@ case "$1" in
|
|||
shift
|
||||
while [ $# -gt 0 ]; do
|
||||
option=${1%%=*}
|
||||
if [ "$option" != "--defaults-file" ]; then
|
||||
if [[ "$option" != "--defaults-file" && \
|
||||
"$option" != "--defaults-extra-file" && \
|
||||
"$option" != "--defaults-group-suffix" && \
|
||||
"$option" != "--port" && \
|
||||
"$option" != "--socket" ]]; then
|
||||
value=${1#*=}
|
||||
case "$option" in
|
||||
'--innodb-data-home-dir')
|
||||
|
@ -193,7 +197,7 @@ case "$1" in
|
|||
if [ -z "$original_cmd" ]; then
|
||||
original_cmd="$1"
|
||||
else
|
||||
original_cmd+=" $1"
|
||||
original_cmd="$original_cmd $1"
|
||||
fi
|
||||
fi
|
||||
shift
|
||||
|
@ -249,7 +253,15 @@ else
|
|||
MY_PRINT_DEFAULTS=$(which my_print_defaults)
|
||||
fi
|
||||
|
||||
readonly WSREP_SST_OPT_CONF="$WSREP_SST_OPT_DEFAULT $WSREP_SST_OPT_EXTRA_DEFAULT $WSREP_SST_OPT_SUFFIX_DEFAULT"
|
||||
wsrep_defaults="$WSREP_SST_OPT_DEFAULT"
|
||||
if [ -n "$wsrep_defaults" ]; then
|
||||
wsrep_defaults="$wsrep_defaults "
|
||||
fi
|
||||
wsrep_defaults="$wsrep_defaults$WSREP_SST_OPT_EXTRA_DEFAULT"
|
||||
if [ -n "$wsrep_defaults" ]; then
|
||||
wsrep_defaults="$wsrep_defaults "
|
||||
fi
|
||||
readonly WSREP_SST_OPT_CONF="$wsrep_defaults$WSREP_SST_OPT_SUFFIX_DEFAULT"
|
||||
readonly MY_PRINT_DEFAULTS="$MY_PRINT_DEFAULTS $WSREP_SST_OPT_CONF"
|
||||
|
||||
wsrep_auth_not_set()
|
||||
|
|
|
@ -60,7 +60,7 @@ rebuild=0
|
|||
rebuildcmd=""
|
||||
payload=0
|
||||
pvformat="-F '%N => Rate:%r Avg:%a Elapsed:%t %e Bytes: %b %p' "
|
||||
pvopts="-f -i 10 -N $WSREP_SST_OPT_ROLE "
|
||||
pvopts="-f -i 10 -N $WSREP_SST_OPT_ROLE "
|
||||
STATDIR=""
|
||||
uextra=0
|
||||
disver=""
|
||||
|
@ -130,7 +130,7 @@ get_keys()
|
|||
|
||||
if [[ $encrypt -eq 0 ]];then
|
||||
if $MY_PRINT_DEFAULTS xtrabackup | grep -q encrypt;then
|
||||
wsrep_log_error "Unexpected option combination. SST may fail. Refer to http://www.percona.com/doc/percona-xtradb-cluster/manual/xtrabackup_sst.html "
|
||||
wsrep_log_error "Unexpected option combination. SST may fail. Refer to http://www.percona.com/doc/percona-xtradb-cluster/manual/xtrabackup_sst.html"
|
||||
fi
|
||||
return
|
||||
fi
|
||||
|
@ -465,7 +465,7 @@ cleanup_donor()
|
|||
if [[ -n ${XTRABACKUP_PID:-} ]];then
|
||||
if check_pid $XTRABACKUP_PID
|
||||
then
|
||||
wsrep_log_error "xtrabackup process is still running. Killing... "
|
||||
wsrep_log_error "xtrabackup process is still running. Killing..."
|
||||
kill_xtrabackup
|
||||
fi
|
||||
|
||||
|
@ -567,7 +567,7 @@ check_extra()
|
|||
# Xtrabackup works only locally.
|
||||
# Hence, setting host to 127.0.0.1 unconditionally.
|
||||
wsrep_log_info "SST through extra_port $eport"
|
||||
INNOEXTRA+=" --host=127.0.0.1 --port=$eport "
|
||||
INNOEXTRA+=" --host=127.0.0.1 --port=$eport"
|
||||
use_socket=0
|
||||
else
|
||||
wsrep_log_error "Extra port $eport null, failing"
|
||||
|
@ -577,8 +577,8 @@ check_extra()
|
|||
wsrep_log_info "Thread pool not set, ignore the option use_extra"
|
||||
fi
|
||||
fi
|
||||
if [[ $use_socket -eq 1 ]] && [[ -n "${WSREP_SST_OPT_SOCKET}" ]];then
|
||||
INNOEXTRA+=" --socket=${WSREP_SST_OPT_SOCKET}"
|
||||
if [[ $use_socket -eq 1 ]] && [[ -n "$WSREP_SST_OPT_SOCKET" ]];then
|
||||
INNOEXTRA+=" --socket=$WSREP_SST_OPT_SOCKET"
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -744,8 +744,8 @@ if [[ $ssyslog -eq 1 ]];then
|
|||
logger -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
|
||||
}
|
||||
|
||||
INNOAPPLY="${INNOBACKUPEX_BIN} --innobackupex $disver $iapts \$INNOEXTRA --apply-log \$rebuildcmd \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-apply "
|
||||
INNOMOVE="${INNOBACKUPEX_BIN} --innobackupex ${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-move "
|
||||
INNOAPPLY="${INNOBACKUPEX_BIN} --innobackupex $disver $iapts \$INNOEXTRA --apply-log \$rebuildcmd \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-apply"
|
||||
INNOMOVE="${INNOBACKUPEX_BIN} --innobackupex ${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-move"
|
||||
INNOBACKUP="${INNOBACKUPEX_BIN} --innobackupex ${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2> >(logger -p daemon.err -t ${ssystag}innobackupex-backup)"
|
||||
fi
|
||||
|
||||
|
@ -833,7 +833,7 @@ then
|
|||
-z $(parse_cnf --mysqld tmpdir "") && \
|
||||
-z $(parse_cnf xtrabackup tmpdir "") ]]; then
|
||||
xtmpdir=$(mktemp -d)
|
||||
tmpopts=" --tmpdir=$xtmpdir "
|
||||
tmpopts=" --tmpdir=$xtmpdir"
|
||||
wsrep_log_info "Using $xtmpdir as xtrabackup temporary directory"
|
||||
fi
|
||||
|
||||
|
@ -855,13 +855,12 @@ then
|
|||
get_keys
|
||||
if [[ $encrypt -eq 1 ]];then
|
||||
if [[ -n $ekey ]];then
|
||||
INNOEXTRA+=" --encrypt=$ealgo --encrypt-key=$ekey "
|
||||
INNOEXTRA+=" --encrypt=$ealgo --encrypt-key=$ekey"
|
||||
else
|
||||
INNOEXTRA+=" --encrypt=$ealgo --encrypt-key-file=$ekeyfile "
|
||||
INNOEXTRA+=" --encrypt=$ealgo --encrypt-key-file=$ekeyfile"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
check_extra
|
||||
|
||||
wsrep_log_info "Streaming GTID file before SST"
|
||||
|
@ -882,7 +881,6 @@ then
|
|||
tcmd=" $scomp | $tcmd "
|
||||
fi
|
||||
|
||||
|
||||
send_donor $DATA "${stagemsg}-gtid"
|
||||
|
||||
tcmd="$ttcmd"
|
||||
|
@ -1050,7 +1048,7 @@ then
|
|||
|
||||
tempdir=$LOG_BIN_ARG
|
||||
if [ -z "$tempdir" ]; then
|
||||
tempdir=$(parse_cnf mysqld$WSREP_SST_OPT_SUFFIX_VALUE log-bin "")
|
||||
tempdir=$(parse_cnf mysqld$WSREP_SST_OPT_SUFFIX_VALUE log-bin "")
|
||||
fi
|
||||
if [ -z "$tempdir" ]; then
|
||||
tempdir=$(parse_cnf --mysqld log-bin "")
|
||||
|
|
|
@ -56,7 +56,7 @@ rebuild=0
|
|||
rebuildcmd=""
|
||||
payload=0
|
||||
pvformat="-F '%N => Rate:%r Avg:%a Elapsed:%t %e Bytes: %b %p' "
|
||||
pvopts="-f -i 10 -N $WSREP_SST_OPT_ROLE "
|
||||
pvopts="-f -i 10 -N $WSREP_SST_OPT_ROLE "
|
||||
STATDIR=""
|
||||
uextra=0
|
||||
disver=""
|
||||
|
@ -675,7 +675,7 @@ check_extra()
|
|||
# Xtrabackup works only locally.
|
||||
# Hence, setting host to 127.0.0.1 unconditionally.
|
||||
wsrep_log_info "SST through extra_port $eport"
|
||||
INNOEXTRA+=" --host=127.0.0.1 --port=$eport "
|
||||
INNOEXTRA+=" --host=127.0.0.1 --port=$eport"
|
||||
use_socket=0
|
||||
else
|
||||
wsrep_log_error "Extra port $eport null, failing"
|
||||
|
@ -685,8 +685,8 @@ check_extra()
|
|||
wsrep_log_info "Thread pool not set, ignore the option use_extra"
|
||||
fi
|
||||
fi
|
||||
if [[ $use_socket -eq 1 ]] && [[ -n "${WSREP_SST_OPT_SOCKET}" ]];then
|
||||
INNOEXTRA+=" --socket=${WSREP_SST_OPT_SOCKET}"
|
||||
if [[ $use_socket -eq 1 ]] && [[ -n "$WSREP_SST_OPT_SOCKET" ]];then
|
||||
INNOEXTRA+=" --socket=$WSREP_SST_OPT_SOCKET"
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -906,7 +906,10 @@ if [ ! -z "$INNODB_DATA_HOME_DIR_ARG" ]; then
|
|||
fi
|
||||
# if INNODB_DATA_HOME_DIR env. variable is not set, try to get it from my.cnf
|
||||
if [ -z "$INNODB_DATA_HOME_DIR" ]; then
|
||||
INNODB_DATA_HOME_DIR=$(parse_cnf --mysqld innodb-data-home-dir "")
|
||||
INNODB_DATA_HOME_DIR=$(parse_cnf mysqld$WSREP_SST_OPT_SUFFIX_VALUE innodb-data-home-dir '')
|
||||
fi
|
||||
if [ -z "$INNODB_DATA_HOME_DIR" ]; then
|
||||
INNODB_DATA_HOME_DIR=$(parse_cnf --mysqld innodb-data-home-dir '')
|
||||
fi
|
||||
if [ ! -z "$INNODB_DATA_HOME_DIR" ]; then
|
||||
INNOEXTRA+=" --innodb-data-home-dir=$INNODB_DATA_HOME_DIR"
|
||||
|
@ -937,9 +940,11 @@ then
|
|||
exit 93
|
||||
fi
|
||||
|
||||
if [[ -z $(parse_cnf --mysqld tmpdir "") && -z $(parse_cnf xtrabackup tmpdir "") ]];then
|
||||
if [[ -z $(parse_cnf mysqld$WSREP_SST_OPT_SUFFIX_VALUE tmpdir "") && \
|
||||
-z $(parse_cnf --mysqld tmpdir "") && \
|
||||
-z $(parse_cnf xtrabackup tmpdir "") ]]; then
|
||||
xtmpdir=$(mktemp -d)
|
||||
tmpopts=" --tmpdir=$xtmpdir "
|
||||
tmpopts=" --tmpdir=$xtmpdir"
|
||||
wsrep_log_info "Using $xtmpdir as xtrabackup temporary directory"
|
||||
fi
|
||||
|
||||
|
@ -1057,8 +1062,24 @@ then
|
|||
[[ -n $SST_PROGRESS_FILE ]] && touch $SST_PROGRESS_FILE
|
||||
|
||||
ib_home_dir=$INNODB_DATA_HOME_DIR
|
||||
ib_log_dir=$(parse_cnf --mysqld innodb-log-group-home-dir "")
|
||||
ib_undo_dir=$(parse_cnf --mysqld innodb-undo-directory "")
|
||||
|
||||
# Try to set ib_log_dir from the command line:
|
||||
ib_log_dir=$INNODB_LOG_GROUP_HOME_ARG
|
||||
if [ -z "$ib_log_dir" ]; then
|
||||
ib_log_dir=$(parse_cnf mysqld$WSREP_SST_OPT_SUFFIX_VALUE innodb-log-group-home-dir "")
|
||||
fi
|
||||
if [ -z "$ib_log_dir" ]; then
|
||||
ib_log_dir=$(parse_cnf --mysqld innodb-log-group-home-dir "")
|
||||
fi
|
||||
|
||||
# Try to set ib_undo_dir from the command line:
|
||||
ib_undo_dir=$INNODB_UNDO_DIR_ARG
|
||||
if [ -z "$ib_undo_dir" ]; then
|
||||
ib_undo_dir=$(parse_cnf mysqld$WSREP_SST_OPT_SUFFIX_VALUE innodb-undo-directory "")
|
||||
fi
|
||||
if [ -z "$ib_undo_dir" ]; then
|
||||
ib_undo_dir=$(parse_cnf --mysqld innodb-undo-directory "")
|
||||
fi
|
||||
|
||||
stagemsg="Joiner-Recv"
|
||||
|
||||
|
@ -1124,7 +1145,13 @@ then
|
|||
find $ib_home_dir $ib_log_dir $ib_undo_dir $DATA -mindepth 1 -prune -regex $cpat -o -exec rm -rfv {} 1>&2 \+
|
||||
fi
|
||||
|
||||
tempdir=$(parse_cnf --mysqld log-bin "")
|
||||
tempdir=$LOG_BIN_ARG
|
||||
if [ -z "$tempdir" ]; then
|
||||
tempdir=$(parse_cnf mysqld$WSREP_SST_OPT_SUFFIX_VALUE log-bin "")
|
||||
fi
|
||||
if [ -z "$tempdir" ]; then
|
||||
tempdir=$(parse_cnf --mysqld log-bin "")
|
||||
fi
|
||||
if [[ -n ${tempdir:-} ]];then
|
||||
binlog_dir=$(dirname $tempdir)
|
||||
binlog_file=$(basename $tempdir)
|
||||
|
|
|
@ -49,7 +49,7 @@ rebuild=0
|
|||
rebuildcmd=""
|
||||
payload=0
|
||||
pvformat="-F '%N => Rate:%r Avg:%a Elapsed:%t %e Bytes: %b %p' "
|
||||
pvopts="-f -i 10 -N $WSREP_SST_OPT_ROLE "
|
||||
pvopts="-f -i 10 -N $WSREP_SST_OPT_ROLE "
|
||||
uextra=0
|
||||
|
||||
if which pv &>/dev/null && pv --help | grep -q FORMAT;then
|
||||
|
@ -380,7 +380,7 @@ check_extra()
|
|||
# Xtrabackup works only locally.
|
||||
# Hence, setting host to 127.0.0.1 unconditionally.
|
||||
wsrep_log_info "SST through extra_port $eport"
|
||||
INNOEXTRA+=" --host=127.0.0.1 --port=$eport "
|
||||
INNOEXTRA+=" --host=127.0.0.1 --port=$eport"
|
||||
use_socket=0
|
||||
else
|
||||
wsrep_log_error "Extra port $eport null, failing"
|
||||
|
@ -390,8 +390,8 @@ check_extra()
|
|||
wsrep_log_info "Thread pool not set, ignore the option use_extra"
|
||||
fi
|
||||
fi
|
||||
if [[ $use_socket -eq 1 ]] && [[ -n "${WSREP_SST_OPT_SOCKET}" ]];then
|
||||
INNOEXTRA+=" --socket=${WSREP_SST_OPT_SOCKET}"
|
||||
if [[ $use_socket -eq 1 ]] && [[ -n "$WSREP_SST_OPT_SOCKET" ]];then
|
||||
INNOEXTRA+=" --socket=$WSREP_SST_OPT_SOCKET"
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -439,14 +439,14 @@ then
|
|||
get_keys
|
||||
if [[ $encrypt -eq 1 ]];then
|
||||
if [[ -n $ekey ]];then
|
||||
INNOEXTRA+=" --encrypt=$ealgo --encrypt-key=$ekey "
|
||||
INNOEXTRA+=" --encrypt=$ealgo --encrypt-key=$ekey"
|
||||
else
|
||||
INNOEXTRA+=" --encrypt=$ealgo --encrypt-key-file=$ekeyfile "
|
||||
INNOEXTRA+=" --encrypt=$ealgo --encrypt-key-file=$ekeyfile"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n $lsn ]];then
|
||||
INNOEXTRA+=" --incremental --incremental-lsn=$lsn "
|
||||
INNOEXTRA+=" --incremental --incremental-lsn=$lsn"
|
||||
fi
|
||||
|
||||
check_extra
|
||||
|
|
32
sql/item.cc
32
sql/item.cc
|
@ -3400,6 +3400,20 @@ my_decimal *Item_null::val_decimal(my_decimal *decimal_value)
|
|||
}
|
||||
|
||||
|
||||
longlong Item_null::val_datetime_packed()
|
||||
{
|
||||
null_value= true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
longlong Item_null::val_time_packed()
|
||||
{
|
||||
null_value= true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
bool Item_null::get_date(MYSQL_TIME *ltime, ulonglong fuzzydate)
|
||||
{
|
||||
// following assert is redundant, because fixed=1 assigned in constructor
|
||||
|
@ -7997,6 +8011,24 @@ bool Item_ref::get_date(MYSQL_TIME *ltime,ulonglong fuzzydate)
|
|||
}
|
||||
|
||||
|
||||
longlong Item_ref::val_datetime_packed()
|
||||
{
|
||||
DBUG_ASSERT(fixed);
|
||||
longlong tmp= (*ref)->val_datetime_packed();
|
||||
null_value= (*ref)->null_value;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
|
||||
longlong Item_ref::val_time_packed()
|
||||
{
|
||||
DBUG_ASSERT(fixed);
|
||||
longlong tmp= (*ref)->val_time_packed();
|
||||
null_value= (*ref)->null_value;
|
||||
return tmp;
|
||||
}
|
||||
|
||||
|
||||
my_decimal *Item_ref::val_decimal(my_decimal *decimal_value)
|
||||
{
|
||||
my_decimal *val= (*ref)->val_decimal_result(decimal_value);
|
||||
|
|
|
@ -2869,6 +2869,8 @@ public:
|
|||
String *val_str(String *str);
|
||||
my_decimal *val_decimal(my_decimal *);
|
||||
bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate);
|
||||
longlong val_datetime_packed();
|
||||
longlong val_time_packed();
|
||||
int save_in_field(Field *field, bool no_conversions);
|
||||
int save_safe_in_field(Field *field);
|
||||
bool send(Protocol *protocol, String *str);
|
||||
|
@ -4389,6 +4391,8 @@ public:
|
|||
String *val_str(String* tmp);
|
||||
bool is_null();
|
||||
bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate);
|
||||
longlong val_datetime_packed();
|
||||
longlong val_time_packed();
|
||||
double val_result();
|
||||
longlong val_int_result();
|
||||
String *str_result(String* tmp);
|
||||
|
|
308
sql/wsrep_sst.cc
308
sql/wsrep_sst.cc
|
@ -16,6 +16,7 @@
|
|||
#include "wsrep_sst.h"
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <ctype.h>
|
||||
#include <mysqld.h>
|
||||
#include <m_ctype.h>
|
||||
#include <my_sys.h>
|
||||
|
@ -435,7 +436,31 @@ static char* my_fgets (char* buf, size_t buf_len, FILE* stream)
|
|||
}
|
||||
|
||||
/*
|
||||
Generate opt_binlog_opt_val for sst_donate_other(), sst_prepare_other().
|
||||
Generate "name 'value'" string.
|
||||
*/
|
||||
static char* generate_name_value(const char* name, const char* value)
|
||||
{
|
||||
size_t name_len= strlen(name);
|
||||
size_t value_len= strlen(value);
|
||||
char* buf=
|
||||
(char*) my_malloc((name_len + value_len + 5) * sizeof(char), MYF(0));
|
||||
if (buf)
|
||||
{
|
||||
char* ref= buf;
|
||||
*ref++ = ' ';
|
||||
memcpy(ref, name, name_len * sizeof(char));
|
||||
ref += name_len;
|
||||
*ref++ = ' ';
|
||||
*ref++ = '\'';
|
||||
memcpy(ref, value, value_len * sizeof(char));
|
||||
ref += value_len;
|
||||
*ref++ = '\'';
|
||||
*ref = 0;
|
||||
}
|
||||
return buf;
|
||||
}
|
||||
/*
|
||||
Generate binlog option string for sst_donate_other(), sst_prepare_other().
|
||||
|
||||
Returns zero on success, negative error code otherwise.
|
||||
|
||||
|
@ -451,7 +476,9 @@ static int generate_binlog_opt_val(char** ret)
|
|||
{
|
||||
assert(opt_bin_logname);
|
||||
*ret= strcmp(opt_bin_logname, "0") ?
|
||||
my_strdup(opt_bin_logname, MYF(0)) : my_strdup("", MYF(0));
|
||||
generate_name_value(WSREP_SST_OPT_BINLOG,
|
||||
opt_bin_logname) :
|
||||
my_strdup("", MYF(0));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -467,7 +494,9 @@ static int generate_binlog_index_opt_val(char** ret)
|
|||
*ret= NULL;
|
||||
if (opt_binlog_index_name) {
|
||||
*ret= strcmp(opt_binlog_index_name, "0") ?
|
||||
my_strdup(opt_binlog_index_name, MYF(0)) : my_strdup("", MYF(0));
|
||||
generate_name_value(WSREP_SST_OPT_BINLOG_INDEX,
|
||||
opt_binlog_index_name) :
|
||||
my_strdup("", MYF(0));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -664,7 +693,86 @@ static size_t estimate_cmd_len (bool* extra_args)
|
|||
{
|
||||
for (int i = 1; i < orig_argc; i++)
|
||||
{
|
||||
cmd_len += strlen(orig_argv[i]);
|
||||
const char* arg= orig_argv[i];
|
||||
size_t n= strlen(arg);
|
||||
if (n == 0) continue;
|
||||
cmd_len += n;
|
||||
bool quotation= false;
|
||||
char c;
|
||||
while ((c = *arg++) != 0)
|
||||
{
|
||||
/* A whitespace or a single quote requires double quotation marks: */
|
||||
if (isspace(c) || c == '\'')
|
||||
{
|
||||
quotation= true;
|
||||
}
|
||||
/*
|
||||
If the equals symbol is encountered, then we need to separately
|
||||
process the right side:
|
||||
*/
|
||||
else if (c == '=')
|
||||
{
|
||||
/* Perhaps we need to quote the left part of the argument: */
|
||||
if (quotation)
|
||||
{
|
||||
cmd_len += 2;
|
||||
/*
|
||||
Reset the quotation flag, since now the status for
|
||||
the right side of the expression will be saved here:
|
||||
*/
|
||||
quotation= false;
|
||||
}
|
||||
while ((c = *arg++) != 0)
|
||||
{
|
||||
/*
|
||||
A whitespace or a single quote requires double
|
||||
quotation marks:
|
||||
*/
|
||||
if (isspace(c) || c == '\'')
|
||||
{
|
||||
quotation= true;
|
||||
}
|
||||
/*
|
||||
Double quotation mark or backslash symbol requires backslash
|
||||
prefixing:
|
||||
*/
|
||||
#ifdef __WIN__
|
||||
else if (c == '"' || c == '\\')
|
||||
#else
|
||||
/*
|
||||
The dollar symbol is used to substitute a variable, therefore
|
||||
it also requires escaping:
|
||||
*/
|
||||
else if (c == '"' || c == '\\' || c == '$')
|
||||
#endif
|
||||
{
|
||||
cmd_len++;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
/*
|
||||
Double quotation mark or backslash symbol requires backslash
|
||||
prefixing:
|
||||
*/
|
||||
#ifdef __WIN__
|
||||
else if (c == '"' || c == '\\')
|
||||
#else
|
||||
/*
|
||||
The dollar symbol is used to substitute a variable, therefore
|
||||
it also requires escaping:
|
||||
*/
|
||||
else if (c == '"' || c == '\\' || c == '$')
|
||||
#endif
|
||||
{
|
||||
cmd_len++;
|
||||
}
|
||||
}
|
||||
/* Perhaps we need to quote the entire argument or its right part: */
|
||||
if (quotation)
|
||||
{
|
||||
cmd_len += 2;
|
||||
}
|
||||
}
|
||||
extra = true;
|
||||
cmd_len += strlen(WSREP_SST_OPT_MYSQLD);
|
||||
|
@ -692,10 +800,171 @@ static void copy_orig_argv (char* cmd_str)
|
|||
for (int i = 1; i < orig_argc; i++)
|
||||
{
|
||||
char* arg= orig_argv[i];
|
||||
*cmd_str++ = ' ';
|
||||
n = strlen(arg);
|
||||
memcpy(cmd_str, arg, n * sizeof(char));
|
||||
cmd_str += n;
|
||||
if (n == 0) continue;
|
||||
*cmd_str++ = ' ';
|
||||
bool quotation= false;
|
||||
bool plain= true;
|
||||
char *arg_scan= arg;
|
||||
char c;
|
||||
while ((c = *arg_scan++) != 0)
|
||||
{
|
||||
/* A whitespace or a single quote requires double quotation marks: */
|
||||
if (isspace(c) || c == '\'')
|
||||
{
|
||||
quotation= true;
|
||||
}
|
||||
/*
|
||||
If the equals symbol is encountered, then we need to separately
|
||||
process the right side:
|
||||
*/
|
||||
else if (c == '=')
|
||||
{
|
||||
/* Calculate length of the Left part of the argument: */
|
||||
size_t m = (size_t) (arg_scan - arg) - 1;
|
||||
if (m)
|
||||
{
|
||||
/* Perhaps we need to quote the left part of the argument: */
|
||||
if (quotation)
|
||||
{
|
||||
*cmd_str++ = '"';
|
||||
}
|
||||
/*
|
||||
If there were special characters inside, then we can use
|
||||
the fast memcpy function:
|
||||
*/
|
||||
if (plain)
|
||||
{
|
||||
memcpy(cmd_str, arg, m * sizeof(char));
|
||||
cmd_str += m;
|
||||
/* Left part of the argument has already been processed: */
|
||||
n -= m;
|
||||
arg += m;
|
||||
}
|
||||
/* Otherwise we need to prefix individual characters: */
|
||||
else
|
||||
{
|
||||
n -= m;
|
||||
while (m)
|
||||
{
|
||||
c = *arg++;
|
||||
#ifdef __WIN__
|
||||
if (c == '"' || c == '\\')
|
||||
#else
|
||||
if (c == '"' || c == '\\' || c == '$')
|
||||
#endif
|
||||
{
|
||||
*cmd_str++ = '\\';
|
||||
}
|
||||
*cmd_str++ = c;
|
||||
m--;
|
||||
}
|
||||
/*
|
||||
Reset the plain string flag, since now the status for
|
||||
the right side of the expression will be saved here:
|
||||
*/
|
||||
plain= true;
|
||||
}
|
||||
/* Perhaps we need to quote the left part of the argument: */
|
||||
if (quotation)
|
||||
{
|
||||
*cmd_str++ = '"';
|
||||
/*
|
||||
Reset the quotation flag, since now the status for
|
||||
the right side of the expression will be saved here:
|
||||
*/
|
||||
quotation= false;
|
||||
}
|
||||
}
|
||||
/* Copy equals symbol: */
|
||||
*cmd_str++ = '=';
|
||||
arg++;
|
||||
n--;
|
||||
/* Let's deal with the left side of the expression: */
|
||||
while ((c = *arg_scan++) != 0)
|
||||
{
|
||||
/*
|
||||
A whitespace or a single quote requires double
|
||||
quotation marks:
|
||||
*/
|
||||
if (isspace(c) || c == '\'')
|
||||
{
|
||||
quotation= true;
|
||||
}
|
||||
/*
|
||||
Double quotation mark or backslash symbol requires backslash
|
||||
prefixing:
|
||||
*/
|
||||
#ifdef __WIN__
|
||||
else if (c == '"' || c == '\\')
|
||||
#else
|
||||
/*
|
||||
The dollar symbol is used to substitute a variable, therefore
|
||||
it also requires escaping:
|
||||
*/
|
||||
else if (c == '"' || c == '\\' || c == '$')
|
||||
#endif
|
||||
{
|
||||
plain= false;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
/*
|
||||
Double quotation mark or backslash symbol requires backslash
|
||||
prefixing:
|
||||
*/
|
||||
#ifdef __WIN__
|
||||
else if (c == '"' || c == '\\')
|
||||
#else
|
||||
/*
|
||||
The dollar symbol is used to substitute a variable, therefore
|
||||
it also requires escaping:
|
||||
*/
|
||||
else if (c == '"' || c == '\\' || c == '$')
|
||||
#endif
|
||||
{
|
||||
plain= false;
|
||||
}
|
||||
}
|
||||
if (n)
|
||||
{
|
||||
/* Perhaps we need to quote the entire argument or its right part: */
|
||||
if (quotation)
|
||||
{
|
||||
*cmd_str++ = '"';
|
||||
}
|
||||
/*
|
||||
If there were no special characters inside, then we can use
|
||||
the fast memcpy function:
|
||||
*/
|
||||
if (plain)
|
||||
{
|
||||
memcpy(cmd_str, arg, n * sizeof(char));
|
||||
cmd_str += n;
|
||||
}
|
||||
/* Otherwise we need to prefix individual characters: */
|
||||
else
|
||||
{
|
||||
while ((c = *arg++) != 0)
|
||||
{
|
||||
#ifdef __WIN__
|
||||
if (c == '"' || c == '\\')
|
||||
#else
|
||||
if (c == '"' || c == '\\' || c == '$')
|
||||
#endif
|
||||
{
|
||||
*cmd_str++ = '\\';
|
||||
}
|
||||
*cmd_str++ = c;
|
||||
}
|
||||
}
|
||||
/* Perhaps we need to quote the entire argument or its right part: */
|
||||
if (quotation)
|
||||
{
|
||||
*cmd_str++ = '"';
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
Add a terminating null character (not counted in the length,
|
||||
|
@ -722,8 +991,6 @@ static ssize_t sst_prepare_other (const char* method,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
const char* binlog_opt= "";
|
||||
const char* binlog_index_opt= "";
|
||||
char* binlog_opt_val= NULL;
|
||||
char* binlog_index_opt_val= NULL;
|
||||
|
||||
|
@ -741,9 +1008,6 @@ static ssize_t sst_prepare_other (const char* method,
|
|||
ret);
|
||||
}
|
||||
|
||||
if (strlen(binlog_opt_val)) binlog_opt= WSREP_SST_OPT_BINLOG;
|
||||
if (strlen(binlog_index_opt_val)) binlog_index_opt= WSREP_SST_OPT_BINLOG_INDEX;
|
||||
|
||||
make_wsrep_defaults_file();
|
||||
|
||||
ret= snprintf (cmd_str(), cmd_len,
|
||||
|
@ -751,14 +1015,14 @@ static ssize_t sst_prepare_other (const char* method,
|
|||
WSREP_SST_OPT_ROLE " 'joiner' "
|
||||
WSREP_SST_OPT_ADDR " '%s' "
|
||||
WSREP_SST_OPT_DATA " '%s' "
|
||||
" %s "
|
||||
"%s"
|
||||
WSREP_SST_OPT_PARENT " '%d'"
|
||||
" %s '%s'"
|
||||
" %s '%s'",
|
||||
"%s"
|
||||
"%s",
|
||||
method, addr_in, mysql_real_data_home,
|
||||
wsrep_defaults_file,
|
||||
(int)getpid(), binlog_opt, binlog_opt_val,
|
||||
binlog_index_opt, binlog_index_opt_val);
|
||||
(int)getpid(),
|
||||
binlog_opt_val, binlog_index_opt_val);
|
||||
my_free(binlog_opt_val);
|
||||
my_free(binlog_index_opt_val);
|
||||
|
||||
|
@ -1055,7 +1319,7 @@ static int sst_donate_mysqldump (const char* addr,
|
|||
WSREP_SST_OPT_PORT " '%d' "
|
||||
WSREP_SST_OPT_LPORT " '%u' "
|
||||
WSREP_SST_OPT_SOCKET " '%s' "
|
||||
" %s "
|
||||
"%s"
|
||||
WSREP_SST_OPT_GTID " '%s:%lld' "
|
||||
WSREP_SST_OPT_GTID_DOMAIN_ID " '%d'"
|
||||
"%s",
|
||||
|
@ -1403,7 +1667,6 @@ static int sst_donate_other (const char* method,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
const char* binlog_opt= "";
|
||||
char* binlog_opt_val= NULL;
|
||||
|
||||
int ret;
|
||||
|
@ -1412,7 +1675,6 @@ static int sst_donate_other (const char* method,
|
|||
WSREP_ERROR("sst_donate_other(): generate_binlog_opt_val() failed: %d",ret);
|
||||
return ret;
|
||||
}
|
||||
if (strlen(binlog_opt_val)) binlog_opt= WSREP_SST_OPT_BINLOG;
|
||||
|
||||
make_wsrep_defaults_file();
|
||||
|
||||
|
@ -1422,15 +1684,15 @@ static int sst_donate_other (const char* method,
|
|||
WSREP_SST_OPT_ADDR " '%s' "
|
||||
WSREP_SST_OPT_SOCKET " '%s' "
|
||||
WSREP_SST_OPT_DATA " '%s' "
|
||||
" %s "
|
||||
" %s '%s' "
|
||||
"%s"
|
||||
WSREP_SST_OPT_GTID " '%s:%lld' "
|
||||
WSREP_SST_OPT_GTID_DOMAIN_ID " '%d'"
|
||||
"%s"
|
||||
"%s",
|
||||
method, addr, mysqld_unix_port, mysql_real_data_home,
|
||||
wsrep_defaults_file,
|
||||
binlog_opt, binlog_opt_val,
|
||||
uuid, (long long) seqno, wsrep_gtid_domain_id,
|
||||
binlog_opt_val,
|
||||
bypass ? " " WSREP_SST_OPT_BYPASS : "");
|
||||
my_free(binlog_opt_val);
|
||||
|
||||
|
|
|
@ -1317,7 +1317,7 @@ char *ha_connect::GetRealString(PCSZ s)
|
|||
{
|
||||
char *sv;
|
||||
|
||||
if (IsPartitioned() && s && partname && *partname) {
|
||||
if (IsPartitioned() && s && *partname) {
|
||||
sv= (char*)PlugSubAlloc(xp->g, NULL, 0);
|
||||
sprintf(sv, s, partname);
|
||||
PlugSubAlloc(xp->g, NULL, strlen(sv) + 1);
|
||||
|
|
|
@ -1265,7 +1265,6 @@ find_or_create_file(PFS_thread *thread, PFS_file_class *klass,
|
|||
char dirbuffer[FN_REFLEN];
|
||||
size_t dirlen;
|
||||
const char *normalized_filename;
|
||||
int normalized_length;
|
||||
|
||||
dirlen= dirname_length(safe_filename);
|
||||
if (dirlen == 0)
|
||||
|
@ -1296,7 +1295,7 @@ find_or_create_file(PFS_thread *thread, PFS_file_class *klass,
|
|||
*buf_end= '\0';
|
||||
|
||||
normalized_filename= buffer;
|
||||
normalized_length= strlen(normalized_filename);
|
||||
size_t normalized_length= strlen(normalized_filename);
|
||||
|
||||
PFS_file **entry;
|
||||
uint retry_count= 0;
|
||||
|
@ -1345,7 +1344,7 @@ search:
|
|||
pfs->m_class= klass;
|
||||
pfs->m_enabled= klass->m_enabled && flag_global_instrumentation;
|
||||
pfs->m_timed= klass->m_timed;
|
||||
strncpy(pfs->m_filename, normalized_filename, normalized_length);
|
||||
strncpy(pfs->m_filename, normalized_filename, normalized_length + 1);
|
||||
pfs->m_filename[normalized_length]= '\0';
|
||||
pfs->m_filename_length= normalized_length;
|
||||
pfs->m_file_stat.m_open_count= 1;
|
||||
|
|
|
@ -2291,7 +2291,8 @@ int ha_sphinx::HandleMysqlError ( MYSQL * pConn, int iErrCode )
|
|||
CSphSEThreadTable * pTable = GetTls ();
|
||||
if ( pTable )
|
||||
{
|
||||
strncpy ( pTable->m_tStats.m_sLastMessage, mysql_error ( pConn ), sizeof ( pTable->m_tStats.m_sLastMessage ) );
|
||||
strncpy ( pTable->m_tStats.m_sLastMessage, mysql_error ( pConn ), sizeof pTable->m_tStats.m_sLastMessage - 1 );
|
||||
pTable->m_tStats.m_sLastMessage[sizeof pTable->m_tStats.m_sLastMessage - 1] = '\0';
|
||||
pTable->m_tStats.m_bLastError = true;
|
||||
}
|
||||
|
||||
|
@ -2558,7 +2559,8 @@ bool ha_sphinx::UnpackSchema ()
|
|||
CSphSEThreadTable * pTable = GetTls ();
|
||||
if ( pTable )
|
||||
{
|
||||
strncpy ( pTable->m_tStats.m_sLastMessage, sMessage, sizeof(pTable->m_tStats.m_sLastMessage) );
|
||||
strncpy ( pTable->m_tStats.m_sLastMessage, sMessage, sizeof pTable->m_tStats.m_sLastMessage - 1 );
|
||||
pTable->m_tStats.m_sLastMessage[sizeof pTable->m_tStats.m_sLastMessage - 1] = '\0';
|
||||
pTable->m_tStats.m_bLastError = ( uStatus==SEARCHD_ERROR );
|
||||
}
|
||||
|
||||
|
@ -2982,7 +2984,8 @@ int ha_sphinx::index_read ( byte * buf, const byte * key, uint key_len, enum ha_
|
|||
SPH_RET ( HA_ERR_END_OF_FILE );
|
||||
}
|
||||
|
||||
strncpy ( pTable->m_tStats.m_sLastMessage, sMessage, sizeof(pTable->m_tStats.m_sLastMessage) );
|
||||
strncpy ( pTable->m_tStats.m_sLastMessage, sMessage, sizeof pTable->m_tStats.m_sLastMessage - 1 );
|
||||
pTable->m_tStats.m_sLastMessage[sizeof pTable->m_tStats.m_sLastMessage - 1] = '\0';
|
||||
SafeDeleteArray ( sMessage );
|
||||
|
||||
if ( uRespStatus!=SEARCHD_WARNING )
|
||||
|
|
Loading…
Add table
Reference in a new issue