andrey@lmy004.
235cde55fb
fix for bug #12841
...
(Server crash on DO IFNULL(NULL,NULL)
(fixes also "SELECT CAST(IFNULL(NULL,NULL) as DECIMAL)" unreported
crash)
(new revampled fix with suggestions from Igor)
2005-08-29 15:45:03 +02:00
andrey@lmy004.
d7d307fbdd
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-ready4
2005-08-29 12:20:36 +02:00
andrey@lmy004.
ed0bac2116
fix for bug #12490 (all-in-one patch)
...
(Packets out of order if calling HELP CONTENTS from Stored Procedure)
2005-08-29 12:19:08 +02:00
igor@rurik.mysql.com
c19d2c1e89
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-27 16:30:39 -07:00
hf@deer.(none)
093789aabd
gis.test corrected with Pem's wishes
2005-08-27 20:06:35 +05:00
hf@deer.(none)
63d6bc34e0
Merge deer.(none):/home/hf/work/mysql-5.0.10499
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-27 18:13:26 +05:00
hf@deer.(none)
418a7bfcde
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-27 18:10:46 +05:00
hf@deer.(none)
5b35789d12
Merge deer.(none):/home/hf/work/mysql-4.1.9645
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-27 18:06:09 +05:00
acurtis@xiphis.org
23c19b21d6
Bug#9048
...
"Creating a function with char binary IN parameter fails"
Parse BINARY as part of type declaration, not as
a column attribute.
2005-08-27 07:26:14 +01:00
igor@rurik.mysql.com
f93e7cc77a
func_str.result, null.result:
...
Corrected results after the fix for bug #12791 .
func_test.result, func_test.test:
Added test cases for bug #12791 .
item_func.h, item_func.cc:
Fixed bug #12791 .
Made LEAST/GREATES fully Oracle compliant.
LEAST/GREATEST did not return NULL if only some
arguments were NULLs. This did not comply with Oracle.
2005-08-26 22:25:45 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-08-26 15:56:52 +03:00
serg@sergbook.mysql.com
d591705e69
merged
2005-08-26 13:24:59 +04:00
bell@sanja.is.com.ua
97ad1cba62
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-08-25 19:14:43 +03:00
bell@sanja.is.com.ua
5963573c05
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-08-25 17:47:18 +03:00
petr@mysql.com
05fe0b2247
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 18:16:21 +04:00
sergefp@mysql.com
6d25f56297
BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way.
2005-08-25 18:13:56 +04:00
petr@mysql.com
56882c61bb
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 18:05:49 +04:00
sergefp@mysql.com
c78ce16681
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12335-release2
2005-08-25 17:39:02 +04:00
sergefp@mysql.com
95c3afc5d9
Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs.
...
"Interleaved SPs execution is now binlogged properly, "SELECT spfunc()" is binlogged too.
The known remaining issue is binlogging/replication of "a routine is deleted while it is executed" scenario.
2005-08-25 17:34:34 +04:00
petr@mysql.com
db5acc18ed
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333
2005-08-25 16:06:49 +04:00
petr@mysql.com
8dfa469729
Fix Bug#11333 "Stored Procedure: Memory blow up on repeated SELECT ... INTO query"
2005-08-25 15:34:14 +04:00
joerg@mysql.com
fea0745ba8
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/push-5.0
2005-08-25 11:46:17 +02:00
monty@mishka.mysql.com
aa18382680
Make test predictable
2005-08-25 12:03:19 +03:00
monty@mishka.mysql.com
848c936693
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.mysql.com:/home/my/mysql-5.0
2005-08-25 10:44:08 +03:00
andrey@lmy004.
d4a25c1b36
Merge lmy004.:/work/mysql-5.0-clean
...
into lmy004.:/work/mysql-5.0-bug12533-2
2005-08-25 09:38:59 +02:00
andrey@lmy004.
dde57f082b
fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column)
2005-08-25 09:24:21 +02:00
monty@mishka.mysql.com
9605c5dba2
Add back changes lost in merge
...
(Faster test)
2005-08-25 10:19:06 +03:00
monty@mishka.local
b90d7fe3b6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 09:40:40 +03:00
monty@mishka.local
f384e08277
Merge mishka.local:/home/my/mysql-4.1
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
kent@mysql.com
bd2901a250
disabled.def:
...
Disabled unstable tests, bugs filed
2005-08-25 02:27:52 +02:00
jimw@mysql.com
9e4a9e23c6
Make SYSDATE() behave as in Oracle: always the current datetime, not the
...
datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562 )
2005-08-24 15:50:58 -07:00
serg@sergbook.mysql.com
714b27c71c
merged
2005-08-25 00:08:02 +04:00
monty@mishka.local
17654cd7af
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 20:55:54 +03:00
monty@mishka.local
8e6aa0e7ea
Review fixes
2005-08-24 19:37:27 +03:00
igor@rurik.mysql.com
b610c0972f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-24 08:19:02 -07:00
igor@rurik.mysql.com
17d6c734f4
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-24 08:15:46 -07:00
petr@mysql.com
2df4914e11
fix test for a bug to use correct tables
2005-08-24 12:25:57 +04:00
igor@rurik.mysql.com
4adc90bdd6
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-23 23:22:52 -07:00
igor@rurik.mysql.com
5810291c2f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-08-23 23:19:45 -07:00
timour@mysql.com
f58315f80a
Test for BUG#6495.
...
The bug itself is fixed by WL#2486.
2005-08-23 22:29:05 +03:00
timour@mysql.com
5f9d05d306
Test for BUG#4889 - inconsistent resilts of more than 2-way natural join
...
due to incorrect transformation to JOIN ... ON.
The bug itself is fixed by WL#2486.
2005-08-23 20:24:29 +03:00
timour@mysql.com
9a6aefab3a
Fix for BUG#6276.
2005-08-23 20:03:32 +03:00
timour@mysql.com
2f2347e556
Test case for BUG#10972 - Natural join of view and underlying table gives wrong result.
...
The bug itself is fixed by WL#2486.
2005-08-23 19:00:28 +03:00
timour@mysql.com
f5655423aa
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-23 18:43:12 +03:00
timour@mysql.com
b87154fc02
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-08-23 18:40:57 +03:00
timour@mysql.com
bf8563ae1d
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-23 18:15:51 +03:00
timour@mysql.com
e040300393
WL#2486 - natural and using join according to SQL:2003
...
* Provide backwards compatibility extension to name resolution of
coalesced columns. The patch allows such columns to be qualified
with a table (and db) name, as it is in 4.1.
Based on a patch from Monty.
* Adjusted tests accordingly to test both backwards compatible name
resolution of qualified columns, and ANSI-style resolution of
non-qualified columns.
For this, each affected test has two versions - one with qualified
columns, and one without.
2005-08-23 18:08:04 +03:00
serg@sergbook.mysql.com
1fbb96ea97
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-08-23 14:16:17 +04:00
dlenev@mysql.com
603dddfdb4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11896
2005-08-23 09:15:05 +04:00
igor@rurik.mysql.com
21b63441f5
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-22 17:46:21 -07:00