cmiller@zippy.cornsilk.net
a4d39c753a
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-05 17:44:08 -04:00
georg@lmy002.wdf.sap.corp
27636d9303
Additional files for cmake support
2006-08-31 19:52:42 +02:00
sergefp@mysql.com
f95b5b0a5d
BUG#17314: Can't use index_merge/intersection for MERGE tables
...
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.
2006-02-11 21:51:43 +03:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-27 23:43:20 +03:00
monty@mysql.com
3e653fb922
Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization
2005-10-25 02:27:40 +03:00
ingo@mysql.com
b9630b50d2
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-23 17:27:07 +02:00
ingo@mysql.com
bf89c139a4
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-23 10:49:08 +02:00
ingo@mysql.com
4025d2965b
Bug#9112 - Merge table with composite index producing invalid results with 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.
2005-09-23 10:15:11 +02:00
monty@mysql.com
987edeaa9b
Fixed compiler warnings
2005-07-28 21:25:05 +03:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
reggie@mdk10.(none)
c5f68180f4
merged changes from 4.1
2005-05-23 12:55:39 -05:00
reggie@mdk10.(none)
c9e7c0fd56
BUG# 10687: MERGE Engine fails on Windows
...
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.
2005-05-23 11:53:16 -05:00
ingo@mysql.com
be34b54e1d
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-28 19:34:05 +02:00
ingo@mysql.com
1f0d0a6729
BUG#5964 - 4.1 MERGE tables regression from 4.0
...
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.
2005-04-28 18:28:50 +02:00
brian@zim.(none)
2a7c71e309
Changes to create storage directory for storage engines.
2005-04-26 18:19:54 -07:00
brian@zim.(none)
473e1ffd3a
Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup).
2005-03-16 16:22:56 -08:00
ingo@mysql.com
212388bd3c
Merge with after merge fix
2005-03-04 11:37:45 +01:00
serg@serg.mylan
e47d0a0e2d
merge
2005-03-03 23:07:20 +01:00
serg@serg.mylan
8d9a53a78c
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
2005-03-03 19:51:29 +01:00
monty@mysql.com
d71c030587
After merge fixes
2004-12-31 00:44:00 +02:00
sergefp@mysql.com
0bf584d9a5
Fix and testcase for BUG#6699
2004-11-29 06:51:30 +03:00
serg@serg.mylan
130d2fd57f
bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open()
2004-09-06 22:20:40 +02:00
monty@mysql.com
6adaff23a4
Review of new pushed code (Indentation fixes and simple optimizations)
...
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
2004-08-31 14:35:04 +03:00
serg@serg.mylan
0df870ef1e
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 14:07:59 +02:00
serg@serg.mylan
a835e9bc9c
unnecessary LINT_INIT removed
2004-08-23 13:43:55 +02:00
serg@serg.mylan
d0afecff15
merged
2004-08-22 12:47:11 +02:00
serg@serg.mylan
d5bf903e4d
after merge fixes
2004-08-22 12:43:26 +02:00
serg@serg.mylan
99bb6ff7a0
ported bugfix for #2408 from 3.23
...
(cannot call it a "merge" :)
2004-08-22 10:22:59 +02:00
serg@serg.mylan
ca35127739
bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash.
...
Abandoned improper use of MyISAM data.
Thanks Ingo!
2004-08-22 09:36:17 +02:00
serg@serg.mylan
3b59dd1bd0
bug#4008 - merge table cannot determine what key caused "dupl. key" error
2004-06-25 15:12:13 +02:00
monty@mishka.local
314a8bf114
key_cmp -> key_cmp_if_same
...
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
2004-05-16 14:48:32 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
serg@serg.mylan
f131bd53d4
replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function
2003-08-01 14:58:03 +02:00
serg@serg.mylan
25b16cd6ce
bug #702 - ALTER TABLE tm UNION=(t1,t2) doesn't work if t1.MYD is compressed
2003-07-15 20:43:57 +02:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
monty@mashka.mysql.fi
e741c893ea
Fix to remove compiler warnings
2003-04-28 19:05:57 +03:00
monty@mashka.mysql.fi
023d6dd39b
Merge with 4.0.11
2003-02-04 21:52:14 +02:00
serg@serg.mysql.com
1ced5948f0
low-level error messages cleanup
2003-01-28 17:42:08 +01:00
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
monty@mashka.mysql.fi
62dfd57475
Removed compiler warnings
...
Fixed wrong variable name for Windows
2002-12-12 21:01:32 +02:00
serg@serg.mysql.com
94cb1daa52
ANALYZE for MERGE
2002-12-10 00:06:05 +01:00
monty@mashka.mysql.fi
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
monty@mashka.mysql.fi
6603d75213
New multi-table-update code
...
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1 (We should use TRUE and FALSE)
2002-11-29 16:40:18 +02:00
serg@serg.mysql.com
b385eb4a05
removed redundant -I include-dirs
2002-11-26 14:01:08 +01:00
serg@serg.mysql.com
5b57077778
myisammrg::index_next_same
2002-11-25 22:18:44 +01:00
monty@mashka.mysql.fi
dac6498f9b
Merge with 4.0
2002-11-21 15:56:48 +02:00
serg@serg.mysql.com
1173fc780d
better boundary behaviour
2002-11-17 20:08:42 +01:00
serg@serg.mysql.com
8796fc2dc5
myisammrg::records_in_range
2002-11-17 18:54:23 +01:00
lenz@mysql.com
996255648b
- Applied required modifications for automake 1.5
...
- "make distcheck" needs to be fixed
2002-11-17 16:45:21 +01:00