summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Bug#43940 64-bit windows myisamchk doesn't support key_buffer_size > 4GSergey Glukhov2009-05-271-1/+2
| | | | The fix is to allow myisamchk to use >4G key_buffer_size on win64
* Bug#44164: TL_WRITE has no description in lock_descriptions[]Davi Arnaut2009-04-141-0/+4
| | | | | | | The problem was that new lock types were being added without a corresponding description. Since the lock types (enum values) are used as indices to the description array, the descriptions could be shifted depending on the lock type. The solution is to ensure that every lock type has a correspondent description.
* merge -5.0 into -5.1 (minor conflicts resolved)Timothy Smith2009-04-011-34/+35
|\
| * auto-merge -build into -bugteamTimothy Smith2009-04-011-34/+35
| |\
| | * Merge the main tree into 5.0-buildJoerg Bruehe2009-03-301-1/+1
| | |\
| | * | cmd-line-utils/libedit/readline/readline.hkent.boortz@sun.com2009-03-191-34/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Header <sys/ttydefaults.h> missing or not usable on QNX and OpenServer 6 include/my_global.h - Moved down definition of function rint(), as for some platforms (in this case Netware) 'longlong' is not defined until later in "my_global.h"
| * | | Automerge.Alexey Kopytov2009-03-251-2/+12
| |\ \ \ | | |_|/ | |/| |
| * | | auto-mergeIgnacio Galarza2009-03-195-75/+64
| |\ \ \ | | | |/ | | |/|
* | | | Correct failing archive test.Ignacio Galarza2009-03-251-3/+0
| | | |
* | | | Manual merge.Alexey Kopytov2009-03-251-3/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can Alexey Kopytov2009-03-241-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | produce incorrect results for ROUND() Added a workaround and a configure check to test whether isinf() is affected by the GCC bug #39228. Since no code in MySQL server is currently affected by that bug, the patch is actually a safeguard for possible future code modifications. No test cases or changelog entries are needed.
* | | | reverting a bogus fix into 5.1-bugteamGeorgi Kodinov2009-03-201-3/+5
| | | |
* | | | Merge contributed automake changes, and 5.1 upstream.Chad MILLER2009-03-191-0/+3
|\ \ \ \
| * \ \ \ auto-mergeIgnacio Galarza2009-03-191-2/+5
| |\ \ \ \
| * \ \ \ \ auto-mergeIgnacio Galarza2009-03-175-77/+64
| |\ \ \ \ \
| * \ \ \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-0/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
| | * | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-1/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
* | | | | | Copy include/config.h to include/my_config.h at configure-time. Also,Chad MILLER2009-03-191-5/+3
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | continue to update it at make-time. One shouldn't need to run "make" on server source to get the stuff we say plugins should use.
* | | | | Manual merge of patch for bug #40552 into the team tree.Alexey Kopytov2009-03-161-2/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | Replaced a call to load_defaults() in sql_plugin.cc with its thread-safe version.
| * | | | Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in load_defaults() load_defaults(), my_search_option_files() and my_print_default_files() utilized a global variable containing a pointer to thread local memory. This could lead to race conditions when those functions were called with high concurrency. Fixed by changing the interface of the said functions to avoid the necessity for using a global variable. Since we cannot change load_defaults() prototype for API compatibility reasons, it was renamed my_load_defaults(). Now load_defaults() is a thread-unsafe wrapper around a thread-safe version, my_load_defaults().
* | | | | merge of bug 42434 to 5.1-bugteamGeorgi Kodinov2009-03-111-64/+26
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bug #42434: license of mysys MD5 implementation is not GPL-compatibleGeorgi Kodinov2009-03-091-64/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Took the Xfree implementation (based on the same rewrite as the NDB one) and added it instead of the current implementation. Added a macro to make the calls to MD5 more streamlined.
* | | | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteamHe Zhenxing2009-03-061-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | BUG#22082 Slave hangs(holds mutex) on "disk full"He Zhenxing2009-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When disk is full, server may waiting for free space while writing binlog, relay-log or MyISAM tables. The server will continue after user have freed some space. But the error message printed was not quite clear about the how often the error message is printed, and there will be a delay before the server continue and user freeing space. And caused users thinking that the server was hanging forever. This patch fixed the problem by making the error messages printed more clear. The error message is split into two part, the first part will only be printed once, and the second part will be printed very 10 times. Message first part: Disk is full writing '<filename>' (Errcode: <errorno>). Waiting for someone to free space... (Expect up to 60 secs delay for server to continue after freeing disk space) Message second part: Retry in 60 secs, Message reprinted in 600 secs
| * | | | Automerge.Alexey Kopytov2009-02-251-0/+3
| |\ \ \ \
| * \ \ \ \ Merge bug 39370 fix from bug tree.Chad MILLER2009-02-241-0/+1
| |\ \ \ \ \
| | * | | | | Bug#39370: wrong output for error code 153Chad MILLER2009-02-241-0/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all HA error numbers and descriptions to perror. Add reminder to header. This is already fixed in smarter ways in future codebases, and this codebase is unlikely to change, since new development is forbidden here.
* | | | | | Automerge.Alexey Kopytov2009-02-251-0/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Automerge.Alexey Kopytov2009-02-251-0/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | Fixed a build failure on Ubuntu 8.10 introduced by the patchAlexey Kopytov2009-02-251-0/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for bug #15936. On some platforms fenv.h may #undef the min/max macros defined in my_global.h. Fixed by moving the #include directive for fenv.h from mysqld.cc to my_global.h before definitions for min/max.
* | | | | merging.Alexey Botchkov2009-02-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug#39289 libmysqld.a calls exit() upon error Alexey Botchkov2008-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several functions (mostly in mysqld.cc) directly call exit() function in case of errors, which is not a desired behaviour expecially in the embedded-server library. Fixed by making these functions return error sign instead of exiting. per-file comments: include/my_getopt.h Bug#39289 libmysqld.a calls exit() upon error added 'error' retvalue for my_getopt_register_get_addr libmysqld/lib_sql.cc Bug#39289 libmysqld.a calls exit() upon error unireg_clear() function implemented mysys/default.c Bug#39289 libmysqld.a calls exit() upon error error returned instead of exit() call mysys/mf_tempdir.c Bug#39289 libmysqld.a calls exit() upon error free_tmpdir() - fixed so it's not produce crash on uninitialized tmpdir structure mysys/my_getopt.c Bug#39289 libmysqld.a calls exit() upon error error returned instead of exit() call sql/mysql_priv.h Bug#39289 libmysqld.a calls exit() upon error unireg_abort definition fixed for the embedded server sql/mysqld.cc Bug#39289 libmysqld.a calls exit() upon error various functions fixed error returned instead of exit() call
* | | | | Manual merge to 5.1.Alexey Kopytov2009-02-232-11/+33
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix for bug #15936: "round" differs on Windows to UnixAlexey Kopytov2009-02-232-11/+33
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both of our own implementations of rint(3) were inconsistent with the most common behavior of rint() on those platforms that have it: round to nearest, break ties by rounding to nearest even. Fixed by leaving just one implementation of rint() in our source tree, and changing its behavior to match the most common native implementations on other platforms.
* | | | Merge from bugteam team tree.Chad MILLER2009-02-103-5/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | mergingAlexey Botchkov2009-02-051-1/+2
| |\ \ \
| | * | | Bug#40536: SELECT is blocked by INSERT DELAYED waiting onDavi Arnaut2009-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgrading lock, even with low_priority_updates The problem is that there is no mechanism to control whether a delayed insert takes a high or low priority lock on a table. The solution is to modify the delayed insert thread ("handler") to take into account the global value of low_priority_updates when taking table locks. The value of low_priority_updates is retrieved when the insert delayed thread is created and will remain the same for the duration of the thread.
| * | | | Bug#37995 Error message truncation in test "innodb" in embedded mode.Alexey Botchkov2009-02-052-4/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code backported from 6.0 per-file messages: include/my_global.h Remove SC_MAXWIDTH. This is unused and irrelevant nowadays. include/my_sys.h Remove errbuf declaration and unused definitions. mysys/my_error.c Remove errbuf definition and move and adjust ERRMSGSIZE. mysys/my_init.c Declare buffer on the stack and use my_snprintf. mysys/safemalloc.c Use size explicitly. It's more than enough for the message at hand. sql/sql_error.cc Use size explicitly. It's more than enough for the message at hand. sql/sql_parse.cc Declare buffer on the stack. Use my_snprintf as it will result in less stack space being used than by a system provided sprintf -- this allows us to put the buffer on the stack without causing much trouble. Also, the use of errbuff here was not thread-safe as the function can be entered concurrently from multiple threads. sql/sql_table.cc Use MYSQL_ERRMSG_SIZE. Extra space is not needed as my_snprintf will nul terminate strings. storage/myisam/ha_myisam.cc Use MYSQL_ERRMSG_SIZE. sql/share/errmsg.txt Error message truncation in test "innodb" in embedded mode filename in the error message can safely take up to 210 symbols.
| * | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-301-0/+3
| |\ \ \
| | * \ \ merge: 5.1 -> 5.1-rplLuis Soares2009-01-233-0/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts: Text conflict in client/mysqltest.cc Text conflict in mysql-test/include/wait_until_connected_again.inc Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/r/events_bugs.result Text conflict in mysql-test/r/log_state.result Text conflict in mysql-test/r/myisam_data_pointer_size_func.result Text conflict in mysql-test/r/mysqlcheck.result Text conflict in mysql-test/r/query_cache.result Text conflict in mysql-test/r/status.result Text conflict in mysql-test/suite/binlog/r/binlog_index.result Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_packet.result Text conflict in mysql-test/suite/rpl/t/rpl_packet.test Text conflict in mysql-test/t/disabled.def Text conflict in mysql-test/t/events_bugs.test Text conflict in mysql-test/t/log_state.test Text conflict in mysql-test/t/myisam_data_pointer_size_func.test Text conflict in mysql-test/t/mysqlcheck.test Text conflict in mysql-test/t/query_cache.test Text conflict in mysql-test/t/rpl_init_slave_func.test Text conflict in mysql-test/t/status.test
| | * \ \ \ merge: 5.1 -> 5.1-rplLuis Soares2009-01-083-3/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts: Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl
| | * \ \ \ \ merge 5.1 --> 5.1-rplAlfranio Correia2008-12-131-5/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to ↵Andrei Elkin2008-11-122-5/+11
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6.0->6.0-rpl merging. mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
| | * \ \ \ \ \ \ Merging 5.1 main into 5.1-rplMats Kindahl2008-10-232-25/+71
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merging 5.1 main into 5.1-rpl.Mats Kindahl2008-10-064-1180/+815
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-062-1/+6
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fixning compiler warnings. Fixing build failure for valgrind platform.Mats Kindahl2008-08-221-0/+3
| | | | | | | | | | |
* | | | | | | | | | | Bug#34309: '_PC' macro redefinitionChad MILLER2009-01-271-1/+0
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For reasons that are now a mystery, we had defined a CPP symbol to help ancient compilers work better (in some way that's lost to history). This interferes with at least one modern compiler. Now, don't define the _PC symbol. Those other underscore-leading symbols are suspect also, but at least the names aren't inscrutable. Let's leave them for now.
* | | | | | | | | | Fix for bug #37756: enabling fulltext indexes withRamil Kalimullin2009-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam_repair_threads > 1 causes crash Problem: parallel repair (myisam_repair_threads > 1) of a myisam table with two or more fulltext keys that use the same parser may lead to a server crash. ALTER TABLE ENABLE KEYS is affected as well. Fix: properly initialize fulltext structures for parallel repair. Note: 1. there's no deterministic test case. 2. now we call parser->init() for each fulltext key (not for each fulltext parser used).
* | | | | | | | | | Fix Bug#32831: libmysql should be built with all charsetsTimothy Smith2009-01-131-29/+35
| |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add #define HAVE_CHARSET_name in config-win.h for all character sets that MySQL supports. Add comments to config/ac-macros/character_sets.m4 and config-win.h so hopefully they will be updated in sync.
View Lorry Controller Status