diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-05 10:08:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-05 10:08:44 +0300 |
| commit | 8d9c2561cd131a4a0a40c3852f43717508733908 (patch) | |
| tree | 404cac93d6fb866416c9b8e75bcd0a2d0f361d65 | |
| parent | 8c919330a71197fb77bb5dadd56ea8c2f25be06f (diff) | |
| parent | 6a3545dd1e3a7fdf63ac22ad049fd7763f35a13e (diff) | |
| download | mariadb-git-8d9c2561cd131a4a0a40c3852f43717508733908.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | mysql-test/suite/mariabackup/binlog.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/binlog.test | 2 | ||||
| -rw-r--r-- | storage/innobase/include/univ.i | 5 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 5 |
4 files changed, 5 insertions, 9 deletions
diff --git a/mysql-test/suite/mariabackup/binlog.result b/mysql-test/suite/mariabackup/binlog.result index 4f8ed4185ce..7851c2ba069 100644 --- a/mysql-test/suite/mariabackup/binlog.result +++ b/mysql-test/suite/mariabackup/binlog.result @@ -3,6 +3,6 @@ INSERT INTO t VALUES(1); SHOW VARIABLES like 'log_bin'; Variable_name Value log_bin ON -FOUND 1 /Last binlog file .*, position .*/ in current_test +FOUND 1 /Last binlog file .+, position \d+/ in current_test # expect FOUND DROP TABLE t; diff --git a/mysql-test/suite/mariabackup/binlog.test b/mysql-test/suite/mariabackup/binlog.test index b2f08c2d7bb..9d62e5f8d6b 100644 --- a/mysql-test/suite/mariabackup/binlog.test +++ b/mysql-test/suite/mariabackup/binlog.test @@ -15,7 +15,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir exec $XTRABACKUP --prepare --binlog-info=1 --target-dir=$basedir ; 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 --echo # expect FOUND diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 231dad704df..a5ad43a58ae 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -363,22 +363,19 @@ typedef ssize_t lint; #ifdef _WIN32 /* Use the integer types and formatting strings defined in Visual Studio. */ # define UINT32PF "%u" -# define INT64PF "%lld" # define UINT64scan "llu" # define UINT64PFx "%016llx" #elif defined __APPLE__ /* Apple prefers to call the 64-bit types 'long long' in both 32-bit and 64-bit environments. */ # define UINT32PF "%" PRIu32 -# define INT64PF "%lld" # define UINT64scan "llu" # define UINT64PFx "%016llx" #elif defined _AIX /* Workaround for macros expension trouble */ # define UINT32PF "%u" -# define INT64PF "%lld" # define UINT64scan "lu" -# define UINT64PFx "%016llx" +# define UINT64PFx "%016lx" #else /* Use the integer types and formatting strings defined in the C99 standard. */ # define UINT32PF "%" PRIu32 diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index b1ccde981a3..24ef6ed8b9a 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -1461,10 +1461,9 @@ file_checked: if (err != DB_SUCCESS) { return srv_init_abort(err); } - if (srv_operation == SRV_OPERATION_RESTORE) { - break; + if (srv_operation != SRV_OPERATION_RESTORE) { + dict_sys.load_sys_tables(); } - dict_sys.load_sys_tables(); err = trx_lists_init_at_db_start(); if (err != DB_SUCCESS) { return srv_init_abort(err); |