diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-17 16:24:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-17 16:24:40 +0200 |
| commit | 7b70cbd8389083eed22bba6526e32ab24dc61083 (patch) | |
| tree | 1fa28e392ab124d50d290336be3f3635efd877cc | |
| parent | 08b0b2b6fb849e7b440bfd104f8121b5d7d819e3 (diff) | |
| parent | c25a0662b3f169340faccbee306f84cefe2ca54e (diff) | |
| download | mariadb-git-7b70cbd8389083eed22bba6526e32ab24dc61083.tar.gz | |
MDEV-21499 Merge new release of InnoDB 5.7.29 to 10.2
| -rw-r--r-- | storage/innobase/include/univ.i | 4 | ||||
| -rw-r--r-- | storage/innobase/os/os0file.cc | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 7635cecbcd3..cb81b68e2ab 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -41,7 +41,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MINOR 7 -#define INNODB_VERSION_BUGFIX 28 +#define INNODB_VERSION_BUGFIX 29 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index b32a2fa77ef..065b3118413 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -1,8 +1,8 @@ /*********************************************************************** -Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2019, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2009, Percona Inc. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Percona Inc.. Those modifications are @@ -1474,6 +1474,12 @@ os_file_get_parent_dir( return(NULL); } + if (last_slash - path < 0) { + /* Sanity check, it prevents gcc from trying to handle this case which + * results in warnings for some optimized builds */ + return (NULL); + } + /* Non-trivial directory component */ return(mem_strdupl(path, last_slash - path)); |