summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prelocking-free SPs, post-review fixes:sergefp@mysql.com2005-08-0312-189/+92
| | | | | | * Don't activate prelocking mode for evaluating procedure arguments when it is not necessary. * Code structure simplification and cleanup. * Cleanup in .test files
* Added Non-prelocked SP execution: Now a PROCEDURE doesn't enter/leave ↵sergefp@mysql.com2005-07-3022-127/+735
| | | | | | | | prelocked mode for its body, but lets each statement to get/release its own locks. This allows a broader set of statements to be executed inside PROCEDUREs (but breaks replication) This patch should fix BUG#8072, BUG#8766, BUG#9563, BUG#11126
* merge fixgluh@eagle.intranet.mysql.r18.ru2005-07-211-4/+4
|
* Merge mysql.com:/home/gluh/MySQL/Merge/4.1gluh@mysql.com2005-07-213-14/+21
|\ | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.0
| * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-07-213-14/+21
| |\ | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b11216
| | * ctype-latin1.c:bar@mysql.com2005-07-211-1/+0
| | | | | | | | | | | | | | | removing extra empty line ,
| | * Bug#11216: 'show character set' describes latin1 incorrectlybar@mysql.com2005-07-213-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Index.xml: Fixing latin1 comment: it is actually cp1252, not iso-8859-1 ctype_latin1.result: changeing test results accordingly. ctype-latin1.c: Fixed to- and from-Unicode conversion maps for better Unicode round trip of undefined characters.
| * | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-07-212-8/+1
| |\ \ | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push
| | * \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-07-212-8/+1
| | |\ \ | | | |/ | | |/| | | | | into mysql.com:/space/my/mysql-4.1
| | | * Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-07-212-8/+1
| | | |\ | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1
| | | | * Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-07-212-8/+1
| | | | |\ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| * | | | \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-07-211-3/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push
| * | | | | Merge mysql.com:/home/jonas/src/mysql-4.1joreland@mysql.com2005-07-211-1/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push
| * \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-07-217-76/+123
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push
| * | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-07-2020-342/+552
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push
| | * \ \ \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1joreland@mysql.com2005-07-2020-342/+552
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push
* | | \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@deer.(none)2005-07-211-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.10839
| * \ \ \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@deer.(none)2005-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.10839
| | * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0hf@deer.(none)2005-07-211-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.10839
| | | * | | | | | | | | Fix for bug #10839 (myisamchk -rq crashes on spatial field)hf@deer.(none)2005-07-201-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0lenz@mysql.com2005-07-212-8/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0
| * | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0lenz@mysql.com2005-07-212-8/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0
| | * | | | | | | | | | Merge mysql.com:/space/my/mysql-4.1-buildlenz@mysql.com2005-07-202-8/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-build
| | | * | | | | | | | | - Manually merged fixes for BUG#12057 (*.plist (Mac OS X) files are ↵lenz@mysql.com2005-07-202-8/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed on Linux)
| | | | * | | | | | | | | - don't install the Mac OS X support files when running "make install" -lenz@mysql.com2005-07-203-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they're not needed outside of the source tree (BUG#12057) - Removed some more unneeded files from "make install" along the way
* | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2005-07-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-push
| * | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1bar@mysql.com2005-07-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0
| | * | | | | | | | | | | ctype-cp932.c:bar@mysql.com2005-07-211-3/+1
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After backporting from 5.0 fix. There is no an extra argument in 4.1.
* | | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0joreland@mysql.com2005-07-211-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-push
| * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1joreland@mysql.com2005-07-211-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0
| | * | | | | | | | | | | bug#11942 - ndb - backup during DDLjoreland@mysql.com2005-07-211-1/+6
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix bug introduced in alter table
* | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2005-07-2124-177/+325
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-push
| * | | | | | | | | | | Fix merge mistakepappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se2005-07-211-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se2005-07-218-76/+168
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
| | * | | | | | | | | | Fix mergepappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se2005-07-201-16/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se2005-07-206-70/+129
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
| | | * | | | | | | | | Bug #10600 After review fixesmronstrom@mysql.com2005-07-204-29/+18
| | | | | | | | | | | |
| | | * | | | | | | | | Bug #10600mronstrom@mysql.com2005-07-196-77/+133
| | | | |_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove_table_from_cache fails to signal other thread and gets blocked when other thread also gets blocked
| | * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-07-201-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | * | | | | | | | Bug #12055 NDB temp tables created by ALTER TABLE are usabletomas@poseidon.ndb.mysql.com2005-07-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not discover temporary files and make them visible
| | * | | | | | | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1georg@lmy002.wdf.sap.corp2005-07-204-4/+49
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
| | | * | | | | | | | | cs fixes from last commit georg@lmy002.wdf.sap.corp2005-07-201-10/+10
| | | | | | | | | | | |
| | | * | | | | | | | | fix for bug#12001georg@lmy002.wdf.sap.corp2005-07-192-1/+45
| | | | | | | | | | | |
| | | * | | | | | | | | minor fix (backport from 5.0) - changed function prototype/definitiongeorg@lmy002.wdf.sap.corp2005-07-192-3/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Added some missing casts and changed a define for alloca().jani@a193-229-222-105.elisa-laajakaista.fi2005-07-203-5/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2005-07-201-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | * | | | | | | | | | Fix date conversion on 32-bit machines.jimw@mysql.com2005-07-201-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Upgraded the version number, as 5.0.10 is cloned off.joerg@mysql.com2005-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This push includes the clone tag.
| * | | | | | | | | | | Implement MySQL framework to support consistent read views inkonstantin@mysql.com2005-07-2015-95/+151
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cursors. This should fix Bug#11813 when InnoDB part is in (tested with a draft patch). The idea of the patch is that if a storage engine supports consistent read views, we open one when open a cursor, set is as the active view when fetch from the cursor, and close together with cursor close.
* | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0joreland@mysql.com2005-07-213-9/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-push