diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
| commit | e6bdf77e4be48750c4808a09af197ed91fd69a61 (patch) | |
| tree | 2ca921747b9ae7b01835efe9609799b27efb1387 /client | |
| parent | 1599825ffc2c942f8b63274a9556b425229375c7 (diff) | |
| parent | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (diff) | |
| download | mariadb-git-e6bdf77e4be48750c4808a09af197ed91fd69a61.tar.gz | |
Merge 10.3 into 10.4
In is_eits_usable(), we disable an assertion that fails due to
MDEV-19334.
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index ff6422d15da..e9640fd4365 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2008, 2018, MariaDB Corporation +# Copyright (c) 2008, 2019, MariaDB Corporation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |