msvensson@neptunus.(none)
74d8113c2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 22:02:33 +02:00
msvensson@neptunus.(none)
23700ab32b
Update the reference file for mysql API/ABI for 5.0
2006-10-24 22:00:08 +02:00
msvensson@neptunus.(none)
e0985bef96
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
1a7676fa65
WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
...
BUG#23427 incompatible ABI change in 5.0.26?
- Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
2006-10-24 20:32:07 +02:00
tsmith@maint1.mysql.com
8f75d0913b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into maint1.mysql.com:/data/localhome/tsmith/bk/51
2006-10-24 20:01:01 +02:00
mmj@tiger.local[mmj]
da721fe7aa
Bug #23427 : incompatible ABI change in 5.0.26?
...
Revert 1 June change enough to restore ABI compatibility with previous
versions.
2006-10-24 19:05:11 +02:00
holyfoot/hf@deer.(none)
e203abf0a1
Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmt
...
into mysql.com:/home/hf/work/current_stmt/my51-current_stmt
2006-10-24 17:53:15 +05:00
holyfoot/hf@mysql.com/deer.(none)
887e6af60c
Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt
...
into mysql.com:/home/hf/work/current_stmt/my50-current_stmt
2006-10-24 17:50:46 +05:00
holyfoot/hf@mysql.com/deer.(none)
d0ef58b6a4
Bug #23427 (incompatible ABI change)
...
the incompatibility was caused by current_stmt member added to the MYSQL
structure.
It's possible to move it to THD structure instead which saves ABI
2006-10-24 17:19:02 +05:00
msvensson@neptunus.(none)
33a200d73d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 12:53:47 +02:00
tsmith/tim@siva.hindu.god
aeced431e3
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-23 23:41:07 -06:00
kostja@bodhi.local
4cb57ac048
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-10-23 12:06:59 +04:00
gkodinov@dl145s.mysql.com
b1bd09cbfa
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-21 09:33:53 +02:00
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
stewart@willster.(none)
910e4d974c
BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11
...
post-review fixups - magnus suggested creating dynstr_trunc instead of doing
it manually.
2006-10-20 22:47:28 +10:00
gkodinov@dl145s.mysql.com
bb0422a0b0
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-20 11:12:35 +02: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
aaed398254
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-19 16:43:46 +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
5af9dfa6ba
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-merge
2006-10-19 10:15:08 +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
cmiller@zippy.cornsilk.net
91c4edfbfb
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 12:00:36 -04:00
cmiller@zippy.cornsilk.net
184467a2cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 11:23:07 -04: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
kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8a7413f704
thr_alarm.c, thr_lock.c, my_global.h:
...
Avoid multiple define of DBUG_OFF (bug#21749)
2006-10-12 19:43:47 +02:00
holyfoot/hf@deer.(none)
06978991cc
Merge mysql.com:/home/hf/mysql-5.0.mrg
...
into mysql.com:/home/hf/mysql-5.1.mrg
2006-10-12 15:42:05 +05: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
a82e5d4a55
Merge polly.local:/tmp/maint/bug11655/my51-bug11655
...
into polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
2006-10-12 12:36:13 +04: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
29b5e2955e
Merge polly.local:/tmp/maint/bug11655/my50-bug11655
...
into polly.local:/tmp/maint/bug11655/my51-bug11655
2006-10-11 14:22:17 +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
Kristofer.Pettersson@naruto.
2e5063f97a
Merge naruto.:C:/cpp/bug21811/my51-bug21811
...
into naruto.:C:/cpp/mysql-5.1-new-maint
2006-10-11 11:05:55 +02:00
Kristofer.Pettersson@naruto.
3ef964bbfe
BUG#21811 Odd casting with date + INTERVAL arithmetic
...
- Type casting was not consequent, thus when adding a DATE type with
a WEEK interval the result tpe was DATETIME and not DATE as is the
norm.
- By changing the order of the date type enumerations the type casting
bug is resolved. To comply with the new order the array
interval_type_to_name needed to change accordingly.
2006-10-11 10:17:39 +02:00
msvensson@neptunus.(none)
5b24780877
Merge bk-internal:/home/bk/mysql-5.1-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-10-11 10:16:46 +02:00
msvensson@neptunus.(none)
ed250c1763
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-10-11 10:01:43 +02:00
lars@black.(none)
0b4e65e12b
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-10-10 21:59:23 +02:00
andrey@example.com
5fd8554a77
Remove direct mapping of enum interval_type to mysql.event.interval_field
...
This decoupling allows in further versions of MySQL enum interval_type to
be reordered without this affecting any backward compatibility in the
events code.
This changeset doesn't change any exposed behavior but makes events' code
more durable to changes outside of their code base.
To the reviewer: There is no regression test included as it is impossible
to construct one with the current infrastructure which can test it. To test
the code one has create and event, then change the order of
enum interval_type in my_time.h, update sql/time.cc, recompile the server
and run it with scheduler running.
2006-10-10 17:59:46 +02:00
istruewing@chilla.local
b15a23a79e
Merge chilla.local:/home/mydev/mysql-5.0-bug8283
...
into chilla.local:/home/mydev/mysql-5.1-bug8283
2006-10-09 22:24:55 +02: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