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
mats@romeo.(none)
d4d26ba7d5
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b19459-mysql-5.1-new
2006-10-06 15:31:05 +02:00
msvensson@neptunus.(none)
c5bf154eb4
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-10-06 13:56:09 +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
brian@zim.(none)
faff46eefe
Added license information display to output of plugins schema, and tagged all plugins with GPL flag.
2006-10-05 00:41:29 -07: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)
237779218c
Merge bk-internal:/home/bk/mysql-5.1-new-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 15:56:56 +02: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
bar@bar.intranet.mysql.r18.ru
3cfbe36adc
After merge fix
2006-10-03 16:00:09 +05:00
msvensson@neptunus.(none)
ca21b57992
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 09:28:44 +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)
3da45a6da9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-02 23:08:30 +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
mats@romeo.(none)
d1b9686245
BUG#19459 (BINLOG RBR command does not lock tables correctly causing
...
crash for, e.g., NDB):
Adding new function my_b_copy_to_file() to copy an IO_CACHE to a file.
2006-10-02 15:08:40 +02:00
mats@romeo.(none)
7b85fb5c13
BUG#19459 (BINLOG RBR command does not lock tables correctly causing
...
crash for, e.g., NDB):
Submitting patch to base64_decode() adding extra parameter.
2006-10-02 15:05:05 +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
brian@zim.(none)
8096f1c4b2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-30 19:12:50 -07:00
brian@zim.(none)
4117860ec6
Merge zim.(none):/home/brian/mysql/merge-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-09-30 18:44:42 -07:00
brian@zim.(none)
46ae2113ba
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
...
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
2006-09-30 12:49:46 -07:00
tsmith/tim@siva.hindu.god
04538cd6d4
Merge siva.hindu.god:/usr/home/tim/m/bk/mrg/50
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-30 02:01:07 -06: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
tsmith/tim@siva.hindu.god
4b56f9a6f7
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-30 01:22:34 -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)
f51525dce6
Merge rama.(none):/home/jimw/my/mysql-5.0-clean
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-09-29 19:30:26 -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
tsmith/tim@siva.hindu.god
ca1f99bdb8
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 17:01:16 -06:00
baker@bk-internal.mysql.com
802292ae37
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-09-29 18:23:11 +02: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)
7a23b1baf7
Merge rama.(none):/home/jimw/my/mysql-5.0-clean
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-09-28 20:20:33 -07: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
brian@zim.(none)
542cf080a4
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-28 10:51:56 -07:00