reggie@mdk10.(none)
21133df02a
fixed conflicts
2005-05-20 16:34:59 -05:00
ramil@mysql.com
bb9dc47d3d
a fix (bug #10757 : gis-rtree.test fails)
2005-05-20 18:48:18 +05:00
monty@mysql.com
0b75f6e37b
compatibility issues
...
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
jimw@mysql.com
3f6aad900c
Resolve merge from 4.1
2005-05-18 11:06:34 -07:00
sergefp@mysql.com
cc13545413
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-16 22:21:19 +02:00
monty@mysql.com
9db45adb60
Merge with 4.1
2005-05-14 18:31:22 +03:00
sergefp@mysql.com
480957e7e6
Fix for BUG#9622: Make index statistics collection in MyISAM behave the same
...
way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal.
2005-05-14 00:21:53 +02:00
monty@mysql.com
b4e92e6360
Merge with 4.0
2005-05-14 00:01:40 +03:00
monty@mysql.com
9b39f8304e
Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045 )
2005-05-13 23:08:29 +03:00
monty@mishka.local
2d25da2a4b
concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file
...
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
2005-05-13 12:08:08 +03: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
286e204ac9
Bug#8321 - myisampack bug in compression algorithm
...
Merge from 4.0.
2005-04-28 16:09:53 +02:00
ingo@mysql.com
66a158a9db
Bug#8321 - myisampack bug in compression algorithm
...
This is the second of three changesets. It contains the pure bug fix.
It also contains the second after-review fixes.
The problem was that with gcc on x86, shifts are done modulo word size.
'value' is 32 bits wide and shifting it by 32 bits is a no-op.
This was triggered by an evil distribution of character incidences.
A distribution of 2917027827 characters made of 202 distinct values led to
34 occurrences of 32-bit Huffman codes.
This might have been the first time ever that write_bits() had to write
32-bit values. Since it can be expected that one day even 32 bits might
be insufficient, the third changeset suggests to enlarge some variables
to 64 bits.
2005-04-28 15:27:42 +02:00
joerg@mysql.com
a0cac19e6e
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-04-26 19:11:54 +02:00
ramil@mysql.com
db2b729c73
A fix (bug #10176 : problem with varchar keys).
2005-04-26 19:46:52 +05:00
joerg@mysql.com
49ac2dac3e
Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
...
Post-merge fix will follow.
2005-04-26 12:03:37 +02:00
joerg@mysql.com
48ba5e4956
Step 1 of the switch to support configuration with NPTL:
...
Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
2005-04-20 20:10:28 +02:00
ingo@mysql.com
e6b8c52808
Merge mysql.com:/home/mydev/mysql-4.1-bug9188
...
into mysql.com:/home/mydev/mysql-5.0-bug9188
2005-04-16 21:01:46 +02:00
ingo@mysql.com
37537b4b2d
Merge mysql.com:/home/mydev/mysql-4.1-bug9487
...
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 20:56:21 +02:00
ingo@mysql.com
ab0acbe14d
Merge
2005-04-16 17:58:11 +02:00
ingo@mysql.com
e2cf8b309e
Bug#9487 - myisampack segmentation violation and bus error
...
Fixed some casts for 64-bit systems.
Fixed a possible buffer overflow.
2005-04-15 19:26:38 +02:00
ingo@mysql.com
990ebef7f6
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-15 17:16:42 +02:00
mskold@mysql.com
add3fd3cca
Merge
2005-04-13 16:24:17 +02:00
serg@serg.mylan
0294339b9c
don't check record's checksum in REPAIR
2005-04-11 20:04:50 +02:00
ingo@mysql.com
3add511de7
Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
...
Since 4.1 keys are compared with trailing spaces.
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.
2005-04-08 14:13:02 +02:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732
Merge
2005-03-25 10:43:35 +04:00
bar@mysql.com
15378f833f
myisamchk.c:
...
Wrong help string fix.
2005-03-24 18:21:56 +04:00
dlenev@mysql.com
ea8adbff36
Manual merge of csets from -build tree into main 5.0 tree.
2005-03-21 11:39:47 +03:00
jimw@mysql.com
ee2b4ec959
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
...
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 )
2005-03-18 16:12:25 -08: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
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
serg@serg.mylan
0279cd50d9
myisam/myisam_ftdump.c
...
recalculate stats/gws for the last word in the index too
remove unused code
2005-03-09 12:59:20 +01:00
svoj@mysql.com
4bfa65391a
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/ft-mysql-5.0
2005-03-07 14:00:22 +04:00
svoj@mysql.com
2aa80e0be8
BUG#8351 post-review improvements.
2005-03-07 00:17:57 +04:00
serg@serg.mylan
2b447eceb1
myisam/ft_parser.c
...
protection against invalid string in ft_get_word
mysys/my_symlink2.c
typo fixed
2005-03-06 12:31:40 +01:00
svoj@mysql.com
efa1092c2e
Fix for BUG#8351 (5.0) - Double quote in Boolean Fulltext query causes crash
2005-03-04 16:10:41 +04:00
ingo@mysql.com
212388bd3c
Merge with after merge fix
2005-03-04 11:37:45 +01:00
ingo@mysql.com
b5775ee16c
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-03-04 09:35:21 +01:00
ingo@mysql.com
d68db573e6
Fix for a build bug.
...
Added a missing comma.
2005-03-04 09:30:22 +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
ingo@mysql.com
306bd2fc69
Merge
2005-03-02 10:56:13 +01:00
ingo@mysql.com
d3d7c46b1c
Bug#8306 - TRUNCATE leads to index corruption
...
Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.
2005-03-02 10:35:00 +01:00
monty@mysql.com
7e5f74f8f2
Merge with global tree
2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2
Remove compiler warnings and remove not used variables
...
(Found during build process)
2005-02-25 16:53:22 +02:00
reggie@mdk10.(none)
579293a29f
More changes to make 5.0.3 compile on Windows
...
sql_map.cc:
moved include of sys/stat outside of HAVE_SYS_MMAN_H define
my_decimal.h:
Added define for EMBEDDED_SERVER for call to string2my_decimal
mi_packrec.c:
removed cast to caddr_t
2005-02-23 22:55:46 -06:00
reggie@mdk10.(none)
2ffd3a3a61
Changes to allow 5.0.3 to compile on Windows after XA was pushed
...
logging_ok:
Logging to logging@openlogging.org accepted
mi_packrec.c:
Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
Changed how no mmap message is printed for Windows
sql_map.cc:
Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
2005-02-23 16:29:03 -06:00
bar@mysql.com
a88af6c1dd
Merge
2005-02-23 17:03:34 +04:00
bar@mysql.com
5ef265f219
Bug#8349 myisamchk: --set-charset does not work
...
What we need to be able to set in myisamchk is
actually a collation, not a character set. This
fix just changes to display the proper error message.
2005-02-22 16:37:25 +04:00
bar@mysql.com
47b85939a5
Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
...
Backporting Monty's fix for 5.0 into 4.1.
2005-02-18 16:10:12 +04:00
