Skip to content

Commit 7d657fd

Browse files
vuvovavuvova
committed
Merge branch '10.11 into 11.4
2 parents 5be38d1 + e69f8ca commit 7d657fd

344 files changed

Lines changed: 9064 additions & 2397 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,9 @@ IF(UNIX)
507507
ADD_SUBDIRECTORY(man)
508508
ENDIF()
509509

510-
INCLUDE(cmake/abi_check.cmake)
510+
IF (NOT WITHOUT_ABI_CHECK)
511+
INCLUDE(cmake/abi_check.cmake)
512+
ENDIF()
511513
INCLUDE(cmake/tags.cmake)
512514
INCLUDE(for_clients)
513515
ADD_SUBDIRECTORY(scripts)

‎client/mysqlbinlog.cc‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ static Server_gtid_event_filter *server_id_gtid_filter= NULL;
162162

163163
static char *start_datetime_str, *stop_datetime_str;
164164
static my_time_t start_datetime= 0, stop_datetime= MY_TIME_T_MAX;
165+
static my_time_t last_processed_datetime= MY_TIME_T_MAX;
166+
165167
static ulonglong rec_count= 0;
166168
static MYSQL* mysql = NULL;
167169
static const char* dirname_for_local_load= 0;
@@ -867,6 +869,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
867869
DBUG_ENTER("process_event");
868870
Exit_status retval= OK_CONTINUE;
869871
IO_CACHE *const head= &print_event_info->head_cache;
872+
my_time_t ev_when= ev->when;
870873

871874
/*
872875
We use Gtid_list_log_event information to determine if there is missing
@@ -1367,6 +1370,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
13671370
end:
13681371
rec_count++;
13691372
end_skip_count:
1373+
last_processed_datetime= ev_when;
13701374

13711375
DBUG_PRINT("info", ("end event processing"));
13721376
/*
@@ -2924,6 +2928,7 @@ static Exit_status check_header(IO_CACHE* file,
29242928
uchar buf[PROBE_HEADER_LEN];
29252929
my_off_t tmp_pos, pos;
29262930
MY_STAT my_file_stat;
2931+
int read_error;
29272932

29282933
delete glob_description_event;
29292934
if (!(glob_description_event= new Format_description_log_event(4)))
@@ -3006,7 +3011,8 @@ static Exit_status check_header(IO_CACHE* file,
30063011
Format_description_log_event *new_description_event;
30073012
my_b_seek(file, tmp_pos); /* seek back to event's start */
30083013
if (!(new_description_event= (Format_description_log_event*)
3009-
Log_event::read_log_event(file, glob_description_event,
3014+
Log_event::read_log_event(file, &read_error,
3015+
glob_description_event,
30103016
opt_verify_binlog_checksum)))
30113017
/* EOF can't be hit here normally, so it's a real error */
30123018
{
@@ -3039,7 +3045,8 @@ static Exit_status check_header(IO_CACHE* file,
30393045
{
30403046
Log_event *ev;
30413047
my_b_seek(file, tmp_pos); /* seek back to event's start */
3042-
if (!(ev= Log_event::read_log_event(file, glob_description_event,
3048+
if (!(ev= Log_event::read_log_event(file, &read_error,
3049+
glob_description_event,
30433050
opt_verify_binlog_checksum)))
30443051
{
30453052
/* EOF can't be hit here normally, so it's a real error */
@@ -3079,7 +3086,6 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
30793086
IO_CACHE cache,*file= &cache;
30803087
uchar tmp_buff[BIN_LOG_HEADER_SIZE];
30813088
Exit_status retval= OK_CONTINUE;
3082-
my_time_t last_ev_when= MY_TIME_T_MAX;
30833089

30843090
if (logname && strcmp(logname, "-") != 0)
30853091
{
@@ -3153,8 +3159,10 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
31533159
{
31543160
char llbuff[21];
31553161
my_off_t old_off = my_b_tell(file);
3162+
int read_error;
31563163

3157-
Log_event* ev = Log_event::read_log_event(file, glob_description_event,
3164+
Log_event* ev = Log_event::read_log_event(file, &read_error,
3165+
glob_description_event,
31583166
opt_verify_binlog_checksum);
31593167
if (!ev)
31603168
{
@@ -3163,15 +3171,15 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
31633171
about a corruption, but treat it as EOF and move to the next binlog.
31643172
*/
31653173
if (glob_description_event->flags & LOG_EVENT_BINLOG_IN_USE_F)
3166-
file->error= 0;
3167-
else if (file->error)
3174+
read_error= 0;
3175+
else if (read_error)
31683176
{
31693177
error("Could not read entry at offset %s: "
31703178
"Error in log format or read error.",
31713179
llstr(old_off,llbuff));
31723180
goto err;
31733181
}
3174-
// else file->error == 0 means EOF, that's OK, we break in this case
3182+
// else read_error == 0 means EOF, that's OK, we break in this case
31753183

31763184
/*
31773185
Emit a warning in the event that we finished processing input
@@ -3185,21 +3193,8 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
31853193
"end of input", stop_position);
31863194
}
31873195

3188-
/*
3189-
Emit a warning in the event that we finished processing input
3190-
before reaching the boundary indicated by --stop-datetime.
3191-
*/
3192-
if (stop_datetime != MY_TIME_T_MAX &&
3193-
stop_datetime > last_ev_when)
3194-
{
3195-
retval = OK_STOP;
3196-
warning("Did not reach stop datetime '%s' "
3197-
"before end of input", stop_datetime_str);
3198-
}
3199-
32003196
goto end;
32013197
}
3202-
last_ev_when= ev->when;
32033198
if ((retval= process_event(print_event_info, ev, old_off, logname)) !=
32043199
OK_CONTINUE)
32053200
goto end;
@@ -3378,6 +3373,11 @@ int main(int argc, char** argv)
33783373
start_position= BIN_LOG_HEADER_SIZE;
33793374
}
33803375

3376+
if (stop_datetime != MY_TIME_T_MAX &&
3377+
stop_datetime > last_processed_datetime)
3378+
warning("Did not reach stop datetime '%s' before end of input",
3379+
stop_datetime_str);
3380+
33813381
/*
33823382
If enable flashback, need to print the events from the end to the
33833383
beginning

‎client/mysqldump.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3266,7 +3266,7 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
32663266

32673267
fprintf(sql_file,
32683268
"SET @saved_cs_client = @@character_set_client;\n"
3269-
"SET character_set_client = utf8;\n"
3269+
"SET character_set_client = utf8mb4;\n"
32703270
"/*!50001 CREATE VIEW %s AS SELECT\n",
32713271
result_table);
32723272

@@ -3334,7 +3334,7 @@ static uint get_table_structure(const char *table, const char *db, char *table_t
33343334
{
33353335
fprintf(sql_file,
33363336
"/*!40101 SET @saved_cs_client = @@character_set_client */;\n"
3337-
"/*!40101 SET character_set_client = utf8 */;\n"
3337+
"/*!40101 SET character_set_client = utf8mb4 */;\n"
33383338
"%s%s;\n"
33393339
"/*!40101 SET character_set_client = @saved_cs_client */;\n",
33403340
is_log_table ? "CREATE TABLE IF NOT EXISTS " : "",

‎cmake/build_configurations/mysql_release.cmake‎

Lines changed: 69 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -173,30 +173,40 @@ IF(UNIX)
173173
# Default GCC flags
174174
IF(CMAKE_COMPILER_IS_GNUCC)
175175
SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized")
176-
SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}")
177-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
176+
STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}")
177+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${COMMON_C_FLAGS}")
178+
STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${COMMON_C_FLAGS}")
179+
# MariaDB uses -O3 for release builds
180+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
181+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
178182
ENDIF()
179183
IF(CMAKE_COMPILER_IS_GNUCXX)
180184
SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized")
181-
SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}")
182-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
185+
STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}")
186+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${COMMON_CXX_FLAGS}")
187+
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMMON_CXX_FLAGS}")
188+
# MariaDB uses -O3 for release builds
189+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
190+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
183191
ENDIF()
184192

185193
# IBM Z flags
186194
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
187195
IF(RPM MATCHES "(rhel|centos)6" OR RPM MATCHES "(suse|sles)11")
188-
SET(z_flags "-funroll-loops -march=z9-109 -mtune=z10 ")
196+
SET(z_flags "-funroll-loops -march=z9-109 -mtune=z10")
189197
ELSEIF(RPM MATCHES "(rhel|centos)7" OR RPM MATCHES "(suse|sles)12")
190-
SET(z_flags "-funroll-loops -march=z196 -mtune=zEC12 ")
198+
SET(z_flags "-funroll-loops -march=z196 -mtune=zEC12")
191199
ELSE()
192200
SET(z_flags "")
193201
ENDIF()
194202

195203
IF(CMAKE_COMPILER_IS_GNUCC)
196-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${z_flags}${CMAKE_C_FLAGS_RELWITHDEBINFO}")
204+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${z_flags}")
205+
STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${z_flags}")
197206
ENDIF()
198207
IF(CMAKE_COMPILER_IS_GNUCXX)
199-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${z_flags}${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
208+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${z_flags}")
209+
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${z_flags}")
200210
ENDIF()
201211
UNSET(z_flags)
202212
ENDIF()
@@ -207,11 +217,13 @@ IF(UNIX)
207217
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
208218
SET(COMMON_C_FLAGS "+DSitanium2 -mt -AC99")
209219
SET(COMMON_CXX_FLAGS "+DSitanium2 -mt -Aa")
210-
SET(CMAKE_C_FLAGS_DEBUG "+O0 -g ${COMMON_C_FLAGS}")
211-
SET(CMAKE_CXX_FLAGS_DEBUG "+O0 -g ${COMMON_CXX_FLAGS}")
212-
# We have seen compiler bugs with optimisation and -g, so disabled for now
213-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "+O2 ${COMMON_C_FLAGS}")
214-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "+O2 ${COMMON_CXX_FLAGS}")
220+
STRING(APPEND CMAKE_C_FLAGS_DEBUG " +O0 -g ${COMMON_C_FLAGS}")
221+
STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " +O0 -g ${COMMON_CXX_FLAGS}")
222+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " +O0 -g ${COMMON_C_FLAGS}")
223+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " +O0 -g ${COMMON_CXX_FLAGS}")
224+
# We have seen compiler bugs with optimisation and -g, so disabled for now
225+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " +O2 ${COMMON_C_FLAGS}")
226+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " +O2 ${COMMON_CXX_FLAGS}")
215227
ENDIF()
216228
ENDIF()
217229
SET(WITH_SSL no)
@@ -226,24 +238,40 @@ IF(UNIX)
226238
SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -no-ftz -no-prefetch")
227239
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -no-ftz -no-prefetch")
228240
ENDIF()
229-
SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
230-
SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
231-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_C_FLAGS}")
232-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_CXX_FLAGS}")
241+
STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}")
242+
STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}")
243+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " -unroll2 -ip ${COMMON_C_FLAGS}")
244+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " -unroll2 -ip ${COMMON_CXX_FLAGS}")
245+
STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -unroll2 -ip ${COMMON_C_FLAGS}")
246+
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -unroll2 -ip ${COMMON_CXX_FLAGS}")
247+
248+
# MariaDB uses -O3 for release builds.
249+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
250+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
251+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
252+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
233253
SET(WITH_SSL no)
234254
ENDIF()
235255
ENDIF()
236256

237257
# Default Clang flags
238258
IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
239259
SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-parentheses-equality -Wno-string-plus-int")
240-
SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
241-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
260+
STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}")
261+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${COMMON_C_FLAGS}")
262+
STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${COMMON_C_FLAGS}")
263+
# MariaDB uses -O3 for release builds.
264+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
265+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
242266
ENDIF()
243267
IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
244268
SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-parentheses-equality -Wno-string-plus-int")
245-
SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
246-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
269+
STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}")
270+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${COMMON_CXX_FLAGS}")
271+
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMMON_CXX_FLAGS}")
272+
# MariaDB uses -O3 for release builds.
273+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
274+
STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
247275
ENDIF()
248276

249277
# Solaris flags
@@ -256,27 +284,33 @@ IF(UNIX)
256284
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
257285
SET(COMMON_C_FLAGS "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic")
258286
SET(COMMON_CXX_FLAGS "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic")
259-
SET(CMAKE_C_FLAGS_DEBUG "-xO1 ${COMMON_C_FLAGS}")
260-
SET(CMAKE_CXX_FLAGS_DEBUG "-xO1 ${COMMON_CXX_FLAGS}")
287+
STRING(APPEND CMAKE_C_FLAGS_DEBUG " -xO1 ${COMMON_C_FLAGS}")
288+
STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " -xO1 ${COMMON_CXX_FLAGS}")
261289
IF(32BIT)
262-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO2 ${COMMON_C_FLAGS}")
263-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO2 ${COMMON_CXX_FLAGS}")
290+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " -xO2 ${COMMON_C_FLAGS}")
291+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " -xO2 ${COMMON_CXX_FLAGS}")
292+
STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -xO2 ${COMMON_C_FLAGS}")
293+
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO2 ${COMMON_CXX_FLAGS}")
264294
ELSEIF(64BIT)
265-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}")
266-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
295+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " -xO3 ${COMMON_C_FLAGS}")
296+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " -xO3 ${COMMON_CXX_FLAGS}")
297+
STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_C_FLAGS}")
298+
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_CXX_FLAGS}")
267299
ENDIF()
268-
ELSE()
300+
ELSE()
269301
# Assume !x86 is SPARC
270302
SET(COMMON_C_FLAGS "-g -Xa -xstrconst -mt")
271303
SET(COMMON_CXX_FLAGS "-g0 -noex -mt")
272304
IF(32BIT)
273-
SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -xarch=sparc")
274-
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -xarch=sparc")
275-
ENDIF()
276-
SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}")
277-
SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}")
278-
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}")
279-
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}")
305+
STRING(APPEND COMMON_C_FLAGS " -xarch=sparc")
306+
STRING(APPEND COMMON_CXX_FLAGS " -xarch=sparc")
307+
ENDIF()
308+
STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}")
309+
STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}")
310+
STRING(APPEND CMAKE_C_FLAGS_RELEASE " -xO3 ${COMMON_C_FLAGS}")
311+
STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " -xO3 ${COMMON_CXX_FLAGS}")
312+
STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_C_FLAGS}")
313+
STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_CXX_FLAGS}")
280314
ENDIF()
281315
ENDIF()
282316
ENDIF()

‎debian/additions/debian-start‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ then
2222
. /etc/default/mariadb
2323
fi
2424

25-
MARIADB="/usr/bin/mariadb --defaults-file=/etc/mysql/debian.cnf"
26-
MYADMIN="/usr/bin/mariadb-admin --defaults-file=/etc/mysql/debian.cnf"
25+
MARIADB="/usr/bin/mariadb --defaults-extra-file=/etc/mysql/debian.cnf"
26+
MYADMIN="/usr/bin/mariadb-admin --defaults-extra-file=/etc/mysql/debian.cnf"
2727
# Don't run full mariadb-upgrade on every server restart, use --version-check to do it only once
2828
MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent"
2929
MYCHECK_SUBJECT="WARNING: mariadb-check has found corrupt tables"

‎extra/wolfssl/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ if(MSVC)
130130
if(CMAKE_C_COMPILER_ID MATCHES Clang)
131131
target_compile_options(wolfssl PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-incompatible-function-pointer-types>)
132132
endif()
133+
remove_definitions(-DHAVE_CONFIG_H)
134+
target_compile_definitions(wolfssl PRIVATE
135+
WOLFSSL_HAVE_MIN WOLFSSL_HAVE_MAX)
133136
endif()
134137

135138
CONFIGURE_FILE(user_settings.h.in user_settings.h)

‎extra/wolfssl/user_settings.h.in‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,21 @@
33

44
#define HAVE_CRL
55
#define WOLFSSL_HAVE_ERROR_QUEUE
6+
7+
/*
8+
Workaround bug in 5.7.6
9+
WOLFSSL_MYSQL_COMPATIBLE breaks building wolfssl
10+
11+
But it is needed to avoid redefinition of protocol_version
12+
when its public header ssl.h is included
13+
*/
14+
#ifndef BUILDING_WOLFSSL
615
#define WOLFSSL_MYSQL_COMPATIBLE
16+
#endif
17+
18+
#define SP_INT_BITS 8192
19+
#define HAVE_EMPTY_AGGREGATES 0
20+
721
#define HAVE_ECC
822
#define ECC_TIMING_RESISTANT
923
#define HAVE_HASHDRBG
@@ -24,7 +38,8 @@
2438
#define HAVE_THREAD_LS
2539
#define WOLFSSL_AES_COUNTER
2640
#define NO_WOLFSSL_STUB
27-
#define OPENSSL_ALL
41+
// #define OPENSSL_ALL
42+
#define OPENSSL_EXTRA
2843
#define WOLFSSL_ALLOW_TLSV10
2944
#define NO_OLD_TIMEVAL_NAME
3045
#define HAVE_SECURE_RENEGOTIATION

‎extra/wolfssl/wolfssl‎

Submodule wolfssl updated 1576 files

0 commit comments

Comments
 (0)