diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-27 09:39:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-27 09:39:15 +0200 |
| commit | 53aabda6b5ac6af989a97a00ff97efda9ff8772e (patch) | |
| tree | 95867fd8cf7284dd7b2da1882182ceedffbbe683 /storage/federatedx | |
| parent | f614b6ea6112c219581ffc35e753bc1dab48483a (diff) | |
| parent | ba679ae52f0e9d698c1b36d28a5bc8c233e57a2e (diff) | |
| download | mariadb-git-53aabda6b5ac6af989a97a00ff97efda9ff8772e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/federatedx')
| -rw-r--r-- | storage/federatedx/federatedx_pushdown.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/federatedx/federatedx_pushdown.cc b/storage/federatedx/federatedx_pushdown.cc index 2701436ccf5..664f0570238 100644 --- a/storage/federatedx/federatedx_pushdown.cc +++ b/storage/federatedx/federatedx_pushdown.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2019 MariaDB + Copyright (c) 2019, 2020, MariaDB 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 @@ -295,10 +295,8 @@ int ha_federatedx_select_handler::end_scan() DBUG_RETURN(0); } -\ + void ha_federatedx_select_handler::print_error(int error, myf error_flag) { select_handler::print_error(error, error_flag); } - - |