Skip to content

Commit 753cbda

Browse files
author
Steinar H. Gunderson
committed
Bug #26927386: REDUCE COMPILATION TIME [noclose]
Pull violite.h out of service_srv_session_info.h. Change-Id: I11b7e0aa0cb6c8678a1b222fda1111ebcf14484a
1 parent 11e1219 commit 753cbda

File tree

9 files changed

+14
-4
lines changed

9 files changed

+14
-4
lines changed

include/mysql/plugin_clone.h

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ API for clone plugin
2929
#define MYSQL_PLUGIN_CLONE_INCLUDED
3030

3131
#include "plugin.h"
32+
#include "violite.h"
3233

3334
/** Clone plugin interface version */
3435
#define MYSQL_CLONE_INTERFACE_VERSION 0x0100

include/mysql/service_srv_session_info.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#ifndef MYSQL_SERVICE_SRV_SESSION_INFO_INCLUDED
22
#define MYSQL_SERVICE_SRV_SESSION_INFO_INCLUDED
3-
/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
3+
/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
44
55
This program is free software; you can redistribute it and/or modify
66
it under the terms of the GNU General Public License, version 2.0,
@@ -35,7 +35,8 @@
3535
#include "my_thread_local.h"
3636
#include "mysql_com.h" /* Vio for violite.h */
3737
#include "plugin.h" /* MYSQL_THD */
38-
#include "violite.h" /* enum_vio_type */
38+
39+
enum enum_vio_type : int;
3940
#endif
4041

4142
extern "C" struct srv_session_info_service_st {

include/violite.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ typedef Vio Vio;
7070
#define MYSQL_VIO Vio *
7171
#endif
7272

73-
enum enum_vio_type {
73+
enum enum_vio_type : int {
7474
/**
7575
Type of the connection is unknown.
7676
*/

plugin/keyring/keyring.cc

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
#include <mysql/components/my_service.h>
2929
#include <mysql/components/services/log_builtins.h>
30+
#include <openssl/err.h>
31+
#include <openssl/ssl.h>
3032
#include "my_compiler.h"
3133
#include "my_inttypes.h"
3234
#include "my_io.h"

plugin/test_service_sql_api/test_session_info.cc

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "mysql/psi/mysql_thread.h"
3838
#include "mysql_com.h"
3939
#include "sql_string.h" /* STRING_PSI_MEMORY_KEY */
40+
#include "violite.h"
4041

4142
#include <mysql/components/my_service.h>
4243
#include <mysql/components/services/log_builtins.h>

sql-common/client_authentication.cc

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
#include <wolfssl_fix_namespace_pollution.h>
5555
#include "mysql/plugin.h"
5656
#include "sha2.h"
57+
#include "violite.h"
5758

5859
#define MAX_CIPHER_LENGTH 1024
5960

sql/clone_handler.cc

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Clone handler implementation
4343
#include "sql/sql_parse.h"
4444
#include "sql/sql_plugin.h" // plugin_unlock
4545
#include "sql_string.h" // to_lex_cstring
46+
#include "violite.h"
4647

4748
class THD;
4849

storage/innobase/handler/ha_innodb.cc

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
122122
#include "lock0lock.h"
123123
#include "mem0mem.h"
124124
#include "mtr0mtr.h"
125+
#include "my_compare.h"
125126
#include "my_dbug.h"
126127
#include "my_double2ulonglong.h"
127128
#include "my_io.h"

vio/viopipe.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -22,6 +22,8 @@
2222

2323
#include "vio_priv.h"
2424

25+
#include "my_dbug.h"
26+
2527
static size_t wait_overlapped_result(Vio *vio, int timeout) {
2628
size_t ret = (size_t)-1;
2729
DWORD transferred, wait_status, timeout_ms;

0 commit comments

Comments
 (0)