summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-5404 Can't free data returned by mariadb_dyncol_unpack on windowsSergei Golubchik2014-03-191-0/+1
| | | | add mariadb_dyncol_unpack_free()
* MDEV-4603 mysql_stmt_reset returns "commands out of sync" errorunknown2014-03-061-17/+16
|
* MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-041-2/+1
|
* 10.0-base mergeSergei Golubchik2014-02-267-177/+125
|\
| * 5.5 mergeSergei Golubchik2014-02-257-177/+125
| |\
| | * MDEV-5529 Sync libmysqlclient.so symbol versioning across distributionsSergei Golubchik2014-02-195-173/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An attempt to introduce libmysqlclient.so symbol versioning that is compatible both with Debian and Fedora all versions: put all symbols into libmysqlclient_18 version node (as on Debian), but also put aliases of old symbols into libmysqlclient_16 version node (as on Fedora). Also use a linker script to create aliases of exported symbols, not rpm_support.cc source file.
| | * MySQL-5.5.36 mergeSergei Golubchik2014-02-173-4/+5
| | |\ | | | | | | | | | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-064-4/+4
| | | |
* | | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Golubchik2014-02-031-0/+2
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2014-02-011-0/+2
| |\ \ \ | | |/ /
| | * | MySQL-5.5.35 mergeSergei Golubchik2014-01-221-0/+2
| | |\ \ | | | |/
| | | * Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE ↵Sreedhar.S2013-10-092-0/+7
| | | | | | | | | | | | | | | | LIBRARIES USED
* | | | 10.0-base mergeSergei Golubchik2013-12-161-2/+2
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-151-2/+2
| |\ \ \ | | |/ /
| | * | MDEV-5321 Calling mysql_library_end accesses freed memory; dumps memory to ↵Alexey Botchkov2013-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display. Don't call the vio_end() in the clean_up() in EMBEDDED mode. Call vio_end() before the end_embedded_server().
* | | | Do the partial merge of WL#5602 correctly:Sergei Golubchik2013-12-092-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove unused code (that should not have been merged) Add protocol extension (that should have been merged) Fix bugs (see pack.c)
* | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-1/+2
|\ \ \ \ | |/ / /
| * | | A follow-up for the previous commit:Alexander Barkov2013-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-4425 Regexp enhancements Adding ${CMAKE_BINARY_DIR}/pcre into search path for *.h files. Needed for find pcre.h (which is generated from pcre.h.in) when build directory != source directory.
| * | | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-1/+1
| | | |
* | | | Client attributesunknown2013-10-031-1/+2
| | | |
* | | | MDEV-4993:Impossible to free a dynamic columnunknown2013-09-171-5/+6
| | | | | | | | | | | | | | | | Fix of API of dynamic columns (it made uniform and real function used to free the string).
* | | | 10.0-monty mergeSergei Golubchik2013-07-213-7/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+10
| | | | |
* | | | | 10.0-base mergeSergei Golubchik2013-07-182-6/+8
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 5.5 mergeSergei Golubchik2013-07-172-6/+4
| |\ \ \ \ |/ / / / / | | | _ / | | | /
| * | | mysql-5.5.32 mergeSergei Golubchik2013-07-161-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-198-8/+8
| | | |
| * | | Merging from 5.3Alexander Barkov2013-07-081-5/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: include/my_time.h libmysql/libmysql.c mysql-test/r/adddate_454.result mysql-test/r/cast.result mysql-test/r/date_formats.result mysql-test/r/func_sapdb.result mysql-test/r/func_time.result mysql-test/r/mdev316.result mysql-test/r/parser.result mysql-test/r/partition_datatype.result mysql-test/r/partition_pruning.result mysql-test/r/type_date.result mysql-test/r/type_datetime.result mysql-test/suite/vcol/r/vcol_misc.result mysql-test/t/cast.test sql-common/my_time.c sql/field.cc sql/field_conv.cc sql/filesort.cc sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_func.cc sql/item_strfunc.cc sql/item_timefunc.cc sql/sql_time.cc pending merges: Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
| | * | | MDEV-4667 DATE('string') incompability between mysql and mariadbSergei Golubchik2013-07-031-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup: remove TIME_FUZZY_DATE. Introduce TIME_FUZZY_DATES which means "very fuzzy, the resulting value is only used for comparison. It can be invalid date, fine, as long as it can be compared". Updated many tests results (they're better now).
| | * | | 5.2 merge.Sergei Golubchik2012-08-221-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two tests still fail: main.innodb_icp and main.range_vs_index_merge_innodb call records_in_range() with both range ends being open (which triggers an assert)
| | | * \ \ 5.1 mergeSergei Golubchik2012-08-221-4/+4
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | increase xtradb verson from 13.0 to 13.01
| | | | * \ \ merge with MySQL 5.1.65Sergei Golubchik2012-08-221-4/+4
| | | | |\ \ \
* | | | | \ \ \ 5.5 mergeSergei Golubchik2013-06-061-1/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | mysql-5.5.31 mergeSergei Golubchik2013-05-071-1/+8
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Bug #14553380 MYSQL C API LIBRARY EXITS AT NET_CLEAR AT NET_SERV.CC:223Venkata Sidagam2013-01-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem description: When client loses the connection to the MySQL server or if the server gets shutdown after mysql_stmt_prepare() then the next mysql_stmt_prepare() will return an error(as expected) but consecutive call mysql_stmt_execute(), will crash the client program. The expected behavior would be, it should through an error. Analysis: The mysql_stmt_prepare() interns calls the function end_server() and net->vio and net->buff are freed and set to NULL. Then the next call mysql_stmt_execute() will interns call net_clear() where we are "net->vio" with out validating it. Fix: we are validating the net->vio, before calling net_clear().
| | * | | | | | merge 5.1 => 5.5Tor Didriksen2012-11-011-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIENT_TESTTor Didriksen2012-11-011-1/+1
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing DBUG_RETURNs, otherwise the debug-stack gets messed up, and _db_enter_ and _db_exit_ will access data outside the current stack frame.
* | | | | | | | 5.5 mergeSergei Golubchik2013-03-273-12/+61
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fixes for Windows XPVladislav Vaintroub2013-03-261-7/+8
| | | | | | |
| * | | | | | MDEV-4330 - get_tty_password() does not work if input redirection is used.Vladislav Vaintroub2013-03-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is the limitation of ReadConsole() API, it returns error if handle to redirected input is used. The fix is to use a handle returned by CreateFile("CONIN$",...), rather than GetStdHandle(STD_HANDLE_INPUT) to get the true console handle.
| * | | | | | MDEV-4216 : export additional functions ↵Vladislav Vaintroub2013-03-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_get_timeout_value(),mysql_get_timeout_value_ms(), mysql_get_socket() from shared client library. They are documented as part of async API. Also, remove functions mysql_close_slow_part_start() and mysql_close_slow_part_cont() from exports - they are not documented anywhere.
| * | | | | | MDEV-4021 : Enable Ctrl-C handler when reading password, on Windows.Vladislav Vaintroub2013-02-211-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch, _getch() was used to read password input from console. getch() has a property that it reads Ctrl-C as character with ASCII code 0x03, and disregards Ctrl-C handler for current process. The fix is to use ReadConsole() API instead of getch() , after setting console mode to ENABLE_PROCESSED_INPUT - this mode allows current process to handle Ctrl-C events.
| * | | | | | fix typoVladislav Vaintroub2013-02-181-1/+1
| | | | | | |
| * | | | | | MDEV-4183: Export additional symbols from RPMs , compatibly to distribution ↵Vladislav Vaintroub2013-02-182-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPMs. -Ensure that symbols listed in CLIENT_API_EXTRA are not thrown away by the linker. -Add THR_KEY_mysys to this list, because Fedora18 exports it.
| * | | | | | MDEV-4127 : Export additional symbols when building RPM,Vladislav Vaintroub2013-02-042-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to enable both recompiling mysqli or odbc from sources in addition to drop-in replacement functionality. The case in question is compiling mysqli from sources, that needs client_errors via ER() macro. Previously, we exported it as mysql_client_errors (compatibly to Fedora's style symbol renaming, see MDEV-3842). However, if MariaDB header files are used when compiling mysqli, client_errors needs to be exported with its original name.
* | | | | | | MDEV-4091: Dynamic columns C functions should be included in libmysqlclientunknown2013-02-041-0/+20
| | | | | | |
* | | | | | | 5.5 mergeSergei Golubchik2013-01-293-5/+257
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-4091: Dynamic columns C functions should be included in libmysqlclientunknown2013-01-281-0/+10
| | | | | | |
| * | | | | | MDEV-3842, MDEV-3923 :Vladislav Vaintroub2013-01-253-5/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Miscellaneous workarounds for drop-in compatibility problems with Linux distributions, arounf versioning of the MySQL 5.5 client shared library. There seems to be 3 different ways major distributions handle versioning 1. Fedora (also Mageia, and likely other Redhat descendants) way old, 5.1 API functions are given version libmysqlclient_16 new API functions (client plugins, mysql_stmt_next ) are given version libmysqlclient_18 some extra functions beyond API are exported. some functions are renamed. 2.Debian Wheezy way all functions are given libmysqlclient_18 version 3. Ubuntu way (or MySQL/MariaDB download packages) no versioning UIp to this fix, MariaDB distributions did not have any versioning in the libraries, this rendered client library incompatible to distributions thus exchanging distribution's libmysqlclient.so.18.0.0 with MariaDB's did not work nicely (anywhere but on Ubuntu) THE FIX is to build libraries the same way as distributions do it - when building RPMs, use same version script as Fedora does, Make sure to export extra-symbols, the same as Fedora exports. - when building DEBs, use the same version script as Debian Wheezy - do not use version scripts otherwise Also, makes sure that extensions of MySQL APIs (asynchronous client functionality) is exported by the shared libraries.