summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-0/+1
|\
| * MDEV-12824 GCC 7 warning: this statement may fall through ↵Sergei Golubchik2017-07-201-0/+1
| | | | | | | | [-Wimplicit-fallthrough=]
* | Merge 10.0 into 10.1Marko Mäkelä2017-05-231-5/+6
|\ \ | |/
| * MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-191-5/+6
| | | | | | | | | | uploaded 10.0, analyzed everything with the Impact=High (and a couple of Medium)
* | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-2/+2
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-2/+2
| |\
| | * respect client's desire to force ssl even when WITH_SSL=NOSergei Golubchik2017-04-201-2/+2
| | | | | | | | | | | | | | | of course, this combination can never succeed, we must fail to connect here.
* | | MDEV-10594 SSL hostname verification fails for SubjectAltNamesSergei Golubchik2017-04-271-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | use X509_check_host for OpenSSL 1.0.2+ This adds: * support for subjectAltNames * wildcards * sub-domain matching
* | | bugfix: federated/replication did not increment bytes_received status variableSergei Golubchik2017-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because mysql->net.thd was reset to NULL in mysql_real_connect() and thd_increment_bytes_received() didn't do anything. Fix: * set mysql->net.thd to current_thd instread. * remove the test for non-null THD from a very often used function thd_increment_bytes_received().
* | | don't do vio_description(NULL)Sergei Golubchik2017-03-101-1/+1
| | | | | | | | | | | | this fixes the crash of innodb.innodb-blob --ps-protocol
* | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-9/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Also, implement MDEV-11027 a little differently from 5.5 and 10.0: recv_apply_hashed_log_recs(): Change the return type back to void (DB_SUCCESS was always returned). Report progress also via systemd using sd_notifyf().
| * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-9/+2
| |\ \ | | |/
| | * MDEV-11933 Wrong usage of linked list in mysql_prune_stmt_listSergei Golubchik2017-02-271-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | mysql_prune_stmt_list() was walking the list following element->next pointers, but inside the loop it was invoking list_add(element) that modified element->next. So, mysql_prune_stmt_list() failed to visit and reset all elements, and some of them were left with pointers to invalid MYSQL.
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-253-4/+11
|\ \ \ | |/ /
| * | Fixed compiler error and some warnings on windowsMonty2016-08-231-2/+2
| | |
| * | MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0Oleksandr Byelkin2016-08-162-2/+7
| | | | | | | | | | | | fix for async operations
| * | MDEV-10455: libmariadbclient18 + MySQL-python leaks memory on failed connectionsOleksandr Byelkin2016-08-111-1/+3
| | | | | | | | | | | | Support of CLIENT_REMEMBER_OPTIONS and freeing options added.
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-15/+31
|\ \ \ | |/ /
| * | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-15/+31
| |\ \ | | |/
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-4/+18
| | |\
| | | * Bug#21920657: SSL-CA FAILS SILENTLY IF THE PATH CANNOT BEArun Kuruvila2016-03-011-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FOUND Description:- Failure during the validation of CA certificate path which is provided as an option for 'ssl-ca' returns two different errors for YaSSL and OPENSSL. Analysis:- 'ssl-ca', option used for specifying the ssl ca certificate path. Failing to validate this certificate with OPENSSL returns an error, "ERROR 2026 (HY000): SSL connection error: SSL_CTX_set_default_verify_paths failed". While YASSL returns "ERROR 2026 (HY000): SSL connection error: ASN: bad other signature confirmation". Error returned by the OPENSSL is correct since "SSL_CTX_load_verify_locations()" returns 0 (in case of OPENSSL) for the failure and sets error as "SSL_INITERR_BAD_PATHS". In case of YASSL, "SSL_CTX_load_verify_locations()" returns an error number which is less than or equal to 0 in case of error. Error numbers for YASSL is mentioned in the file, 'extra/yassl/include/openssl/ssl.h'(line no : 292). Also 'ssl-ca' does not accept tilde home directory path substitution. Fix:- The condition which checks for the error in the "SSL_CTX_load_verify_locations()" is changed in order to accommodate YASSL as well. A logic is written in "mysql_ssl_set()" in order accept the tilde home directory path substitution for all ssl options.
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-212-7/+7
|\ \ \ \ | |/ / /
| * | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-042-7/+7
| | | |
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-32/+57
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-32/+57
| |\ \ \ | | |/ /
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-32/+57
| | |\ \ | | | |/ | | | | | | | | | | | | reverted about half of commits as either not applicable or outright wrong
| | | * Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITMYashwant Sahu2016-01-111-26/+64
| | | |
| * | | Merge MDEV-9112 into 10.0Kristian Nielsen2016-02-011-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: configure.cmake
* | | | Merge MDEV-9112 into 10.1Kristian Nielsen2016-02-011-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: config.h.cmake configure.cmake
| * | | MDEV-9112: Non-blocking client API missing on non-x86 platformsGeorg Richter2016-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for UCONTEXT in cmake was somehow become broken, disabling the fallback to ucontext. This caused the non-blocking client API to not be available for non-x86 platforms, on which no hand-crafted assembler implementation of my_context is available.
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-27/+28
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-27/+28
| |\ \ \ | | |/ /
| | * | MDEV-9212 ssl-validate-cert incorrect hostname checkSergei Golubchik2015-12-081-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reimplement ssl_verify_server_cert() using the logic from https://wiki.openssl.org/index.php/Hostname_validation The bug was discovered by Alex Gaynor.
| * | | Fixed compiler warningsMonty2015-11-231-4/+0
| | | |
* | | | compilation warningSergei Golubchik2015-11-191-4/+0
| | | |
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-185/+4
|\ \ \ \ | |/ / /
| * | | MDEV-9041 connect-timeout has no effect on WindowsVladislav Vaintroub2015-11-051-185/+4
| | | | | | | | | | | | | | | | | | | | Replaced my_connect() with cross-plattform, timeout aware vio_socket_connect() function
* | | | MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | Part 5: Removing calls to current_thd in net_read calls, creating fields, query_cache, acl and some other places where thd was available
* | | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-272-17/+21
|\ \ \ \ | |/ / /
| * | | MDEV-8205 timediff returns null when comparing decimal time to time string valueAlexander Barkov2015-06-151-10/+2
| | | |
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-7/+19
| |\ \ \ | | |/ /
| | * | MDEV-7937: Enforce SSL when --ssl client option is usedVicențiu Ciorbaru2015-06-091-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | Using --ssl-verify-server-cert and --ssl[-*] implies that the ssl connection is required. The mysql client will now print an error if ssl is required, but the server can not handle a ssl connection.
* | | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-2/+10
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-2/+10
| |\ \ \ | | |/ /
| | * | MDEV-7859 SSL hostname verification fails for long subject namesSergei Golubchik2015-04-271-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use a fixed buffer for X509_NAME_oneline() in the client. Do as the server does - allocate it dynamically. For a test - regenerate certificates to have the server cert with a long subject.
* | | | MDEV-6650 - LINT_INIT emits code in non-debug buildsSergey Vojtovich2015-03-161-2/+1
| | | | | | | | | | | | | | | | | | | | Replaced all references to LINT_INIT with UNINIT_VAR and LINT_INIT_STRUCT. Removed LINT_INIT macro.
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-2/+2
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'bzr/5.5' into bb-5.5-mergeSergei Golubchik2015-02-121-0/+5
| | |\ \
| | | * | MDEV-7435 Windows debug: Run-Time Check Failure #3 - The variable 'unused' ↵Alexey Botchkov2015-02-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is being used without being initialized. Fixed as it's done in 10.0.
View Lorry Controller Status