summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-1/+1
|\
| * win32-debug build failureSergei Golubchik2015-01-231-0/+5
| |
| * 5.5 mergeSergei Golubchik2015-01-212-6/+1
| |\
| | * MDEV-6671 mysql_server_end breaks OpenSSLSergei Golubchik2015-01-191-0/+1
| | |
| | * Fixed a couple of compiler warnings.Sergey Vojtovich2014-12-191-5/+0
| | |
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-0/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .bzrignore VERSION cmake/plugin.cmake debian/dist/Debian/control debian/dist/Ubuntu/control mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.result mysql-test/r/null.result mysql-test/r/old-mode.result mysql-test/r/union.result mysql-test/t/join_outer.test mysql-test/t/null.test mysql-test/t/old-mode.test mysql-test/t/union.test packaging/rpm-oel/mysql.spec.in scripts/mysql_config.sh sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/item_cmpfunc.h sql/lock.cc sql/sql_select.cc sql/sql_show.cc sql/sql_update.cc sql/sql_yacc.yy storage/innobase/buf/buf0flu.cc storage/innobase/fil/fil0fil.cc storage/innobase/include/srv0srv.h storage/innobase/lock/lock0lock.cc storage/tokudb/CMakeLists.txt storage/xtradb/buf/buf0flu.cc storage/xtradb/fil/fil0fil.cc storage/xtradb/include/srv0srv.h storage/xtradb/lock/lock0lock.cc support-files/mysql.spec.sh
| * | 5.5.40+ mergeSergei Golubchik2014-10-091-0/+6
| |\ \ | | |/
| | * mysql-5.5.40Sergei Golubchik2014-10-061-0/+6
| | |\
| | | * Bug #18384260: MULTIPLE SECURITY ISSUES IN CERTIFICATE VALIDATIONGeorgi Kodinov2014-07-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | the 5.5 version of the fix. Added a call to X509_verify_cert_error_string() into the client certificate verification code.
* | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-1/+1
|\ \ \ \ | |/ / /
| * | | Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance ↵Michael Widenius2014-07-191-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schema and big packets in debug version. The bug was that my_real_read() called net_before_header_psi() multiple times for long packets. Fixed by adding a flag when we are reading a header. Did also some cleanups to interface of my_net_read() to avoid unnecessary calls if performance schema is not used. - Added my_net_read_packet() as a replacement for my_net_read(). my_net_read() is still in the client library for old clients. - Removed THD->m_server_idle (not needed anymore as this is now given as argument to my_net_read_packet() - Added my_net_read_packet(), which is a new version of my_net_read() with a new parameter if we are doing a read for a new command from the server. - Added tests for compressed protocol and big packets include/mysql.h.pp: Added my_net_read_packet() as a replacement for my_net_read() include/mysql_com.h: Added my_net_read_packet() as a replacement for my_net_read() mysql-test/r/mysql_client_test_comp.result: New test mysql-test/t/mysql_client_test-master.opt: Added max_allowed_packet to be able to test big packets and packet size overflows. mysql-test/t/mysql_client_test_comp-master.opt: New test mysql-test/t/mysql_client_test_nonblock-master.opt: Added max_allowed_packet to be able to test big packets and packet size overflows. sql-common/client.c: Use my_net_read_packet() sql/mf_iocache.cc: Use my_net_read_packet() sql/mysqld.cc: Removed THD->m_server_idle (not needed anymore as this is now given as argument to my_net_read_packet() sql/net_serv.cc: Added argument to my_real_read() to indicte if we are reading the first block of the next statement and should call performance schema. Added 'compatibilty function' my_net_read(). Added my_net_read_packet(), which is a new version of my_net_read() with a new parameter if we are doing a read for a new command from the server. sql/sql_class.cc: Removed m_server_idle (not needed anymore) sql/sql_class.h: Removed m_server_idle (not needed anymore) sql/sql_parse.cc: Removed m_server_idle (not needed anymore) tests/mysql_client_test.c: Added tests for compressed protocol and big packets
* | | 5.5.38 mergeSergei Golubchik2014-06-062-13/+27
|\ \ \ | |/ /
| * | Merge 5.3->5.5Alexander Barkov2014-06-041-4/+8
| |\ \
| | * | MDEV-4858 Wrong results for a huge unsigned value inserted into a TIME columnAlexander Barkov2014-06-041-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-6099 Bad results for DATE_ADD(.., INTERVAL 2000000000000000000.0 SECOND) MDEV-6097 Inconsistent results for CAST(int,decimal,double AS DATETIME) MDEV-6100 No warning on CAST(9000000 AS TIME)
| | * | 5.2 mergeSergei Golubchik2014-03-163-4/+5
| | |\ \
| | | * \ 5.1 mergeSergei Golubchik2014-03-163-4/+5
| | | |\ \
| | | | * \ mysql-5.1.73 mergeSergei Golubchik2014-03-153-4/+5
| | | | |\ \
| | | | | * | Bug #17297012 MEMORY LEAK IN MYSQL_OPTIONS WHILE CALLING WITH OPTION ↵Igor Solodovnikov2013-08-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MYSQL_SET_CLIENT_IP Memory Leak in mysql_options() was caused by missing call to my_free() in MYSQL_SET_CLIENT_IP branch. Fixed by adding my_free() to cleanup mysql->options.client_ip value before assigning new value.
| | | | | * | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-192-2/+2
| | | | | | |
| | | | * | | MDEV-4575 MySQL client doesn't strip off 5.5.5- prefix while connecting to ↵Sergei Golubchik2013-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10.x server extend 5.1 client library to read 4 byte capabilities from the first handshake packet. two higher bytes are always zeros for 5.1 servers.
| * | | | | | mysql-5.5.38 mergeSergei Golubchik2014-06-031-10/+20
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Bug #18053212 MYSQL_GET_SERVER_VERSION() CALL WITHOUT A VALID CONNECTION ↵Igor Solodovnikov2014-04-171-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RESULTS IN SEG FAULT When there is no connection mysql_get_server_version() will return 0 and report CR_COMMANDS_OUT_OF_SYNC error.
* | | | | | | MDEV-6287 Bad warning level when inserting a DATETIME value into a TIME columnAlexander Barkov2014-06-021-1/+1
| | | | | | |
* | | | | | | MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with MySQL-5.6 (and ↵Alexander Barkov2014-03-071-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the SQL Standard)
* | | | | | | mergeSergei Golubchik2014-02-281-1/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 10.0-base mergeSergei Golubchik2014-02-261-1/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ 5.5 mergeSergei Golubchik2014-02-251-1/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| | | | * | | | | Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+2
| | | | | | | | |
| | * | | | | | | 5.5 mergeSergei Golubchik2014-02-011-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | MySQL-5.5.35 mergeSergei Golubchik2014-01-221-0/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Bug #17297012 MEMORY LEAK IN MYSQL_OPTIONS WHILE CALLING WITH OPTION ↵Igor Solodovnikov2013-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MYSQL_SET_CLIENT_IP Memory Leak in mysql_options() was caused by missing call to my_free() in MYSQL_SET_CLIENT_IP branch. Fixed by adding my_free() to cleanup mysql->options.client_ip value before assigning new value.
* | | | | | | | | Fixing AIX compilation failiresAlexander Barkov2014-02-271-0/+6
|/ / / / / / / /
* | | | | | | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is port of fix for MySQL BUG#17647863. revno: 5572 revision-id: jon.hauglid@oracle.com-20131030232243-b0pw98oy72uka2sj committer: Jon Olav Hauglid <jon.hauglid@oracle.com> timestamp: Thu 2013-10-31 00:22:43 +0100 message: Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM Rename test() macro to MY_TEST() to avoid conflict with libc++.
* | | | | | | | 10.0-base mergeSergei Golubchik2013-12-161-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.5 mergeSergei Golubchik2013-12-151-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 5.3->5.5Alexander Barkov2013-12-021-2/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | pending merges: Alexander Barkov 2013-12-02 MDEV-4857 Wrong result of HOUR('1 00:00:00')
| | | * | | | | MDEV-4857 Wrong result of HOUR('1 00:00:00')Alexander Barkov2013-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/r/func_time.result mysql-test/t/func_time.test sql-common/my_time.c sql/item_func.h sql/item_timefunc.cc sql/mysql_priv.h sql/time.cc
* | | | | | | | Do the partial merge of WL#5602 correctly:Sergei Golubchik2013-12-093-272/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused code (that should not have been merged) Add protocol extension (that should have been merged) Fix bugs (see pack.c)
* | | | | | | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-11/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | support DEFINER=role and DEFINER=current_roleSergei Golubchik2013-10-181-11/+17
| | | | | | | |
* | | | | | | | Client attributesunknown2013-10-031-12/+298
| | | | | | | |
* | | | | | | | MDEV-4871 Temporal literals do not accept nanosecondsAlexander Barkov2013-08-151-1/+1
| | | | | | | |
* | | | | | | | 10.0-monty mergeSergei Golubchik2013-07-213-2/+255
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
| * | | | | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-263-2/+255
| | | | | | | | |
* | | | | | | | | 10.0-base mergeSergei Golubchik2013-07-183-18/+19
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | 5.5 mergeSergei Golubchik2013-07-173-17/+19
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | mysql-5.5.32 mergeSergei Golubchik2013-07-162-6/+7
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Bug #16680313: CLIENT DOESN'T READ PLUGIN-DIR FROM MY.CNF SET BYGeorgi Kodinov2013-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MYSQL_READ_DEFAULT_FILE Parsing of the plugin-dir config file option was not working due to a typo. Fixed the typo. No test case can be added due to lack of support for defaults-exitra-file testing in mysql-test-run.pl. Thanks to Sinisa for contributing the fix.
| | | * | | | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-192-2/+2
| | | | | | | | |
View Lorry Controller Status