summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Collapse)AuthorAgeFilesLines
* merge 10.0-base -> 10.0unknown2013-09-261-6/+0
|\
| * merge 5.5 -> 10.0-baseunknown2013-09-251-6/+0
| |\
| | * Allow unique prefix for command line options, like any GNU program.Michael Widenius2013-09-231-6/+0
| | |
* | | A clean-up for the base64 functions.Alexander Barkov2013-09-241-15/+3
| | | | | | | | | | | | | | | SIZEOF_INT can never be 8. Removing the redundant #ifdef code.
* | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6Alexander Barkov2013-09-231-103/+247
| | |
* | | 10.0-base merge.Sergei Golubchik2013-09-219-19/+297
|\ \ \ | |/ / | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-188-15/+288
| |\ \ | | |/
| | * MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax ↵Sergei Golubchik2013-09-091-3/+6
| | | | | | | | | | | | | | | | | | error in include/my_global.h C++ comments in C files, and a typo in my_global.h
| | * MDEV-4472 Audit-plugin. Server-related part of the task.Alexey Botchkov2013-09-093-1/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | file_logger became the service. Data like query_id now are sent to the audit plugin. Fix for MDEV-4770 ported from 10.0. Fix added for the read_maria_plugin_info(). Log rotation can be disabled with 'set rotations=0'.
| | * mysql-5.5.33 mergeSergei Golubchik2013-09-062-7/+55
| | |\
| | | * merge back to the 5.5 tree and fix indentationGeorgi Kodinov2013-06-281-1/+11
| | | |\
| | | | * Bug #16996656: UNIQUE OPTION PREFIXES NOT DEPRECATED IN 5.5+Georgi Kodinov2013-06-261-1/+11
| | | |/ | | | | | | | | | | | | Backported the deprecation warnings from WL#6978 to 5.5
| | | * Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8Tor Didriksen2013-06-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport to 5.5 (external Bug#69407 Build warnings with mysql) support-files/build-tags: Run etags on sql_yacc.yy, ignore other .yy files unittest/mysys/explain_filename-t.cc: NO_PLAN seems to fail on some platforms, use the actual number instead.
| | | * Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLESAshish Agarwal2013-05-191-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | USING THE PLUGIN INTERFACE. ISSUE: No support for floating-point plugin system variables. SOLUTION: Allowing plugins to define and expose floating-point system variables of type double. MYSQL_SYSVAR_DOUBLE and MYSQL_THDVAR_DOUBLE are added. ISSUE: Fractional part of the def, min, max values of system variables are ignored. SOLUTION: Adding functions that are used to store the raw representation of a double in the raw bits of unsigned longlong in a way that the binary representation remains the same.
| | * | MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable optionSergei Golubchik2013-08-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | support -DTMPDIR=/path in CMakeLists.txt Patch by Honza Horak.
| | * | fix a commentSergei Golubchik2013-08-141-1/+1
| | | |
| * | | new format length calculation check added.unknown2013-08-201-2/+4
| | | |
| * | | merge 5.5 -> 10.0-baseunknown2013-08-202-1/+3
| |\ \ \ | | |/ /
| | * | Merge from 5.3Alexander Barkov2013-08-121-9/+18
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/r/dyncol.result mysql-test/r/type_time.result mysql-test/t/dyncol.test mysql-test/t/type_time.test mysys/ma_dyncol.c sql/item.cc sql/item_func.cc pending merges: Alexander Barkov 2013-08-12 MDEV-4652 Wrong result for CONCAT(GREATEST(T... sanja@montyprogr... 2013-08-01 MDEV-4811 Assertion `offset < 0x1f' f...
| | | * | MDEV-4811 Assertion `offset < 0x1f' fails in type_and_offset_store on COLUMN_ADDunknown2013-08-011-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-4812 Valgrind warnings (Invalid write) in dynamic_column_update_many on COLUMN_ADD Fixed problem of working on wrong data (do not allow offset to out of string length).
| | * | | MDEV-4815 - allow multiple mysql_server_init() / mysql_server_end() in the ↵Vladislav Vaintroub2013-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same process, for embedded library. - Reset static variables that are used to signal "init done" for DBUG, in dbug_end() - Set string server variables to NULL after memory for the value is freed - avoids double free() - fix DBUG_ASSERTs that happened during reinitialization.
* | | | | MDEV-4993:Impossible to free a dynamic columnunknown2013-09-171-18/+27
| | | | | | | | | | | | | | | | | | | | Fix of API of dynamic columns (it made uniform and real function used to free the string).
* | | | | MDEV-4995: mariadb_dyncol_column_count returns error when passing an empty ↵unknown2013-09-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic column An empty string processing added to mariadb_dyncol_column_count().
* | | | | MDEV-4994: Crash in dynamic column APIunknown2013-09-111-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamic columns unittest fix. Correct processing of empty string added to creation dynamic string procedure List function of numeric format fixed when empty string passed. Unit test calls changed to new ones. Unit test added to cmake file.
* | | | | 10.0-monty mergeSergei Golubchik2013-07-2132-2031/+392
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge from mysql-5.6 fix for bug#11761752 (was already partially merged)Sergey Petrunya2013-07-051-0/+63
| | | | | |
| * | | | | ha_partition.cc and ha_partition.h are now completely mergedMichael Widenius2013-06-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Added sql_mode_t to simplify merges
| * | | | | Fixed some memory leaksMichael Widenius2013-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled some asserts that we can't yet have enabled
| * | | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-154-357/+86
| | | | | |
| * | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-2627-2228/+239
| | | | | |
* | | | | | 10.0-base mergeSergei Golubchik2013-07-1839-138/+188
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 5.5 mergeSergei Golubchik2013-07-1736-130/+188
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mysql-5.5.32 mergeSergei Golubchik2013-07-1631-31/+42
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug#16626742 IN MY_MD5FINAL IN MYSYS/MD5.C, CTX IS NOT PROPERLY ZEROED AS ↵Tor Didriksen2013-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INTENDED Zero out the entire struct, rather than the first sizeof(void*) bytes.
| | | * | | Merge from mysql-5.1 to mysql-5.5Sujatha Sivakumar2013-03-282-2/+13
| | | |\ \ \
| | | | * | | Bug#14324766:PARTIALLY WRITTEN INSERT STATEMENT IN BINLOGSujatha Sivakumar2013-03-282-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NO ERRORS REPORTED Problem: ======= Errors from my_b_fill are ignored. MYSQL_BIN_LOG::write_cache code assumes that 0 returned from my_b_fill always means end-of-cache, but that is incorrect. It can result in error and the error is ignored. Other callers of my_b_fill don't check for error: my_b_copy_to_file, maybe my_b_gets. Fix: === An error handler is already present to check the "cache" error that is reported during "MYSQL_BIN_LOG::write_cache" call. Hence error handlers are added for "my_b_copy_to_file" and "my_b_gets". During my_b_fill() function call, when the cache read fails info->error= -1 is set. Hence a check for "info->error" is added for the above to callers upon their return. mysys/mf_iocache2.c: Added a check for "cache->error" and simulation of cache read failure mysys/my_read.c: Simulation of read failure sql/log_event.cc: Added debug simulation sql/sql_repl.cc: Added a check for cache error
| | | | * | | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1975-75/+75
| | | | | | |
| | | | * | | Updated/added copyright headers.Murthy Narkedimilli2013-02-2581-85/+81
| | | | | | |
| | | * | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1929-29/+29
| | | | | | |
| | * | | | | 5.3 mergeSergei Golubchik2013-07-161-23/+14
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | 5.2 mergeSergei Golubchik2013-07-151-23/+14
| | | |\ \ \ \
| | | | * | | | MDEV-4409 - Fix deadlock in MySQL key cache code, that can happen if there ↵Vladislav Vaintroub2013-07-091-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is a key cache resize running in parallel with an update. If there is a key cache resize,a thread writing to key cache, will pause waiting until resize finishes. However this thread is won't be woken, because resize does not signaling waiters anymore. This is a regression introduced in WL#86(segmented MyISAM key cache) The fix is to unconditionally release threads waiting on resize_queue when resize finishes, as in pre-WL#86 code.
| | * | | | | | MDEV-4503 : Installation fails if TEMP directory contains "~" subdirectory.Vladislav Vaintroub2013-06-171-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove special handling for ~ in the middle of the path in cleanup_dir_name() - according to Monty, this was ancient code that tried to emulate Emacs behavior
| | * | | | | | MDEV-4576 : Aria storage engine's temporary files might not be deleted ↵Vladislav Vaintroub2013-06-162-70/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Errcode : 13) See also MySQL Bug #39750 and similar ones. Fix my_delete() on Windows, to safely remvoe files on Windows, including files that are opened by another threads in the same process, antiviruses and backup applications. If file to be deleted is also opened by another thread, the file is renamed to unique name prior to deletion - this makes it possible to create file with the same name right after deletion. With this patch my_delete_allow_opened() becomes obsolete and is replaced with my_delete(). This patch is rework of the patch http://lists.mysql.com/commits/59327 for MySQL bug#39750.
| | * | | | | | MDEV-4601 : Allow MariaDB to be build without non-blocking client.Vladislav Vaintroub2013-06-151-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-blocking client currently can be build on Windows, GCC on i386 and x64, or any OS wth ucontext.h header. Prior to this patch, build failed if neither of these conditions is true. Fix to avoid compiler errors in these case - non-blocking API would not be useful on , but otherwise everything will work as before.
| * | | | | | | cleanup: remove LF_REQUIRE_PINS, use compile_time_assert() instead of ↵Sergei Golubchik2013-06-243-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reimplementing it
* | | | | | | | 10.0-base mergeSergei Golubchik2013-06-0610-32/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | (without InnoDB - all InnoDB changes were ignored)
| * | | | | | | 5.5 mergeSergei Golubchik2013-06-069-27/+21
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mysql-5.5.31 mergeSergei Golubchik2013-05-077-22/+22
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | BUG#11753923-SQL THREAD CRASHES ON DISK FULLVenkatesh Duggirala2013-03-012-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing post push issue Simulator name used needs to be changed to make it work properly. Analysis: Debug control list addition (ListAddDel function dbug.c file) code was written in such a way that if new element is subset of already existing element, then the new element is not added. i.e., set @@global.debug = '+d,abcd', is existing in the list then you cannot add "a" or "ab" or "abc" in the list.