diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-26 15:26:06 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-26 15:26:06 +0200 |
| commit | 4519b42e61ba2cac248a2238f63113a739661590 (patch) | |
| tree | 802c88ad7cdc5cda175e90802dbfee07f18f3e86 /storage/federatedx/ha_federatedx.cc | |
| parent | f90d9c347fdac35720f874070797559ede066598 (diff) | |
| parent | 29633dc0c0c49f27ad3c9a405f4730fbfef4bbb0 (diff) | |
| download | mariadb-git-4519b42e61ba2cac248a2238f63113a739661590.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'storage/federatedx/ha_federatedx.cc')
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index cfb8918ed11..468d3fa2934 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -315,6 +315,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define MYSQL_SERVER 1 #include <my_global.h> #include <mysql/plugin.h> +#include <mysql.h> #include "ha_federatedx.h" #include "sql_servers.h" #include "sql_analyse.h" // append_escaped() @@ -610,7 +611,7 @@ error: parse_url() mem_root MEM_ROOT pointer for memory allocation share pointer to FEDERATEDX share - table pointer to current TABLE class + table_s pointer to current TABLE_SHARE class table_create_flag determines what error to throw DESCRIPTION |