summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge chilla.local:/home/mydev/mysql-5.1--mainistruewing@chilla.local2006-09-2110-10/+10
|\ | | | | | | into chilla.local:/home/mydev/mysql-5.1-tomain
| * Merge xiphis.org:/home/antony/work2/p2-bug22417.1acurtis/antony@ltamd64.xiphis.org2006-09-2010-10/+10
| |\ | | | | | | | | | into xiphis.org:/home/antony/work2/p2-bug22417.2
| | * Bug#22417acurtis/antony@xiphis.org/ltamd64.xiphis.org2006-09-1810-10/+10
| | | | | | | | | | | | "plug.in not included in dist source"
* | | Merge chilla.local:/home/mydev/mysql-5.1--teamistruewing@chilla.local2006-09-2079-2608/+9540
|\ \ \ | |/ / |/| | | | | into chilla.local:/home/mydev/mysql-5.1-tomain
| * | Merge chilla.local:/home/mydev/mysql-5.0-bug14400-montyistruewing@chilla.local2006-09-195-45/+57
| |\ \ | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-bug14400-monty
| | * | After merge fix.istruewing@chilla.local2006-09-191-6/+7
| | | |
| | * | Merge chilla.local:/home/mydev/mysql-4.1-bug14400-montyistruewing@chilla.local2006-09-195-40/+51
| | |\ \ | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
| | | * \ Merge bk-internal:/home/bk/mysql-4.0istruewing@chilla.local2006-09-195-42/+56
| | | |\ \ | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
| | | | * | Better bug fix for #14400 "Query joins wrong rows from table which is ↵monty@mysql.com/narttu.mysql.fi2006-08-108-65/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subject of "concurrent insert"" The previous bug fix didn't work when using partial keys. Don't use GNUC min/max operations are they are depricated. Fixed valgrind warning
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-09-190-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.0--team
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-09-1810-24/+181
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.0--team
| * | | | | | | post merge fixesacurtis/antony@xiphis.org/ltamd64.xiphis.org2006-09-186-24/+14
| | | | | | | |
| * | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesacurtis/antony@ltamd64.xiphis.org2006-09-1821-19/+269
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/engines-merge
| | * | | | | | Merge april.(none):/home/svoj/devel/bk/mysql-4.1-enginessvoj@april.(none)2006-09-180-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
| | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-09-151-2/+2
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-4.1-bug14400
| | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-09-123-20/+98
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-4.1-bug14400
| | | * \ \ \ \ \ \ Merge april.(none):/home/svoj/devel/bk/mysql-4.1-enginessvoj@april.(none)2006-08-221-6/+14
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG19702/mysql-4.1
| | * | \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@april.(none)2006-09-1829-43/+451
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
| | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-09-151-2/+2
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.0-bug14400
| | | * | | | | | | | Merge april.(none):/home/svoj/devel/bk/mysql-5.0-enginessvoj@april.(none)2006-09-127-4/+83
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-push
| | | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-09-123-20/+98
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.0-bug14400
| | | * | | | | | | | | | Bug#20573acurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-3021-13/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "strict mode: inserts autogenerated auto_increment value bigger than max" Strict mode should fail if autoincrement value is out of range
| | | * | | | | | | | | | Merge may.pils.ru:/home/svoj/devel/mysql/BUG19702/mysql-4.1svoj@may.pils.ru2006-08-231-6/+14
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | into may.pils.ru:/home/svoj/devel/mysql/BUG19702/mysql-5.0-engines
| | | | * | | | | | | | | BUG#19702 - Using myisampack/myisamchk on a FULLTEXT indexedsvoj@may.pils.ru2006-08-171-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table results in table corrupt Fulltext key has always two keysegs, thus we need to update FT_SEGS (last) element from seg array in case of compressed table. Also we must update ft2_keyinfo.
| * | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1svoj@april.(none)2006-09-181-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
| * | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginessvoj@april.(none)2006-09-187-17/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
| | * | | | | | | | | | | | 1. Cumulated fix for Bug#22398, #22404 and #22405mleich@three.local.lan2006-09-187-17/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. Correct some logical bugs within the tests, which were caused by automatic resolve of BitKeeper
| * | | | | | | | | | | | | Merge april.(none):/home/svoj/devel/bk/mysql-5.1svoj@april.(none)2006-09-1858-2587/+9157
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
| | * | | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled im_instance_conf to get autopush through
| | * | | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled innodb_mysql to get autopush through
| | * | | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled index_merge_myisam to get autopush through
| | * | | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled index_merge_innodb to get autopush through
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2006-09-151-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-toteam
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-5.0-bug14400istruewing@chilla.local2006-09-141-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-bug14400
| | | | * | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug14400istruewing@chilla.local2006-09-141-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | / / | | | | | | |_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | into chilla.local:/home/mydev/mysql-5.0-bug14400
| | | | | * | | | | | | | | Bug#14400 - Query joins wrong rows from table which is subject ofistruewing@chilla.local2006-09-141-2/+2
| | | | | | |_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "concurrent insert" After merge fix.
| | * | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled im_daemon_life_cycle with permission by Calvin
| | * | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.1--mainistruewing@chilla.local2006-09-1458-2587/+9152
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-toteam
| | | * | | | | | | | | | After merge fix.svoj@april.(none)2006-09-122-2/+35
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-enginessvoj@april.(none)2006-09-126-5/+52
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.1-engines
| | | | * | | | | | | | | BUG#20256 - LOCK WRITE - MyISAMsvoj@april.(none)2006-09-127-4/+83
| | | | | |_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only MyISAM tables locked with LOCK TABLES ... WRITE were affected. A query that is optimized with index_merge doesn't reflect rows inserted within LOCK TABLES. MyISAM doesn't flush a state within LOCK TABLES. index_merge optimization creates a copy of the handler, which thus gets outdated MyISAM state. New handler->clone() method is introduced to fix this problem. For non-MyISAM storage engines it allocates a handler and opens it with ha_open(). For MyISAM it additionally copies MyISAM state pointer to cloned handler.
| | | * | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug14400istruewing@chilla.local2006-09-073-20/+98
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-bug14400
| | | | * | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug14400istruewing@chilla.local2006-09-073-20/+98
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.0-bug14400
| | | | | * | | | | | | Merge chilla.local:/home/mydev/mysql-4.0-bug14400istruewing@chilla.local2006-09-073-47/+86
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-4.1-bug14400
| | | | | | * | | | | | | Bug#14400 - Query joins wrong rows from table which is subject ofistruewing@chilla.local2006-09-073-16/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "concurrent insert" Additional fix for full keys and test case.
| | | | | * | | | | | | | Merge chilla.local:/home/mydev/mysql-4.0-bug14400istruewing@chilla.local2006-08-293-12/+62
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-4.1-bug14400
| | | | | | * | | | | | | Bug#14400 - Query joins wrong rows from table which isistruewing@chilla.local2006-08-293-12/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subject of "concurrent insert" Better fix by Monty: "The previous bug fix didn't work when using partial keys."
| | | * | | | | | | | | | This changeset belongs tomleich@three.local.lan2006-08-1615-120/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#3397 Refactoring storage engine test cases (for falcon) It contains fixes according to second code review. - Remove any occurence of hardcoded assignments of storage engines - Use variable names exact telling what it is used for - Updated comments - remove trailing spaces
| | | * | | | | | | | | | This changeset belongs tomleich@three.local.lan2006-08-1649-2319/+8747
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#3397 Refactoring storage engine test cases (for falcon) It contains also fixes according to code review. Contents: Testcases which were in history dedicated to InnoDB or MyISAM only. Modifications: 1. Shift the main testing code into include/<testing field>.inc Introduce $variables which can be used to omit tests for features which are not supported by certain storage engines. 2. The storage engine to be tested is assigned within the toplevel script (t/<whatever>_<engine>.test) via variable $engine_type and the the main testing code is sourced from include/<testing field>.inc 3. Some toplevel testscripts have to be renamed to - avoid immediate or future namespace clashes - show via filename which storage engine is tested 4. Minor code cleanup like remove trailing spaces, some additional comments ....
* | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-09-181-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
View Lorry Controller Status