summaryrefslogtreecommitdiff
path: root/myisammrg
Commit message (Collapse)AuthorAgeFilesLines
* Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-10-032-2/+10
|\ | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
| * Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-09-292-2/+7
| |\ | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
| | * Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-09-282-2/+7
| | |\ | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
| | | * BUG#21617 - crash when selecting from merge table with inconsistent indexessvoj@mysql.com/april.(none)2006-09-282-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crash may happen when selecting from a merge table that has underlying tables with less indexes than in a merge table itself. If number of keys in merge table is not bigger than requested key number, return error.
| * | | Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-09-271-0/+3
| |\ \ \ | | |/ / | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
| | * | BUG#10974 - No error message if merge table based on union of innodb, memorysvoj@mysql.com/april.(none)2006-09-201-0/+3
| | |/ | | | | | | | | | | | | | | | Fixed confusing error message from the storage engine when it fails to open underlying table. The error message is issued when a table is _opened_ (not when it is created).
* | | Merge naruto.:C:/cpp/bug20789/my50-bug20789Kristofer.Pettersson@naruto.2006-09-201-1/+12
|\ \ \ | |/ / |/| | | | | into naruto.:C:/cpp/mysql-5.0-maint
| * | Bug#20789 Merge Subtable Rename Causes CrashKristofer.Pettersson@naruto.2006-09-191-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When a MyISAM table which belongs to a merge table union and is renamed the associated file descriptors are closed on windows. This causes a server crash next time an insert or update is performed on the merge table. - This patch prevents the system from crashing on windows by checking for bad file descriptors every time the MyISAM table is locked by associated the merge table.
* | | make dist changes for Cmake buildgeorg@lmy002.wdf.sap.corp2006-09-011-1/+1
| | |
* | | Additional files for cmake supportgeorg@lmy002.wdf.sap.corp2006-08-311-0/+9
|/ /
* | BUG#17314: Can't use index_merge/intersection for MERGE tablessergefp@mysql.com2006-02-111-3/+17
| | | | | | | | | | | | | | | | 1. Fix index access costs for MERGE tables, set block_size=myisam_block_size/#underlying_tables instead of 0 which it was before. 2. Make index scans on MERGE table to return records in (key_tuple, merge_table_rowid) order, instead of just (key_tuple) order. This makes an index scan on MERGE table to be truly a ROR-scan which is a requirement for index_merge union/intersection.
* | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-10-271-2/+2
|\ \ | |/ | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
| * Added more tests for new UPDATE ... ORDER BY ... LIMIT optimizationmonty@mysql.com2005-10-251-2/+2
| |
* | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-09-231-5/+12
|\ \ | |/ | | | | into mysql.com:/home/mydev/mysql-5.0-5000
| * Merge mysql.com:/home/mydev/mysql-4.0-4000ingo@mysql.com2005-09-231-5/+12
| |\ | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | * Bug#9112 - Merge table with composite index producing invalid results with ↵ingo@mysql.com2005-09-231-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some queries The problem was an ab-use of last_rkey_length. Formerly we saved the packed key length (of the search key) in this element. But in certain cases it got replaced by the (packed) result key length. Now we use a new element of MI_INFO to save the packed key length of the search key.
| * | Fixed compiler warningsmonty@mysql.com2005-07-281-1/+1
| | |
* | | Mergekent@mysql.com2005-07-061-1/+1
|\ \ \ | |/ /
| * | Makefile.am:kent@mysql.com2005-07-051-1/+2
| | | | | | | | | | | | | | | Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir
* | | merged changes from 4.1reggie@mdk10.(none)2005-05-231-1/+3
|\ \ \ | |/ /
| * | BUG# 10687: MERGE Engine fails on Windowsreggie@mdk10.(none)2005-05-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is a replacement for the original patch given by Ingo. This one comes from Monty. The problem is that merge files now use unix style pathnames on all platforms. The merge file open code was not properly converting those pathnames back to non-unix when necessary.
* | | Merge mysql.com:/home/mydev/mysql-4.1-4100ingo@mysql.com2005-04-281-1/+1
|\ \ \ | |/ / | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000
| * | BUG#5964 - 4.1 MERGE tables regression from 4.0ingo@mysql.com2005-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the creation of the .MRG file so that only the table name is written when the MyISAM table is in the same database as the MERGE table, a relative path is used in other cases in mysqld, and possibly an absolute path is used in an embedded server. No test case is added as the external behaviour is unchanged. Only the file names within the .MRG file are changed.
* | | Removed support for RAID, mit-threads, and MySQL FS (really, if someone ↵brian@zim.(none)2005-03-161-1/+1
| | | | | | | | | | | | wants this feature look at a web-dav hookup).
* | | Merge with after merge fixingo@mysql.com2005-03-041-1/+1
|\ \ \ | |/ /
| * | mergeserg@serg.mylan2005-03-031-1/+1
| |\ \ | | |/
| | * Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)serg@serg.mylan2005-03-031-1/+1
| | |
| | * bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open()serg@serg.mylan2004-09-061-14/+14
| | |
* | | After merge fixesmonty@mysql.com2004-12-311-1/+1
|/ /
* | Fix and testcase for BUG#6699sergefp@mysql.com2004-11-291-11/+22
| |
* | Review of new pushed code (Indentation fixes and simple optimizations)monty@mysql.com2004-08-311-14/+14
| | | | | | | | | | Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database Safety fix for mailformed MERGE files
* | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0serg@serg.mylan2004-08-231-8/+4
|\ \ | |/ | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * unnecessary LINT_INIT removedserg@serg.mylan2004-08-231-8/+4
| |
* | mergedserg@serg.mylan2004-08-221-65/+64
|\ \ | |/
| * after merge fixesserg@serg.mylan2004-08-221-3/+7
| |
| * ported bugfix for #2408 from 3.23serg@serg.mylan2004-08-221-64/+59
| |\ | | | | | | | | | (cannot call it a "merge" :)
| | * bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash.serg@serg.mylan2004-08-221-52/+49
| | | | | | | | | | | | | | | Abandoned improper use of MyISAM data. Thanks Ingo!
| | * - Applied required modifications for automake 1.5lenz@mysql.com2002-11-171-8/+0
| | | | | | | | | | | | - "make distcheck" needs to be fixed
* | | bug#4008 - merge table cannot determine what key caused "dupl. key" errorserg@serg.mylan2004-06-251-2/+2
| | |
* | | key_cmp -> key_cmp_if_samemonty@mishka.local2004-05-161-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | New records_in_range() interface (similar to read_range()) Macros for faster bitmap handling Simplify read_range() code (#WL1786) New general key_cmp() function to compare keys
* | | Merge with 4.0.14monty@mashka.mysql.fi2003-08-118-14/+21
|\ \ \ | |/ /
| * | replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) ↵serg@serg.mylan2003-08-017-8/+18
| | | | | | | | | | | | read function
| * | bug #702 - ALTER TABLE tm UNION=(t1,t2) doesn't work if t1.MYD is compressedserg@serg.mylan2003-07-151-6/+3
| | |
* | | Merge with 4.0.13monty@narttu.mysql.fi2003-05-191-1/+1
|\ \ \ | |/ /
| * | Fix to remove compiler warningsmonty@mashka.mysql.fi2003-04-281-1/+1
| | |
* | | Merge with 4.0.11monty@mashka.mysql.fi2003-02-041-1/+1
|\ \ \ | |/ /
| * | low-level error messages cleanupserg@serg.mysql.com2003-01-281-1/+1
| | |
* | | Merge with 4.0.8monty@mashka.mysql.fi2003-01-032-12/+26
|\ \ \ | |/ /
| * | Removed compiler warningsmonty@mashka.mysql.fi2002-12-121-1/+2
| | | | | | | | | | | | Fixed wrong variable name for Windows
| * | ANALYZE for MERGEserg@serg.mysql.com2002-12-102-13/+26
| | |