istruewing@stella.local
9a4d57e319
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:53:03 +01:00
istruewing@stella.local
fb20c9dd5e
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:51:41 +01:00
mikael@dator6.(none)
2505979575
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-13 11:30:38 +01:00
mikael@dator6.(none)
e1820b2e77
Merge dator6.(none):/home/mikael/mysql_clones/bug32943
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-13 11:29:50 +01:00
mikael@dator6.(none)
2bff6fd22a
Added comments on why we do reopen
...
Handle error case of not being able to reopen which
requires us to remove table from thread's open list
and table_cache.
2008-02-13 11:26:24 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
1ba6f57efc
Merge mysql.com:/home/ram/work/mysql-5.1-engines
...
into mysql.com:/home/ram/work/b33758/b33758.5.1
2008-02-12 15:48:10 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
6b3ea484e2
Merge mysql.com:/home/ram/work/b33758/b33758.5.0
...
into mysql.com:/home/ram/work/b33758/b33758.5.1
2008-02-12 15:14:56 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a64d12ce3a
Fix for bug #33758 : Got query result when using ORDER BY ASC, but
...
empty result when using DESC
Problem: fetching MyISAM keys we copy a key block pointer to the end of the key buffer.
However, we don't take into account the pointer length calculatig the buffer size,
that may leads to memory overwriting and in turn to unpredictable results.
Fix: increase key buffer size by length of the key block pointer.
Note: no simple test case.
2008-02-12 15:12:45 +04:00
anozdrin/alik@quad.
301ab0d8b7
Disable sporadically failing test cases (Bug#34454).
2008-02-11 14:34:53 +03:00
istruewing@stella.local
ef6f3e5ceb
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:11:53 +01:00
istruewing@stella.local
d1bd8d88da
Merge stella.local:/home2/mydev/mysql-5.1-bug31331
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:08:12 +01:00
istruewing@stella.local
16be963007
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:07:19 +01:00
anozdrin/alik@quad.
524cbe2e4c
Disabling declaration of debug variable for non-debug builds.
...
(originally from Mats)
2008-02-11 14:05:27 +03:00
anozdrin/alik@quad.
a52a30e3e6
Patch to eliminate some valgrind warnings in debug printout code.
...
(originally from Mats)
2008-02-11 14:04:30 +03:00
istruewing@stella.local
d59ee3db2d
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 11:58:23 +01:00
istruewing@stella.local
21534505d0
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-11 11:19:06 +01:00
kostja@dipika.(none)
b09af4bef4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-09 14:42:26 +03:00
kostja@dipika.(none)
84713274ba
Fix a buffer overflow with strmake().
2008-02-09 10:31:22 +03:00
malff@lambda.hsd1.co.comcast.net.
20e33c30a0
Fixed buffer overflow
2008-02-08 19:37:57 -07:00
anozdrin/alik@quad.
dbe77333d5
Bug#34424: query_cache_debug.test leads to valgrind warnings
...
Disable the test case.
2008-02-08 20:07:39 +03:00
anozdrin/alik@quad.
fab537bc89
Fix create.test: use latin1 instead ucs2.
2008-02-08 20:06:05 +03:00
kostja@dipika.(none)
add76ef5d5
Fix -ansi -pedantic compilation error
2008-02-08 19:33:24 +03:00
kostja@dipika.(none)
ef36b32ef0
Merge dipika.(none):/opt/local/work/mysql-5.0-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 19:01:57 +03:00
kostja@dipika.(none)
e9c887cc3d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00
kostja@dipika.(none)
0e4b6ea058
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dipika.(none):/opt/local/work/mysql-5.0-runtime
2008-02-08 18:51:07 +03:00
kostja@dipika.(none)
d956281e1e
Don't complain about a failure to write a log message if we were
...
simply killed.
2008-02-08 17:25:20 +03:00
kostja@dipika.(none)
209d3d2e18
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 15:54:21 +03:00
kostja@dipika.(none)
015cdcad4b
Silence the slow log errors (they won't make it to the client anyway).
2008-02-08 15:53:57 +03:00
davi@endora.local
9a5e3e103c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:48:16 -02:00
davi@mysql.com/endora.local
15409e87d2
Manual merge of Bug 33798
2008-02-08 10:47:25 -02:00
davi@endora.local
31b22496f4
Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:21:58 -02:00
davi@mysql.com/endora.local
24b9abf36d
Bug#33798 prepared statements improperly handle large unsigned ints
...
The unsignedness of large integer user variables was not being
properly preserved when feeded to prepared statements. This was
happening because the unsigned flags wasn't being updated when
converting the user variable is converted to a parameter.
The solution is to copy the unsigned flag when converting the
user variable to a parameter and take the unsigned flag into
account when converting the integer to a string.
2008-02-08 08:55:55 -02:00
kostja@dipika.(none)
0d4667eb5c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 13:36:39 +03:00
kostja@dipika.(none)
956e955938
Give a more informative message if we failed to write to mysql.general_log
...
table.
2008-02-08 13:35:11 +03:00
mikael@dator6.(none)
6995b41ba2
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-08 00:29:59 +01:00
mikael@dator6.(none)
8135412387
WL#3834: New build script for system admins and developers
...
especially for MySQL Cluster Carrier Grade Edition
2008-02-08 00:12:34 +01:00
davi@mysql.com/endora.local
24830674e8
Bug#31891 Meaningful stack trace
...
On crashes generate a user-friendly resolved and demangled stack
trace when libc provides the necessary functions (newer libc on i386,
x86_64, powerpc, ia64, alpha and s390). Otherwise print a numeric
stack trace as before, relying on resolve_stack_dump utility.
2008-02-07 19:58:06 -02:00
kostja@dipika.(none)
092cadbdd1
Merge dipika.(none):/opt/local/work/mysql-5.0-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-07 23:53:03 +03:00
kostja@dipika.(none)
bf7991ba2f
Fix compile warning about undefined rmdir() function.
2008-02-07 23:52:30 +03:00
malff@lambda.hsd1.co.comcast.net.
5d5bed0bcc
test update
2008-02-07 12:00:48 -07:00
davi@endora.local
2e0ef9424d
Merge mysql.com:/Users/davi/mysql/bugs/32633-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-07 16:14:39 -02:00
mattiasj@witty.ndb.mysql.com
296c967a7a
Bug#34225: suite/parts test failure
...
Pre push fix:
added --sorted_result for consistent results
2008-02-07 16:26:22 +01:00
mikael@dator6.(none)
f0e7ceba50
Merge dator6.(none):/home/mikael/mysql_clones/bug33429
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-07 16:14:01 +01:00
mikael@dator6.(none)
5855dac773
Merge dator6.(none):/home/mikael/mysql_clones/bug33182
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-07 16:01:20 +01:00
mattiasj@witty.ndb.mysql.com
dc994bcb90
Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug33379
...
into witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
2008-02-07 15:54:55 +01:00
mattiasj@witty.ndb.mysql.com
cfc8a2e865
Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug34225
...
into witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
2008-02-07 15:29:52 +01:00
mattiasj@witty.ndb.mysql.com
11923a5ec2
Merge witty.ndb.mysql.com:/Users/mattiasj/Public/shared-vms/mysql-5.1-bug33379
...
into witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
2008-02-07 15:27:37 +01:00
mattiasj@witty.ndb.mysql.com
d5364e38c5
Bug#34358: Cannot find specified bit row in partitioned table
...
Problem was incorrect data length in the key_restore function
resulting in overwriting the search key.
Solution, remove one byte in length if uneven bits are used.
2008-02-07 15:09:59 +01:00
msvensson@pilot.mysql.com
5d8061d344
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime
2008-02-07 14:09:16 +01:00
msvensson@pilot.mysql.com
4df354a6c5
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime
2008-02-07 14:07:41 +01:00