msvensson@neptunus.(none)
1517d37048
Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol)
2006-10-02 13:46:40 +02:00
msvensson@neptunus.(none)
1dc026f79d
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-02 13:36:30 +02:00
msvensson@neptunus.(none)
b277139b0c
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-02 13:18:54 +02:00
jimw@rama.(none)
34531d261b
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into rama.(none):/home/jimw/my/mysql-4.1-clean
2006-09-29 19:29:12 -07:00
jimw@rama.(none)
52d22ad827
Disable __attribute__ entirely on g++ < 3.4. (Bug #2717 )
2006-09-29 19:28:16 -07:00
jimw@rama.(none)
5963b5af0f
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into rama.(none):/home/jimw/my/mysql-4.1-clean
2006-09-29 19:26:33 -07:00
cmiller@zippy.cornsilk.net
cca474bb67
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-09-29 17:23:44 -04:00
jimw@rama.(none)
caf4392f71
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into rama.(none):/home/jimw/my/mysql-4.1-clean
2006-09-28 18:11:29 -07:00
iggy@rolltop.ignatz42.dyndns.org
06ea6d7323
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
2006-09-28 15:56:14 -04:00
iggy@rolltop.ignatz42.dyndns.org
f063bee3b2
Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D)
2006-09-28 14:30:20 -04:00
cmiller@zippy.cornsilk.net
56d2406375
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-09-28 10:02:53 -04:00
gkodinov@dl145s.mysql.com
55cc4fd5c6
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-28 10:19:25 +02:00
gluh@mysql.com/gluh.(none)
a039376c43
Patch for bug#21432 is reverted
2006-09-27 17:49:16 +05:00
holyfoot/hf@mysql.com/deer.(none)
4716c99a17
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/mysql-4.1.15428
2006-09-27 11:44:05 +05:00
msvensson@neptunus.(none)
e12092627e
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-09-25 20:15:51 +02:00
msvensson@neptunus.(none)
5edd58b14c
Bug#18888 Trying to overwrite sql/lex_hash.h during build
...
-Backport fix for bug19738 to 4.1
2006-09-25 20:01:39 +02:00
igor@rurik.mysql.com
55dd569bab
Fixed bug #21853 : assert failure for a grouping query with
...
an ALL/ANY quantified subquery in HAVING.
The Item::split_sum_func2 method should not create Item_ref
for objects of any class derived from Item_subselect.
2006-09-25 05:24:07 -07:00
holyfoot/hf@mysql.com/deer.(none)
14b16d89d9
Merge mysql.com:/home/hf/work/mysql-4.1.12991
...
into mysql.com:/home/hf/work/mysql-4.1.15428
2006-09-25 16:35:57 +05:00
holyfoot/hf@mysql.com/deer.(none)
4a9cff00c5
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/mysql-4.1.15428
2006-09-25 16:33:51 +05:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
878416e054
mysql_config.sh:
...
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Filter out icc specific options from cflags/libs(_r)
2006-09-25 00:54:46 +02:00
cmiller@zippy.cornsilk.net
3681b3ecb5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-09-23 09:55:16 -04:00
lars/lthalmann@mysql.com/dl145h.mysql.com
80dadacb03
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 07:11:32 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7e45d80362
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 05:58:48 +02:00
kaa@polly.local
e9bdddfa28
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-09-22 19:50:16 +04:00
kaa@polly.local
10a60b42f6
Merge polly.local:/tmp/22129/bug22129/my41-bug22129
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-09-22 19:44:51 +04:00
kaa@polly.local
1530b51d8f
Fixed bug #22129 : A small double precision number becomes zero
...
Better checks for underflow/overflow
2006-09-22 19:23:58 +04:00
knielsen@bk-internal.mysql.com
4412755932
Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1
...
into bk-internal.mysql.com:/tmp/knielsen/mysql-4.1-maint
2006-09-21 21:23:38 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9538acf5dc
Adding proper setup phase for test case rpl_insert_id
2006-09-21 13:19:52 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
d3f503a0bd
Fix for bug #20204 : "order by" changes the results returned
...
Item_substr's results are improperly stored in a temporary table due to
wrongly calculated max_length value for multi-byte charsets if two
arguments specified.
2006-09-21 16:05:01 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
43194fad43
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-4.1-maint
2006-09-21 09:35:17 +05:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6
Vertical printout in test to make easier to read
2006-09-21 03:32:42 +02:00
igor@rurik.mysql.com
d957636471
Fixed bug #20108 .
...
Any default value for a enum fields over UCS2 charsets was corrupted
when we put it into the frm file, as it had been overwritten by its
HEX representation.
To fix it now we save a copy of structure that represents the enum
type and when putting the default values we use this copy.
2006-09-20 09:46:12 -07:00
lars/lthalmann@mysql.com/dl145j.mysql.com
0c03f9348d
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-20 16:17:30 +02:00
istruewing@chilla.local
1782889d35
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-20 08:33:46 +02:00
igor@rurik.mysql.com
294c0ccaa9
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-4.1-opt
2006-09-19 08:42:58 -07:00
thek@kpdesk.mysql.com
59671a1b16
Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
...
into kpdesk.mysql.com:/home/thek/dev2/mysql-4.1-maint
2006-09-19 12:44:09 +02:00
thek@kpdesk.mysql.com
66fa757e1f
Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails
...
- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test
2006-09-19 12:40:31 +02:00
istruewing@chilla.local
47dc3fbe8a
Merge bk-internal:/home/bk/mysql-4.0
...
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
2006-09-19 10:17:25 +02:00
svoj@may.pils.ru
43097593e3
Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-18 20:35:33 +05:00
gkodinov@dl145s.mysql.com
fcf99e859f
Merge bk-internal:/home/bk/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-18 11:09:56 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7f410eed5e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug21142/my41-bug21142
2006-09-18 09:06:05 +05:00
igor@rurik.mysql.com
dd3b8e4f9a
Fixed bug #22085 : Crash on the execution of a prepared
...
statement that uses an aggregating IN subquery with
HAVING clause.
A wrong order of the call of split_sum_func2 for the HAVING
clause of the subquery and the transformation for the
subquery resulted in the creation of a andor structure
that could not be restored at an execution of the prepared
statement.
2006-09-16 11:50:00 -07:00
gkodinov/kgeorge@macbook.gmz
c73d2318a3
Merge bk-internal:/home/bk/mysql-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt
2006-09-15 18:56:05 +03:00
istruewing@chilla.local
45f7514d03
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug14400
2006-09-15 14:02:43 +02:00
gkodinov@dl145s.mysql.com
325f820909
Merge dl145s.mysql.com:/data/bk/team_tree_merge/CLEAN/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-15 11:43:28 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
ec51f809b8
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-15 01:15:39 +02:00
istruewing@chilla.local
d53ac19620
Bug#14400 - Query joins wrong rows from table which is subject of
...
"concurrent insert"
After merge fix.
2006-09-14 16:55:57 +02:00
evgen@moonbone.local
5841147d4d
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into moonbone.local:/work/21677-bug-4.1-opt-mysql
2006-09-14 18:46:44 +04:00
evgen@moonbone.local
a33d1d8484
type_date.test, type_date.result:
...
Added the test case for bug#21677: Wrong result when comparing a DATE and a DATETIME in BETWEEN
2006-09-14 18:45:23 +04:00
kaa@polly.local
27fae2cb73
Merge polly.local:/tmp/20924/bug20294/my41-bug20294
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-09-13 16:01:46 +04:00