summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Collapse)AuthorAgeFilesLines
* A fix and a test case for Bug#10760 and complementary cleanups. konstantin@mysql.com2005-07-191-53/+131
| | | | | | | | | | | The idea of the patch is that every cursor gets its own lock id for table level locking. Thus cursors are protected from updates performed within the same connection. Additionally a list of transient (must be closed at commit) cursors is maintained and all transient cursors are closed when necessary. Lastly, this patch adds support for deadlock timeouts to TLL locking when using cursors. + post-review fixes.
* Bug#10932 - Building server with key limit of 128, makes test cases failingo@mysql.com2005-07-191-0/+31
| | | | | | | | | | | | | This patch allows to configure MyISAM for 128 indexes per table. The main problem is the key_map, wich is implemented as an ulonglong. To get rid of the limit and keep the efficient and flexible implementation, the highest bit is now used for all upper keys. This means that the lower keys can be disabled and enabled individually as usual and the high keys can only be disabled and enabled as a block. That way the existing test suite is still applicable, while more keys work, though slightly less efficient. To really get more than 64 keys, some defines need to be changed. Another patch will address this.
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-185-292/+140
|\ | | | | | | into mishka.local:/home/my/mysql-5.0
| * Cleanups during reviewmonty@mishka.local2005-07-185-292/+140
| | | | | | | | | | | | | | | | | | Changed defaults option --instance to --defaults-group-suffix Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX mysql_print_defaults now understands --defaults-group-suffix Remove usage of my_tempnam() (not safe function) if( -> if ( and while( to while (
* | Get rid of checking for ETIME return value of pthread_cond_timedwait.konstantin@mysql.com2005-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | ETIME was returned by cond_timedwait (sic, the pre-POSIX1001b function) on Solaris 2.6 and 2.7. pthread_cond_timedwait on Solaris returns ETIMEDOUT. The standard requirement is that the only additional return value of pthred_cond_timedwait compared to pthread_cond_wait is ETIMEDOUT. Let us not bloat the application code with redundant checks, and if we're ever to work on a platform that returns a non-standard value, we should write a wrapper for that platform (like we do, e.g., for Windows).
* | Look in the directory above the executable for the my.cnf/ini, on Windows, asjimw@mysql.com2005-07-061-12/+80
| | | | | | | | | | the new installer and GUI tools expect. (Bug #10419) Also, dynamically bind to GetSystemWindowsDirectory() so that it works on all platforms. (Bug #5354)
* | Mergekent@mysql.com2005-07-061-1/+2
|\ \
| * | Makefile.am:kent@mysql.com2005-07-051-1/+2
| | | | | | | | | | | | | | | Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-10214jimw@mysql.com2005-07-051-8/+108
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | Add documentation to the escape_*() functions in mysys.jimw@mysql.com2005-07-051-16/+52
| | | |
| * | | Make status of NO_BACKSLASH_ESCAPES mode known to the client sojimw@mysql.com2005-06-231-0/+64
| | | | | | | | | | | | | | | | | | | | it can use it to switch to only quoting apostrophes by doubling them when it is in effect. (Bug #10214)
* | | | Making rpl_until more robust if machine is slow. Removing rpl_trunc_binloggbichot@production.mysql.com2005-07-041-8/+10
| |_|/ |/| | | | | | | | | | | which is wrong now that slave recovers gracefully from a crashed binlog (thx Serg). stat -> my_stat in my_copy.c so that failing stat() does not hang client connection.
* | | manual mergemonty@mysql.com2005-07-041-2/+1
|\ \ \
| * | | Fixes during review of new codemonty@mysql.com2005-07-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mostly indentation fixes - Added missing test - Ensure that Item_func_case() checks for stack overruns - Use real_item() instead of (Item_ref*) item - Fixed wrong error handling
* | | | Merge with 4.1monty@mysql.com2005-07-032-40/+53
|\ \ \ \ | | |_|/ | |/| |
| * | | Move reset of insert_values to ensure it's done also during error conditionsmonty@mysql.com2005-06-281-0/+1
| | | | | | | | | | | | | | | | This fixed a failure of insert_update.test on some platforms
| * | | Better bug fix for:monty@mishka.local2005-06-271-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | #9728 'Decreased functionality in "on duplicate key update #8147 'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE' This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2005-06-231-35/+49
| |\ \ \ | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-4.1
| | * | | Cleanup during review of new codemonty@mishka.local2005-06-211-35/+49
| | | | | | | | | | | | | | | | | | | | Fixed wrong allocation that could cause buffer overrun when using join cache
* | | | | Name resolution context added (BUG#6443)bell@sanja.is.com.ua2005-07-011-0/+45
| | | | |
* | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmarty@linux.site2005-06-3012-71/+132
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into linux.site:/home/marty/MySQL/mysql-5.0
| * \ \ \ \ Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0petr@mysql.com2005-06-291-17/+51
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0
| | * | | | post review fixes (second review)petr@mysql.com2005-06-291-2/+4
| | | | | |
| | * | | | post review fixes to a patchpetr@mysql.com2005-06-291-8/+15
| | | | | |
| | * | | | Fix modify_defaults_file as agreed with monty (correct all occurences of an ↵petr@mysql.com2005-06-231-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | option in the section)
| * | | | | Bug#8321 - myisampack bug in compression algorithmingo@mysql.com2005-06-241-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Added 64-bit extensions, comments, extended statistics and trace prints.
| * | | | Merge mdk10.(none):/home/reggie/bk/bug9148reggie@mdk10.(none)2005-06-221-5/+7
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / into mdk10.(none):/home/reggie/bk/mysql-5.0-base
| | * | Bug #9148 Denial of Servicereggie@mdk10.(none)2005-06-211-5/+7
| | |/ | | | | | | | | | | | | my_access.c: Fixed problem where in some cases check_if_legal_filename was returning 0 for illegal names
| * | Add a missing statement, add licensing info and correct coding stylepetr@mysql.com2005-06-221-48/+70
| | |
| * | a fix (bug #10650: Bit literal case sensitivity).ramil@mysql.com2005-06-161-1/+1
| | |
| * | fixes for windows 64-bit compiler warningsgeorg@lmy002.wdf.sap.corp2005-06-139-15/+15
| | |
* | | Merge mysql.com:/home/jonas/src/wl1882joreland@mysql.com2005-06-131-1/+59
|\ \ \ | |/ / |/| | | | | into mysql.com:/home/jonas/src/mysql-5.0-ndb
| * | Add "--instance=name" option to load_defaults (or env(MYSQL_INSTANCE)) joreland@mysql.com2005-06-071-1/+59
| | | | | | | | | | | | | | | which enables having multiple mysqld in same my.cnf without mysql_multi or IM
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-06-091-2/+20
|\ \ \ | | |/ | |/| | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | Merge mysql.com:/home/jimw/my/mysql-4.1-10931jimw@mysql.com2005-06-091-2/+20
| |\ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | Fix hashcmp() to handle special case of zero length, whichjimw@mysql.com2005-06-011-2/+20
| | | | | | | | | | | | | | | | | | | | resulted in the hostname cache being ineffective. Based on patch from Jeremy Cole of Yahoo! (Bug #10931)
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2005-06-091-46/+69
|\ \ \ \ | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
| * | | | Fixes in function modify_defaults_file():jani@a193-229-222-105.elisa-laajakaista.fi2005-06-091-46/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed unneccessary variables. - Made a function of that part of code, which actually changes the line under modifications. - Fixed memory overrun problem with my_malloc. Too little space was reserved. - Fixed problem in case, when new option was added at the end of the section. Before, it was added as the last line of the section, even if it left empty lines between. - Fixed so that the configuration file is not saved unneccessarily, if no modifications are done. (file timestamp remains) - This should fix (at least partially) problems described in Bug#10806
* | | | | Mergeacurtis@xiphis.org2005-06-091-21/+41
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | a fix (bug #11193: error messages gets garbled after reggies latest ↵ramil@mysql.com2005-06-091-2/+2
| | | | | | | | | | | | | | | | changeset: ChangeSet@1.2260.1.).
| * | | improved mapping from numerical open codes to string fopen codes.reggie@mdk10.(none)2005-06-071-21/+41
| | | | | | | | | | | | | | | | | | | | This was necessary because the old code would return "w+" for O_RDONLY|O_SHARE for example.
* | | | Merge with 4.1monty@mysql.com2005-06-071-2/+0
|\ \ \ \ | |/ / /
| * | | a compiler must see '#pragma implementation' *before*serg@serg.mylan2005-06-051-2/+0
| | | | | | | | | | | | | | | | '#pragma interface' (that comes with the #include'd header file)
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-06-062-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | | | fixes for compiler warnings from VC6reggie@monster.2005-06-062-2/+2
| | |_|/ | |/| |
* | | | Ensure that we reset auto-increment cache if we have to do an UPDATE becasue ↵monty@mysql.com2005-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | of REPLACE This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error
* | | | mergemonty@mysql.com2005-06-052-6/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Cleanup during reviewmonty@mysql.com2005-06-052-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple optimization for 2 argument usage to function of variable arguments Fix stack overrun when using 1+1+1+1+1+1+1+.... Update crash-me results for 5.0 Don't call post_open if pre_open() fails (optimization)
* | | | yassl template instantiation - don't do too muchserg@serg.mylan2005-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | mysys/my_access.c: remove incorrect fix comments
* | | | Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0reggie@monster.2005-06-021-1/+1
|\ \ \ \ | | |/ / | |/| |
View Lorry Controller Status