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
15a78334c3
BUG#9622, stage 2, work together with fix for BUG#12232:
...
added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).
2005-10-21 06:29:17 +04:00
e91712d9bb
pthread_handler_decl() changed to be ctags-friendly
...
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
b5f33d2bc4
Manual merge
2005-08-02 12:09:49 -07:00
a4d6113d22
After merge fix.
2005-08-02 12:57:26 +05:00
0f98bf44ef
Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1
2005-08-02 12:12:37 +05:00
19fe33e16c
BUG#11684 fix.
...
Repair crashes mysql when table has fulltext index.
2005-08-02 11:33:26 +05:00
ec15dda2bf
Bug#10932 - Building server with key limit of 128, makes test cases fail
...
This patch allows to configure MyISAM for 128 indexes per table.
The main problem is the key_map, wich is implemented as an ulonglong.
To get rid of the limit and keep the efficient and flexible
implementation, the highest bit is now used for all upper keys.
This means that the lower keys can be disabled and enabled
individually as usual and the high keys can only be disabled and
enabled as a block. That way the existing test suite is still
applicable, while more keys work, though slightly less efficient.
To really get more than 64 keys, some defines need to be changed.
Another patch will address this.
2005-07-19 14:13:56 +02:00
c76405a7ee
merged
2005-01-24 19:41:42 +01:00
67ba2e367a
fixes/cleanups according to Coverity report
2005-01-24 15:48:25 +01:00
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
2083ecd124
myisam/sort.c:my_var_write and mysys/hash.c:hash_key made static inline,
...
not simply inline, to fix the linking failure on Sun Solaris 9 (sparc)
with Sun Studio 9, reported by Peter Harvey.
2004-12-16 02:43:35 +03:00
31122efde7
Merge with 4.1
...
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
b60713c033
bug in my_strnncoll_utf8 (and friends) fixed
...
cleanups
better, charset-dependent, ft_max_len_for_sort value
2004-08-30 08:37:36 +02:00
2fd11169ab
failing fulltext_order_by.test fixed
2004-07-15 17:30:55 +02:00
5b3c418b48
After merge fixes
...
Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)
Sanja needs to check out the calling of close_thread_tables() in sp_head.cc
2004-07-15 04:19:07 +03:00
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00
3ad2158b42
Portability fixes
2004-05-27 12:03:16 +03:00
63f4858030
Merged 4.1 -> 5.0
2003-12-05 13:11:50 +01:00
3f1d0acbad
make a clear distinction between max_word_length in *characters* and in *bytes*
2003-12-04 21:58:28 +01:00
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
e741c893ea
Fix to remove compiler warnings
2003-04-28 19:05:57 +03:00
dd377bfba6
Fixed problem when comparing a key for a multi-byte-character set. (bug 152)
...
Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo; This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
Fix that USE_FRM works for all table types (bug 97)
2003-04-27 22:12:08 +03:00
5d4e9f95f2
Merging
2003-04-08 19:43:24 +05:00
0428d08606
SCRUM
...
two KILL versions
code trimming with headquarter's suggestions
2003-04-08 19:18:33 +05:00
f8f0b70380
SCRUM
...
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05:00
3bed7a6131
Merge with 4.0.13
2003-03-26 18:37:38 +02:00
6c033b9854
make myisam usable without threads (and even w/o pthread_t)
2003-03-24 11:19:28 +01:00
eced8a1df9
bug in ft2 repair-by-sort fixed (sort_key_cmp() using ft2_keydef for ft keys)
2003-02-18 18:06:28 +01:00
25de9c19b2
After merge fixes & remove compiler warnings
...
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
2003-02-07 15:47:24 +02:00
0dff67cba2
Two-level index structure for FULLTEXT indexes
2003-01-21 19:24:34 +01:00
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
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
ff368e9590
Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi
2002-11-28 15:24:55 +05:00
add98cd188
Correct view of sort.c and mi_too_big_key_for_sort()
2002-11-28 15:16:56 +05:00
dac6498f9b
Merge with 4.0
2002-11-21 15:56:48 +02:00
625b57b556
Move MI_SORT_PARAM and BUFFPEK to myisamdef.h, delete KEY_STORE, change functions
...
of store keys to temp. file
2002-11-17 05:41:42 +05:00
f19fa1762c
add functions for store keys to temporary file with variable length
2002-11-13 03:53:45 +05:00
a2bdf9265f
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
2002-11-07 03:54:00 +02:00
43599856b2
make REPAIR killable
2002-10-22 00:25:36 +00:00
e65536b147
--tmpdir=dir1:dir2:... support in myisamchk
2002-10-08 14:34:04 +00:00
c702a1f8fd
Removed wrong implementation of CUBE/ROLLUP
...
Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.
2002-07-24 19:55:08 +03:00
2fe3fec4e4
parallel repair needs rec_buff local for thread !!!
2002-07-14 21:47:46 +02:00
0a1de562a7
merged
2002-06-30 16:14:48 +00:00
53ac59b913
"myisamchk -p" for parallel recover works (no extensive testing though)
2002-06-30 14:17:29 +00:00
578a9d9901
Updated windows files (VC++ files and winmysqladmin).
...
Portability fixes.
Removed compiler warnings.
2002-06-28 17:26:11 +03:00
33f84cf8fe
Fixed bug in REPAIR table.
...
Portability fix in safemalloc.c
2002-06-28 15:06:04 +03:00
