msvensson@neptunus.(none)
8c0f7f82d9
Bug #11286 yassl incompatible with "load data infile"
...
- Make sure that mysqltest always uses ssl when connecting to the server.
- Pass a i32-bit int variable as argument to FIONREAD ioctl.
2005-09-01 11:46:43 +02:00
lars@mysql.com
f34398ba65
BUG#12532: Fix for the case when my_malloc is macro
2005-08-24 11:14:41 +02:00
timour@mysql.com
5d736f1063
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-24 10:52:30 +03:00
timour@mysql.com
04a6a8e011
Post-fix for BUG#6276.
2005-08-24 10:51:28 +03:00
petr@mysql.com
adb8244163
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usersnfs/pchardin/mysql-5.0-virgin
2005-08-24 02:50:23 +02:00
petr@mysql.com
659809d30f
fix compilation failure appeared after monty's cleanup
2005-08-24 02:46:13 +02:00
lars@mysql.com
f98f46c471
BUG#12532: Fixes after review
2005-08-24 01:45:15 +02:00
lars@mysql.com
d8df765913
Merge mysql.com:/users/lthalmann/ltx/root/mysql-5.0
...
into mysql.com:/users/lthalmann/ltx/dev/mysql-5.0-bug12532
2005-08-24 00:16:58 +02: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
tomas@poseidon.ndb.mysql.com
83664a8365
configure.in:
...
fixed build bug with ndb grep block
2005-08-23 13:01:46 +02: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
hartmut@mysql.com
d74a148172
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-08-22 23:03:24 +02:00
hartmut@mysql.com
8859ab64d1
added file missing from release to EXTRA_DIST list (bug# 12733)
2005-08-22 22:13:56 +02:00
jimw@mysql.com
247e9421fa
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 11:54:33 -07:00
jimw@mysql.com
bb4af4f176
Merge mysql.com:/home/jimw/my/mysql-5.0-12689
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 10:19:09 -07:00
monty@mishka.local
ef06534945
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-22 19:58:11 +03:00
monty@mishka.local
7767828b81
Don't write first even that contains server version
2005-08-22 19:56:36 +03:00
konstantin@mysql.com
fb7be5270f
Add a comment about I_List<> copy constructor.
2005-08-22 19:23:01 +04:00
konstantin@mysql.com
c75cfc358e
Fix a -ansi -pedantic compile failure.
2005-08-22 18:59:47 +04:00
timour@mysql.com
310afc80dd
Test case for BUG#10646
...
The bug itself is fixed by WL #2486 .
2005-08-22 17:34:08 +03:00
timour@mysql.com
c04138ec94
Test case for BUG#6558 - Views: create fails with JOIN ... USING
...
The bug is non-view specific, and it resulted from incorrect
name resolution of natural join result columns. The bug is
fixed by WL#2486.
2005-08-22 17:04:55 +03:00
monty@mishka.local
49413542bd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-22 16:06:00 +03:00
evgen@moonbone.local
f5f6ed8b78
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/11398-bug-5.0-mysql
2005-08-22 15:46:09 +04:00
jonas@eel.(none)
f4f63f0351
ndb -
...
Fix merge error
2005-08-22 11:34:33 +02:00
jonas@eel.(none)
d7349750e5
ndb - bug#12220
...
forgott to add KeyDescriptor.hpp
2005-08-22 11:25:03 +02:00
jonas@eel.(none)
90256d31d1
bug#12220 - ndb - node recovery with charsets
...
LQH computes incorrect hash values during NR (as it doesn't concider charsets)
Solution: make LQH compute correct hash :-)
1) move xfrm_key into SimulatedBlock so that there's _one_ impl.
2) make TC, ACC, LQH use same impl.
2005-08-22 10:59:25 +02:00
monty@mishka.local
d62295e44e
Cleanup during review of new pushed code
2005-08-22 01:13:37 +03:00
jonas@eel.(none)
daec6e5ebd
Merge eel.(none):/home/jonas/src/mysql-4.1-push
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:24:53 +02:00
jonas@eel.(none)
5823c91f88
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:22:08 +02:00
monty@mishka.local
ba2ace25a9
Merge mishka.local:/tmp/skr99/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-21 13:05:15 +03:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
dce31760e4
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-08-20 21:21:49 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
4084c13605
Merge c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-08-20 16:38:55 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
5340e04661
Bug #12460 Table Full
...
On 64 bit platforms the changed statement doesn't work
so making sure that the larger value is first and using
subtraction is a quick and backwards-compatible fix of this
line.
2005-08-20 10:07:46 -04:00
serg@sergbook.mysql.com
117d61c8a0
Merge bk-internal:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-20 14:38:18 +04:00
monty@mishka.local
1c1f26d5e2
Fixes during review of new pushed code
...
Fixed new bug when running a SP without a default database
2005-08-20 11:00:00 +03:00
stewart@mysql.com
9a3168da82
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug10950
2005-08-20 17:58:33 +10:00
jimw@mysql.com
6240210305
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-19 17:53:48 -07:00
elliot@mysql.com
00fd26baeb
Add test that got dropped in automerge
2005-08-19 19:08:47 -04:00
jimw@mysql.com
a3c893e0b8
Fix cases where SLEEP() calls would get optimized away or cached. (Bug #12689 )
2005-08-19 15:51:40 -07:00
elliot@mysql.com
24f81a781e
Fix wrong auto-merge.
2005-08-19 18:17:54 -04:00
elliot@mysql.com
e9ca1bd3a7
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/home/emurphy/src/work/mysql-5.0
2005-08-19 18:13:31 -04:00
igor@rurik.mysql.com
2c2f18b98b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 15:07:51 -07:00
patg@radha.local
7a43a0f54d
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-19 23:44:40 +02:00