timour@mysql.com
e62c877748
Fix for BUG#12672.
2005-08-29 17:13:42 +03:00
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
bar@mysql.com
96e0cb8cbf
ctype_utf8.result, ctype_utf8.test, item.cc:
...
Bug#12371 executing prepared statement fails (illegal mix of collations)
After review fixes.
2005-08-29 16:49:01 +05:00
bar@mysql.com
be470c38c6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12371
2005-08-29 15:44:49 +05: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
osku@127.(none)
caf74b7cdd
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-29 09:06:43 +03: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
andrey@lmy004.
950a277988
retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database)
...
(already approved)
2005-08-27 12:29:36 +02:00
acurtis@xiphis.org
bebe182885
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p3-bug9048.2
2005-08-27 07:28:45 +01: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
kent@mysql.com
0c3c6f8003
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-27 02:05:35 +02:00
kent@mysql.com
fb690a5e04
2005-08-27 01:45:50 +02:00
kent@mysql.com
8dd0a47da0
mtr_timer.pl:
...
Simplified and corrected mtr_timer_stop_all()
2005-08-27 00:52:52 +02:00
kent@mysql.com
7a45cd2dad
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-26 18:45:16 +02: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
kent@mysql.com
abfbd9f9ba
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-08-26 14:32:38 +02:00
kent@mysql.com
207d159845
mysql-test-run.sh, mtr_report.pl:
...
Corrected typo
2005-08-26 12:37:35 +02:00
serg@sergbook.mysql.com
d591705e69
merged
2005-08-26 13:24:59 +04:00
ramil@mysql.com
120dd92b03
workaround (bug #9613 : Some read-only variables are selectable, others are not).
2005-08-26 13:23:32 +05: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
kent@mysql.com
fd98c4bfc6
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-08-25 16:28:35 +02:00
kent@mysql.com
af2b5f3bae
mtr_process.pl:
...
Call mtr_timer_stop_all() at exit
mtr_report.pl, mysql-test-run.pl:
Added default/ps-protocol/embedded to abort and summary line
mtr_timer.pl:
Added function mtr_timer_stop_all()
2005-08-25 16:25:54 +02:00
hf@deer.(none)
aa991c6f21
Fix for bug #12694 (float(1,2) field error)
2005-08-25 19:21:47 +05: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
osku@127.(none)
ce22788bdd
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-25 14:15:31 +03: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
f16c7b3c5c
After merge fixes
2005-08-25 09:38:06 +03:00
andrey@lmy004.
f6a9ff90d0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-clean
2005-08-25 08:36:40 +02:00
georg@lmy002.wdf.sap.corp
adc603a930
Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501
2005-08-25 07:02:37 +02: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