summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-6638 mysql_options4 symbol missing from libmysqlclient.so.18Sergei Golubchik2014-09-071-0/+3
|
* 5.5.39 mergeSergei Golubchik2014-08-071-1/+0
|\
| * mysql-5.5.39 mergeSergei Golubchik2014-08-021-1/+0
| |\ | | | | | | | | | | | | | | | | | | ~40% bugfixed(*) applied ~40$ bugfixed reverted (incorrect or we're not buggy) ~20% bugfixed applied, despite us being not buggy (*) only changes in the server code, e.g. not cmakefiles
| | * Backport from trunk:Tor Didriksen2014-05-072-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#18187290 ISSUE WITH BUILDING MYSQL USING CMAKE 2.8.12 We want to upgrade to VS2013 on Windows. In order to do this, we need to upgrade to cmake 2.8.12 This has introduced some incompatibilities for .pdb files, and "make install" no longer works. To reproduce: cmake --build . --target package --config debug The fix: Rather than installing .pdb files for static libraries, we use the /Z7 flag to store symbolic debugging information in the .obj files.
* | | MDEV-6314 - Compile/run MariaDB with ASanSergey Vojtovich2014-06-101-0/+4
| | | | | | | | | | | | Fixed some compilation errors/warnings with ASan.
* | | 5.5.38 mergeSergei Golubchik2014-06-063-3/+10
|\ \ \ | |/ /
| * | mysql-5.5.38 mergeSergei Golubchik2014-06-032-3/+9
| |\ \ | | |/
| | * BUG#18080920: CRASH; MY_REALLOC_STR DEREFERENCES NEGATIVE VALUE Nisha Gopalakrishnan2014-04-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INTO CLIENT_ERRORS ARRAY Analysis: -------- The client may crash while executing a statement due to the missing mapping of the server error to it's equivalent client error. When trying to reallocate memory for the packet buffer, if the system is out of memory or the packet buffer is large, the server errors 'ER_OUT_OF_RESOURCES' or 'ER_PACKET_TOO_LARGE' is returned respectively. The client error number calculated is negative and when trying to dereference the array of client error messages with the calculated error number, the client crashes. Fix: ---- Map the server error returned to it's equivalent client error prior to dereferencing the array of client error messages. Note: Test case is not added since it is difficult to simulate the error condition.
| | * Backport of Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18Tor Didriksen2014-01-231-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported only the softlink part of the patch, *not* the bumping of library version. With this patch, the libmysql/ directory contains: libmysqlclient.a libmysqlclient_r.a -> libmysqlclient.a libmysqlclient_r.so -> libmysqlclient.so* libmysqlclient_r.so.18 -> libmysqlclient.so.18* libmysqlclient_r.so.18.0.0 -> libmysqlclient.so.18.0.0* libmysqlclient.so -> libmysqlclient.so.18* libmysqlclient.so.18 -> libmysqlclient.so.18.0.0* libmysqlclient.so.18.0.0*
| * | MDEV-6273 Export my_progname symbol in libmysqlclient.soSergei Golubchik2014-05-271-0/+1
| | |
* | | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and ↵Sergei Golubchik2014-05-131-1/+1
| | | | | | | | | | | | wrong executable bits
* | | 5.5 mergeSergei Golubchik2014-05-091-0/+4
|\ \ \ | |/ /
| * | MDEV-6131 Unable to build Connector/ODBC 5.2.5 undefined reference to ↵Sergei Golubchik2014-05-051-0/+4
| | | | | | | | | | | | | | | | | | | | | `my_charset_latin1' Add charsets to the client API (they are declared with MYSQL_PLUGIN_IMPORT, meaning the intention is to have them public)
* | | 5.5 mergeSergei Golubchik2014-03-261-3/+43
|\ \ \ | |/ /
| * | don't put libmysqlclient symbols extra-used on debianSergei Golubchik2014-03-251-29/+35
| | | | | | | | | | | | in the libmysqlclient_16 version node.
| * | MDEV-5773 symbol list_add, version libmysqlclient_18 not defined in file ↵Sergei Golubchik2014-03-191-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | libmysqlclient.so.18 with link time reference MDEV-5763 libmyodbc.so: undefined symbol: int2str MDEV-5739 Symbol missing in libmysqlclient.so.18 (make_scrambled_password) pam_mysql and especially myodbc need tons of internal symbols on Debian, argh!
* | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / /
View Lorry Controller Status