monty@mysql.com
28a5491d3d
Merge with 4.1
2005-04-30 09:46:08 +03:00
monty@mysql.com
c0e8a8d625
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-30 03:46:38 +03:00
monty@mysql.com
aa84afb983
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-30 03:45:12 +03:00
monty@mysql.com
129c604032
Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598 )
2005-04-30 03:14:42 +03:00
serg@serg.mylan
328f2e434a
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-29 19:31:56 +02:00
jimw@mysql.com
6dc842980a
Merge mysql.com:/home/jimw/my/mysql-4.1-9634
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-29 08:47:03 -07:00
jimw@mysql.com
78ff49437f
Manually resolve merge
2005-04-29 08:46:03 -07:00
hf@deer.(none)
c2339a6ff0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.spaerrs
2005-04-29 20:26:11 +05:00
hf@deer.(none)
054463f975
Fix for #6553 and #8776 (no errors on bad spatial data)
2005-04-29 20:23:02 +05:00
monty@mysql.com
fbf31c4a8c
CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036 )
...
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467 )
Fix compiler problems with MinGW (Bug #8872 )
2005-04-29 17:03:34 +03:00
mskold@mysql.com
56499dbe54
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 11:56:38 +02:00
mskold@mysql.com
aed38a0f49
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-29 11:49:54 +02:00
sergefp@mysql.com
908c5d74d4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug9821
2005-04-29 02:52:20 +04:00
jimw@mysql.com
8ef6ae7442
Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names
...
is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761 )
2005-04-28 15:30:42 -07:00
jimw@mysql.com
300a9920ed
Add regression test for calling SOUNDEX() within stored procedure.
...
The bug appears to have already been fixed. (Bug #7293 )
2005-04-28 14:46:54 -07:00
sergefp@mysql.com
e31b850937
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
2005-04-28 21:05:26 +04:00
sergefp@mysql.com
b2ebf51fbe
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-28 19:58:52 +04:00
msvensson@neptunus.(none)
5de370c534
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-28 13:32:52 +02:00
konstantin@mysql.com
d84ed6466b
A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal
...
value into a char field": the patch submitted for the bug a while
ago has never been reviewed or approved to push into 4.0. Decimal
support in 5.0 resolves the issue.
Adding the test case and closing the bug report.
2005-04-28 13:06:36 +04:00
msvensson@neptunus.(none)
9e2e0deece
Merge bug9911 with 5.0
2005-04-28 11:05:44 +02:00
mskold@mysql.com
78263507ab
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-28 10:57:08 +02:00
mskold@mysql.com
47c2c96379
Merge
2005-04-28 10:28:56 +02:00
jimw@mysql.com
518f644204
Fix 'mysql_client_test' with embedded server. (Bug #9634 )
2005-04-27 17:50:48 -07:00
monty@mysql.com
b40756c27e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-28 00:41:39 +03:00
msvensson@neptunus.(none)
1ba85ac979
BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
...
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.
2005-04-27 22:20:58 +02:00
msvensson@neptunus.(none)
1ee4426adc
Little different behaviour in 5.0 and merge with new tests required these changes
2005-04-27 22:02:26 +02:00
msvensson@neptunus.(none)
bdb1441a65
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 21:40:11 +02:00
sergefp@mysql.com
1d8fe5acef
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 22:51:02 +04:00
sergefp@mysql.com
4732c3b516
Merge mysql.com:/home/psergey/mysql-4.1-bug9298
...
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
2005-04-27 22:49:42 +04:00
msvensson@neptunus.(none)
c76c23fcbc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 18:28:57 +02:00
mskold@mysql.com
5f9843aeee
Fix for avoiding gettin Invalid schema object version when doing local changes
2005-04-27 18:17:41 +02:00
pem@mysql.com
254bb2570c
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-04-27 16:37:09 +02:00
pem@mysql.comhem.se
f769a7a8b0
Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW
...
(Review on irc by monty)
2005-04-27 16:35:49 +02:00
ramil@mysql.com
79f049f7b0
after-merge fix
2005-04-27 19:06:47 +05:00
ramil@mysql.com
bc6d650169
merging
2005-04-27 19:00:27 +05:00
ramil@mysql.com
82fc2ce8b7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9803
2005-04-27 17:20:29 +05:00
monty@mysql.com
e18a155fd6
Fixed core dump bug when hot link list in key cache was empty. Bug #10167
2005-04-27 14:31:04 +03:00
pem@mysql.com
0290afcdb7
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-04-27 13:24:40 +02:00
msvensson@neptunus.(none)
203cdde955
Merge from 4.1 to 5.0
2005-04-27 12:56:01 +02:00
msvensson@neptunus.(none)
631f035ee9
Merge neptunus.(none):/home/msvensson/mysql/bug9911
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:17:07 +02:00
serg@serg.mylan
c35e690c12
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-27 11:43:00 +02:00
serg@serg.mylan
e7b2de98ee
be sure to call top_level_item() on the new Item_cond_and,
...
that merges ON and WHERE (BUG#10162)
2005-04-27 01:32:44 +02:00
monty@mysql.com
3ca23bd918
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 21:09:42 +03:00
pem@mysql.comhem.se
281c0a8130
Fixed BUG#8408: Stored procedure crash if function contains SHOW
...
We simply have to disallow any kind of result set being sent back
from a function. Can't see any way to make that to work.
2005-04-26 17:31:59 +02:00
ramil@mysql.com
5624641cb0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b9489
2005-04-26 19:57:15 +05:00
ramil@mysql.com
db2b729c73
A fix (bug #10176 : problem with varchar keys).
2005-04-26 19:46:52 +05:00
gbichot@quadita2.mysql.com
bc7856cd1e
Merge quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-04-26 16:09:04 +02:00
gbichot@quadita2.mysql.com
a95571875c
checking that statements get into binlog even when they were affecting
...
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).
2005-04-26 15:52:04 +02:00
monty@mysql.com
220a01a838
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 16:03:20 +03:00
ramil@mysql.com
12d14eb96c
Test case (bug #9756 : mysql client failing on dumps containing certain \ sequences).
2005-04-26 15:48:16 +05:00