kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f97fe50dbb
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0.27-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-10-21 01:13:50 +02:00
cmiller@zippy.cornsilk.net
482712bf83
Merge zippy.cornsilk.net:/home/cmiller/emergency/mysql-5.0.26a-release
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-10-20 17:30:28 -04:00
cmiller@zippy.cornsilk.net
b96ab282ea
Bug #23427 : incompatible ABI change in 5.0.26?
...
Revert 1 June change enough to restore ABI compatibility with previous
versions.
2006-10-20 17:17:24 -04:00
gkodinov@dl145s.mysql.com
a93cc1b70b
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
892495acaf
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 14:37:49 +02:00
istruewing@chilla.local
11d453cc33
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-merge
2006-10-19 09:59:01 +02:00
gkodinov/kgeorge@macbook.gmz
660d724f25
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B22367-5.0-opt-merge
2006-10-17 10:58:01 +03:00
gkodinov/kgeorge@macbook.gmz
a1310d84be
Bug #22367 : Optimizer uses ref join type instead of eq_ref for simple join on
...
strings
MySQL is setting the flag HA_END_SPACE_KEYS for all the keys that reference
text or varchar columns with collation different than binary.
This was done to handle correctly the situation where a lookup on such a key
may return more than 1 row because of the presence of many rows that differ
only by the amount of trailing space in the table's string column.
Inserting such values however appears to violate the unique checks on
INSERT/UPDATE. Thus that flag must not be set as it will prevent the optimizer
from choosing a faster access method.
This fix removes the setting of the HA_END_SPACE_KEYS flag.
2006-10-16 18:09:58 +03:00
msvensson@shellback.(none)
889e7147f6
Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINT
...
This will hopefully avoiid annoying crashes when running with --debug
Fix warnings from the above in mysqltest.c
2006-10-12 20:15:56 +02:00
msvensson@shellback.(none)
21e257b9af
Add ATTRIBUTE_FORMAT for _db_doprnt, it will catch problems
...
with DBUG_PRINT format specifiers
2006-10-12 20:02:17 +02:00
holyfoot/hf@mysql.com/deer.(none)
edc9026842
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/mysql-5.0.mrg
2006-10-12 13:50:22 +05:00
kaa@polly.local
2667443173
Merge polly.local:/tmp/maint/bug11655/my50-bug11655
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-10-12 11:28:44 +04:00
istruewing@chilla.local
3ee35a7618
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug8283-one
2006-10-11 22:28:06 +02:00
istruewing@chilla.local
35c94b6e2d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug8283
2006-10-11 17:57:47 +02:00
kaa@polly.local
737e13e526
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-10-11 14:57:09 +04:00
kaa@polly.local
a050de9837
Merge polly.local:/tmp/maint/bug11655/my41-bug11655
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-10-11 14:55:23 +04:00
kaa@polly.local
02ac635027
Merge polly.local:/tmp/maint/bug11655/my41-bug11655
...
into polly.local:/tmp/maint/bug11655/my50-bug11655
2006-10-11 14:16:30 +04:00
istruewing@chilla.local
c299de14ee
Merge chilla.local:/home/mydev/mysql-4.1-bug8283-one
...
into chilla.local:/home/mydev/mysql-5.0-bug8283
2006-10-09 20:03:12 +02:00
istruewing@chilla.local
1daa6a710d
Merge chilla.local:/home/mydev/mysql-4.1-bug8283
...
into chilla.local:/home/mydev/mysql-4.1-bug8283-one
2006-10-09 19:40:16 +02:00
istruewing@chilla.local
5f08a83186
Bug#8283 - OPTIMIZE TABLE causes data loss
...
OPTIMIZE TABLE with myisam_repair_threads > 1 performs a non-quick
parallel repair. This means that it does not only rebuild all
indexes, but also the data file.
Non-quick parallel repair works so that there is one thread per
index. The first of the threads rebuilds also the new data file.
The problem was that all threads shared the read io cache on the
old data file. If there were holes (deleted records) in the table,
the first thread skipped them, writing only contiguous, non-deleted
records to the new data file. Then it built the new index so that
its entries pointed to the correct record positions. But the other
threads didn't know the new record positions, but put the positions
from the old data file into the index.
The new design is so that there is a shared io cache which is filled
by the first thread (the data file writer) with the new contiguous
records and read by the other threads. Now they know the new record
positions.
Another problem was that for the parallel repair of compressed
tables a common bit_buff and rec_buff was used. I changed it so
that thread specific buffers are used for parallel repair.
A similar problem existed for checksum calculation. I made this
multi-thread safe too.
2006-10-09 19:26:55 +02:00
gluh@mysql.com/gluh.(none)
4f553f1d5f
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1-kt
2006-10-05 16:38:21 +05:00
kaa@polly.local
609a3cd295
Fixes a number of problems with time/datetime <-> string conversion functions:
...
- bug #11655 "Wrong time is returning from nested selects - maximum time exists
- input and output TIME values were not validated properly in several conversion functions
- bug #20927 "sec_to_time treats big unsigned as signed"
- integer overflows were not checked in several functions. As a result, input values like 2^32 or 3600*2^32 were treated as 0
- BIGINT UNSIGNED values were treated as SIGNED in several functions
- in cases where both input string truncation and out-of-range TIME value occur, only 'truncated incorrect time value' warning was produced
2006-10-04 17:13:32 +04:00
msvensson@neptunus.(none)
3f8edc3706
Merge bk-internal:/home/bk/mysql-5.0-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 14:24:43 +02:00
msvensson@shellback.(none)
5126dcc878
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 01:04:18 +02:00
msvensson@shellback.(none)
b975b4a793
Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers
...
This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro
2006-10-03 00:48:26 +02:00
msvensson@neptunus.(none)
14186cbdca
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-02 18:46:41 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
a8e845a6d2
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-10-02 14:19:51 +02:00
msvensson@neptunus.(none)
cb0a874c11
When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax
...
- disable __attribute__ when using qcc
2006-10-02 13:53:10 +02:00
msvensson@neptunus.(none)
1517d37048
Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol)
2006-10-02 13:46:40 +02:00
tsmith/tim@siva.hindu.god
5ffa3e1bff
Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol)
2006-09-30 02:00:04 -06:00
jimw@rama.(none)
f3ead515fb
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-29 19:32:05 -07:00
jimw@rama.(none)
0296227343
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-29 19:28:44 -07:00
jimw@rama.(none)
52d22ad827
Disable __attribute__ entirely on g++ < 3.4. (Bug #2717 )
2006-09-29 19:28:16 -07:00
bar@mysql.com/bar.intranet.mysql.r18.ru
07f9efd1e1
Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2
...
into mysql.com:/usr/home/bar/mysql-5.0.b6147rpl
2006-09-29 16:40:18 +05:00
jimw@rama.(none)
2961966b3b
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-28 20:17:17 -07:00
jimw@rama.(none)
d5d89bcf63
Fix merge of __attribute__ cleanup.
2006-09-28 20:15:58 -07:00
jimw@rama.(none)
68eadc8a79
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-28 18:09:10 -07:00
cmiller@zippy.cornsilk.net
b2ee81a6ec
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-28 10:09:57 -04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
47c2c590c8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/5.0-maint.b22227
2006-09-28 10:41:09 +05:00
gluh@mysql.com/gluh.(none)
c3d63bef2b
after merge fix
2006-09-27 19:21:29 +05:00
gluh@mysql.com/gluh.(none)
437c94317b
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-27 18:06:46 +05:00
gluh@mysql.com/gluh.(none)
a039376c43
Patch for bug#21432 is reverted
2006-09-27 17:49:16 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0b28a24861
Fix for bug #22227 : ulong not defined for client library
...
- don't use (ulong) type cast in the include/mysql_com.h as it's not
a standard type and might cause compilation errors on some platforms.
2006-09-22 14:46:18 +05:00
svoj@april.(none)
f21eadfc74
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:23:45 +05:00
msvensson@shellback.(none)
6a0841a1bc
Add definition of SHUT_RDWR for compiling on windows
2006-09-15 17:53:45 +02:00
msvensson@shellback.(none)
a297c29243
Merge msvensson.mysql.internal:mysql/my50-m-bug21222
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:49:24 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
72af9c2fef
Better comment text (thanks to SergeyP for suggestions made for the b#20471 patch)
2006-09-14 10:05:07 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
474779937b
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b20471v2
2006-09-14 09:12:47 +05:00
gluh@mysql.com/gluh.(none)
e2684ad5d7
after merge fix
2006-09-07 18:09:49 +05:00
gluh@mysql.com/gluh.(none)
76b97433c2
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-07 15:17:46 +05:00