summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-enginessvoj@june.mysql.com2007-11-123-1/+28
|\ | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
| * After merge fix.svoj@mysql.com/june.mysql.com2007-11-121-1/+1
| |
| * Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0svoj@mysql.com/june.mysql.com2007-11-123-1/+28
| |\ | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
| | * BUG#32111 - Security Breach via DATA/INDEX DIRECORY and RENAME TABLEsvoj@mysql.com/june.mysql.com2007-11-063-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RENAME TABLE against a table with DATA/INDEX DIRECTORY overwrites the file to which the symlink points. This is security issue, because it is possible to create a table with some name in some non-system database and set DATA/INDEX DIRECTORY to mysql system database. Renaming this table to one of mysql system tables (e.g. user, host) would overwrite the system table. Return an error when the file to which the symlink points exist.
* | | Merge stella.local:/home2/mydev/mysql-5.0-amainistruewing@stella.local2007-11-0624-64/+1482
|\ \ \ | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| * \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0tomas@whalegate.ndb.mysql.com2007-11-0224-64/+1482
| |\ \ \ | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
| | * \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-11-0224-64/+1482
| | |\ \ \ | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
| | | * | | Bug #31848: Test failure: Cluster has problems on insert with auto-incrementknielsen@ymer.(none)2007-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uninitialized variable causing failures for some interpreted update operations on gcc 4.2.1.
| | | * | | Merge loke.(none):/home/knielsen/devel/bug31810knielsen@loke.(none)2007-10-251-2/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into loke.(none):/home/knielsen/devel/mysql-5.0-ndb
| | | | * | | BUG#31810: Potential infinite loop with autoincrement failures in ndbknielsen@loke.(none)[knielsen]2007-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix extra semicolon causing if-statement to be disabled.
| | | * | | | Merge loke.(none):/home/knielsen/devel/bug31761knielsen@loke.(none)2007-10-255-24/+21
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into loke.(none):/home/knielsen/devel/mysql-5.0-ndb
| | | | * | | | BUG#31761: Code for cluster is not safe for strict-alias optimization in new gccknielsen@loke.(none)[knielsen]2007-10-255-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problem with AttributeHeader::init() seen with gcc 4.2.1. Using the same object as both Uint32 and class AttributeHeader violates strict aliasing rule.
| | | * | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold/marty@linux.site2007-10-244-6/+58
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
| | | | * | | | Removed tabsmskold/marty@mysql.com/linux.site2007-10-031-2/+2
| | | | | | | |
| | | | * | | | Bug#25817 UPDATE IGNORE doesn't check write_set when checking unique ↵mskold/marty@mysql.com/linux.site2007-10-024-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indexes: Added checks
| | | * | | | | ndb - bug#29390: fix mem leak introduced in previous csetpekka@sama.ndb.mysql.com2007-10-141-0/+32
| | | | | | | |
| | | * | | | | ndb - bug#29390: if ScanFilter is too large, abort or optionally discard itpekka@sama.ndb.mysql.com2007-10-0410-26/+1287
| | | | | | | |
| | | * | | | | [PATCH] BUG#29565 managment server can log entries multiple times after mgmd ↵stewart@flamingspork.com[stewart]2007-10-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restart Close the event log on shutdown of mgmd (in stopEventLog()) Index: ndb-work/ndb/src/mgmsrv/MgmtSrvr.cpp ===================================================================
| | | * | | | | remove debug printoutstewart@willster.(none)2007-10-011-1/+0
| | | |/ / / /
| | | * | | | [PATCH] BUG#30379 Better randomise time before retry in timeout check (DBTC)stewart@flamingspork.com[stewart]2007-09-254-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timoOutLoopStartLab() checks if any transactions have been delayed for so long that we are forced to perform some action (e.g. abort, resend etc). It is *MEANT* to (according to the comment): > To avoid aborting both transactions in a deadlock detected by time-out > we insert a random extra time-out of upto 630 ms by using the lowest > six bits of the api connect reference. > We spread it out from 0 to 630 ms if base time-out is larger than 3 sec, > we spread it out from 0 to 70 ms if base time-out is smaller than 300 msec, > and otherwise we spread it out 310 ms. The comment (as all do) lies. the API connect reference is not very random, producing incredibly predictable "random" numbers. This could lead to both txns being aborted instead of just one. Before: timeout value: 123 3 timeout value: 122 2 timeout value: 122 2 timeout value: 122 2 timeout value: 123 3 After: timeout value: 127 7 timeout value: 126 6 timeout value: 129 9 timeout value: 139 19 timeout value: 137 17 timeout value: 151 31 timeout value: 130 10 timeout value: 132 12 Index: ndb-work/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp ===================================================================
* | | | | | | Merge stella.local:/home2/mydev/mysql-5.0-ateamistruewing@stella.local2007-11-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| * \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-enginessvoj@june.mysql.com2007-11-061-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG31950/mysql-5.0-engines
| | * | | | | | | BUG#31950 - repair table hangs while processing multicolumn utf8svoj@mysql.com/june.mysql.com2007-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fulltext index Having a table with broken multibyte characters may cause fulltext parser dead-loop. Since normally it is not possible to insert broken multibyte sequence into a table, this problem may arise only if table is damaged. Affected statements are: - CHECK/REPAIR against damaged table with fulltext index; - boolean mode phrase search against damaged table with or without fulltext inex; - boolean mode searches without index; - nlq searches. No test case for this fix. Affects 5.0 only.
* | | | | | | | | Bug#4692 - DISABLE/ENABLE KEYS waste a spaceistruewing@stella.local2007-11-063-57/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling and enabling indexes on a non-empty table grows the index file. Disabling indexes just sets a flag per non-unique index and does not free the index blocks of the affected indexes. Re-enabling indexes creates new indexes with new blocks. The old blocks remain unused in the index file. Fixed by dropping and re-creating all indexes if non-empty disabled indexes exist when enabling indexes. Dropping all indexes resets the internal end-of-file marker to the end of the index file header. It also clears the root block pointers of every index and clears the deleted blocks chains. This way all blocks are declared as free.
* | | | | | | | | Bug#32108 - subselect.test produces warnings filesistruewing@stella.local2007-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment sign of -- at line begin in test files lead to warnings from mysqltest. Changed -- to #.
* | | | | | | | | Bug#32107 - ctype_uca.test produces warnings filesistruewing@stella.local2007-11-051-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment sign of -- at line begin in test files lead to warnings from mysqltest. Changed -- to #.
* | | | | | | | Merge stella.local:/home2/mydev/mysql-4.1-axmrgistruewing@stella.local2007-11-020-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| * | | | | | | Merge stella.local:/home2/mydev/mysql-4.1-ateamistruewing@stella.local2007-11-023-1/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-4.1-axmrg
* | \ \ \ \ \ \ \ Merge stella.local:/home2/mydev/mysql-5.0-ateamistruewing@stella.local2007-11-022-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| * \ \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-4.1-enginessvoj@june.mysql.com2007-11-022-0/+14
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-5.0-engines
| | * | | | | | | | BUG#11392 - fulltext search bugsvoj@mysql.com/june.mysql.com2007-10-303-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fulltext boolean mode phrase search may crash server on platforms where size of pointer is not equal to size of unsigned integer (in other words some 64-bit platforms). The problem was integer overflow. Affects 4.1 only.
* | | | | | | | | | Merge stella.local:/home2/mydev/mysql-4.1-axmrgistruewing@stella.local2007-11-020-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| * | | | | | | | | Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306istruewing@stella.local2007-11-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preliminarily disabled test case
| * | | | | | | | | Merge stella.local:/home2/mydev/mysql-4.1-amainistruewing@stella.local2007-11-025-1/+88
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-4.1-axmrg
* | \ \ \ \ \ \ \ \ \ Merge stella.local:/home2/mydev/mysql-5.0-amainistruewing@stella.local2007-11-029-10/+172
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | / / / / / | |_|_|_|_|/ / / / / |/| | | | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| * | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.0-amainistruewing@stella.local2007-11-012-9/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| | * | | | | | | | | Post-merge fixistruewing@stella.local2007-11-011-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Bug#31909 - New gis.test creates warnings filesistruewing@stella.local2007-11-011-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment sign of -- at line begin in test files lead to warnings from mysqltest. Changed -- to #.
| * | | | | | | | | | Merge stella.local:/home2/mydev/mysql-4.1-axmrgistruewing@stella.local2007-10-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| | * | | | | | | | | Merge stella.local:/home2/mydev/mysql-4.1-amainistruewing@stella.local2007-10-315-1/+88
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | into stella.local:/home2/mydev/mysql-4.1-axmrg
| * | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.0-amainistruewing@stella.local2007-10-317-1/+163
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | / / / / / | | | |_|_|/ / / / / | | |/| | | | | | | into stella.local:/home2/mydev/mysql-5.0-axmrg
| | * | | | | | | | protect bug31473 from regressing into 5.0antony@pcg5ppc.xiphis.org2007-10-252-0/+75
| | | | | | | | | |
| | * | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-enginessvoj@june.mysql.com2007-10-245-1/+88
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
| | | * | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2007-10-245-1/+88
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
| | | | * | | | | | | BUG#31159 - fulltext search on ucs2 column crashes serversvoj@mysql.com/june.mysql.com2007-10-245-1/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ucs2 doesn't provide required by fulltext ctype array. Crash happens because fulltext attempts to use unitialized ctype array. Fixed by converting ucs2 fields to compatible utf8 analogue.
* | | | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-10-301-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS, work around for problem with automake 1.10 (bug#24809)
* | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-builddf@pippilotta.erinye.com2007-10-301-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| * | | | | | | | | | | bug#30630df@pippilotta.erinye.com2007-10-301-0/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Merge trift2.:/MySQL/M41/push-4.1joerg@trift2.2007-10-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
| * | | | | | | | | | | Merge trift2.:/MySQL/M41/mysql-4.1joerg@trift2.2007-10-291-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M41/push-4.1