From 8c5d64dafb3051749f3762cbad88553568abbb16 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 2 Jul 2018 15:22:52 +0100 Subject: Post-fix after MDEV-8540 - do not close stdin on Windows. It is not open. --- sql/mysqld.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sql/mysqld.cc') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d760986a303..75d6cca7fda 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5149,8 +5149,10 @@ int win_main(int argc, char **argv) int mysqld_main(int argc, char **argv) #endif { +#ifndef _WIN32 /* We can't close stdin just now, because it may be booststrap mode. */ bool please_close_stdin= fcntl(STDIN_FILENO, F_GETFD) >= 0; +#endif /* Perform basic thread library and malloc initialization, @@ -5495,9 +5497,12 @@ int mysqld_main(int argc, char **argv) (char*) "" : mysqld_unix_port), mysqld_port, MYSQL_COMPILATION_COMMENT); +#ifndef _WIN32 /* Only close stdin if it was open initinally. */ if (please_close_stdin) fclose(stdin); +#endif + #if defined(_WIN32) && !defined(EMBEDDED_LIBRARY) Service.SetRunning(); #endif -- cgit v1.2.1 From a0d33dc6ef6f380fb5a2d166e75ed6fed2dfce9d Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Fri, 20 Jul 2018 13:35:58 +0200 Subject: MDEV-16689: core-file should become a real server variable Mysql Bug#56124 bug analog fix using Sys_var_bit. --- sql/mysqld.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/mysqld.cc') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0f5147c8cf1..1e6e144ccff 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -482,7 +482,7 @@ my_bool opt_master_verify_checksum= 0; my_bool opt_slave_sql_verify_checksum= 1; const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS}; volatile sig_atomic_t calling_initgroups= 0; /**< Used in SIGSEGV handler. */ -uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options; +uint mysqld_port, select_errors, dropping_tables, ha_open_options; uint mysqld_extra_port; uint mysqld_port_timeout; ulong delay_key_write_options; @@ -509,6 +509,7 @@ ulonglong max_binlog_cache_size=0; ulong slave_max_allowed_packet= 0; ulonglong binlog_stmt_cache_size=0; ulonglong max_binlog_stmt_cache_size=0; +ulonglong test_flags; ulonglong query_cache_size=0; ulong query_cache_limit=0; ulong executed_events=0; -- cgit v1.2.1 From 3f4274f8cdbd23217065131c62b376ee1095bb5b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 8 Aug 2018 17:39:45 +0200 Subject: SLES11 OpenSSL 0.9.8 support --- sql/mysqld.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/mysqld.cc') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 8e2884e2048..2ad4e6f2a61 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8195,7 +8195,7 @@ my_asn1_time_to_string(const ASN1_TIME *time, char *buf, size_t len) if (bio == NULL) return NULL; - if (!ASN1_TIME_print(bio, time)) + if (!ASN1_TIME_print(bio, const_cast(time))) goto end; n_read= BIO_read(bio, buf, (int) (len - 1)); -- cgit v1.2.1