database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-07 17:42:39 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-04-05 10:08:44 +03:00
parent 8c919330a7 6a3545dd1e
commit 8d9c2561cd
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/mariabackup/binlog.result
View File

@@ -3,6 +3,6 @@ INSERT INTO t VALUES(1);
SHOW VARIABLES like 'log_bin'; SHOW VARIABLES like 'log_bin';
Variable_name Value Variable_name Value
log_bin ON log_bin ON
FOUND 1 /Last binlog file .*, position .*/ in current_test FOUND 1 /Last binlog file .+, position \d+/ in current_test
# expect FOUND # expect FOUND
DROP TABLE t; DROP TABLE t;

2
mysql-test/suite/mariabackup/binlog.test
View File

@@ -15,7 +15,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir
exec $XTRABACKUP --prepare --binlog-info=1 --target-dir=$basedir ; exec $XTRABACKUP --prepare --binlog-info=1 --target-dir=$basedir ;
let SEARCH_FILE=$MYSQLTEST_VARDIR/log/current_test; let SEARCH_FILE=$MYSQLTEST_VARDIR/log/current_test;
--let SEARCH_PATTERN= Last binlog file .*, position .* --let SEARCH_PATTERN= Last binlog file .+, position \d+
--source include/search_pattern_in_file.inc --source include/search_pattern_in_file.inc
--echo # expect FOUND --echo # expect FOUND

5
storage/innobase/include/univ.i
View File

@@ -363,22 +363,19 @@ typedef ssize_t lint;
#ifdef _WIN32 #ifdef _WIN32
/* Use the integer types and formatting strings defined in Visual Studio. */ /* Use the integer types and formatting strings defined in Visual Studio. */
# define UINT32PF "%u" # define UINT32PF "%u"
# define INT64PF "%lld"
# define UINT64scan "llu" # define UINT64scan "llu"
# define UINT64PFx "%016llx" # define UINT64PFx "%016llx"
#elif defined __APPLE__ #elif defined __APPLE__
/* Apple prefers to call the 64-bit types 'long long' /* Apple prefers to call the 64-bit types 'long long'
in both 32-bit and 64-bit environments. */ in both 32-bit and 64-bit environments. */
# define UINT32PF "%" PRIu32 # define UINT32PF "%" PRIu32
# define INT64PF "%lld"
# define UINT64scan "llu" # define UINT64scan "llu"
# define UINT64PFx "%016llx" # define UINT64PFx "%016llx"
#elif defined _AIX #elif defined _AIX
/* Workaround for macros expension trouble */ /* Workaround for macros expension trouble */
# define UINT32PF "%u" # define UINT32PF "%u"
# define INT64PF "%lld"
# define UINT64scan "lu" # define UINT64scan "lu"
# define UINT64PFx "%016llx" # define UINT64PFx "%016lx"
#else #else
/* Use the integer types and formatting strings defined in the C99 standard. */ /* Use the integer types and formatting strings defined in the C99 standard. */
# define UINT32PF "%" PRIu32 # define UINT32PF "%" PRIu32

5
storage/innobase/srv/srv0start.cc
View File

@@ -1461,10 +1461,9 @@ file_checked:
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
return srv_init_abort(err); return srv_init_abort(err);
} }
if (srv_operation == SRV_OPERATION_RESTORE) { if (srv_operation != SRV_OPERATION_RESTORE) {
break; dict_sys.load_sys_tables();
} }
dict_sys.load_sys_tables();
err = trx_lists_init_at_db_start(); err = trx_lists_init_at_db_start();
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
return srv_init_abort(err); return srv_init_abort(err);