summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Collapse)AuthorAgeFilesLines
* Added name to MEM_ROOT for esier debuggingMonty2018-02-022-3/+3
| | | | | | | | | | | | | This will make it easier to how memory allocation is done when debugging with either DBUG or gdb. Will especially help when debugging stored procedures Main change is a name argument as second argument to init_alloc_root() init_sql_alloc() Other things: - Added DBUG_ENTER/EXIT to some Virtual_tmp_table functions
* Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-221-2/+5
|\
| * MDEV-14265 - RPMLint warning: shared-lib-calls-exitSergey Vojtovich2017-12-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_type_or_exit() client helper did exit(1) on error, exit(1) moved to clients. mysql_read_default_options() did exit(1) on error, error is passed through and handled now. my_str_malloc_default() did exit(1) on error, replaced my_str_ allocator functions with normal my_malloc()/my_realloc()/my_free(). sql_connect.cc did many exit(1) on hash initialisation failure. Removed error check since my_hash_init() never fails. my_malloc() did exit(1) on error. Replaced with abort(). my_load_defaults() did exit(1) on error, replaced with return 2. my_load_defaults() still does exit(0) when invoked with --print-defaults.
* | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-1/+1
|\ \ | |/
| * Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-1/+1
| |\
| | * Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-1/+1
| | |\
| | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-0/+1
| | | | | | | | | | | | | | | | mostly caused by -Wimplicit-fallthrough
* | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-283-10/+10
| | | |
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix win64 pointer truncation warnings (usually coming from misusing 0x%lx and long cast in DBUG) - Also fix printf-format warnings Make the above mentioned warnings fatal. - fix pthread_join on Windows to set return value.
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-0/+1
|\ \ \ \ | |/ / /
| * | | 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.1 into 10.2Marko Mäkelä2017-05-231-5/+6
|\ \ \ \ | |/ / /
| * | | 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)
* | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLSergei Golubchik2017-05-091-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | post-review fixes: * move all ssl implementation related ifdefs/defines to one file (ssl_compat.h) * work around OpenSSL-1.1 desire to malloc every EVP context by run-time checking that context allocated on the stack is big enough (openssl.c) * use newer version of the AWS SDK for OpenSSL 1.1 * use get_dh2048() function as generated by openssl 1.1 (viosslfactories.c)
* | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLGeorg Richter2017-05-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial support tested against OpenSSL 1.0.1, 1.0.2, 1.1.0, Yassl and LibreSSL not working on Windows with native SChannel support, due to wrong cipher mapping: Latter one requires push of CONC-241 fixes. Please note that OpenSSL 0.9.8 and OpenSSL 1.1.0 will not work: Even if the build succeeds, test cases will fail with various errors, especially when using different tls libraries or versions for client and server.
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | Revert commit db0917f68f, because the fix for MDEV-12696 is coming from 5.5 and 10.1 in this merge.
| * | | 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.
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-11/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Also, include fixes by Vladislav Vaintroub to the aws_key_management plugin. The AWS C++ SDK specifically depends on OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
| * | | 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().
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-10/+3
|\ \ \ \ | |/ / /
| * | | 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.
* | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define my_thread_id as an unsigned type, to avoid mismatch with ulonglong. Change some parameters to this type. Use size_t in a few more places. Declare many flag constants as unsigned to avoid sign mismatch when shifting bits or applying the unary ~ operator. When applying the unary ~ operator to enum constants, explictly cast the result to an unsigned type, because enum constants can be treated as signed. In InnoDB, change the source code line number parameters from ulint to unsigned type. Also, make some InnoDB functions return a narrower type (unsigned or uint32_t instead of ulint; bool instead of ibool).
* | | | fix the ABI and stop slave hang problemvinchen2016-10-211-2/+8
| | | |
* | | | buildbot failuresSergei Golubchik2016-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | * update net_field_length() to match the prototype * various bug fixes in C/C
* | | | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-214-5/+33
|\ \ \ \
| * \ \ \ Merge pull request #232 from 0xAX/no-need-to-zero-vio-netSergey Vojtovich2016-09-121-1/+0
| |\ \ \ \ | | | | | | | | | | | | no need to set net->vio to zero in mysql_real_connect
| | * | | | no need to set net->vio to zero in mysql_real_connectAlexander Kuleshov2016-09-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because it is zero always in this place as we have check for this above which checks that net->vio isn't 0 and exit.
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-093-4/+11
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | 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.
| * | | | MDEV-8931: (server part of) session state trackingOleksandr Byelkin2016-08-311-0/+22
| | | | | | | | | | | | | | | | | | | | initial commit to test
* | | | | After-review changesSergei Golubchik2016-09-122-231/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove redundant code * fix tests * move declarations and defines where they belong
* | | | | remove libmysql/Sergei Golubchik2016-09-123-0/+500
| | | | | | | | | | | | | | | | | | | | also disable server's client plugins when C/C has the same
* | | | | MDEV-9293 - Use MariaDB's Connector/C in serverVladislav Vaintroub2016-08-252-6/+12
|/ / / /
* | | | Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-192-12/+6
| | | | | | | | | | | | | | | | This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
* | | | MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-192-6/+12
| | | |
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-15/+31
|\ \ \ \ | |/ / /
| * | | 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
| | | |\
View Lorry Controller Status