hhunger@hh-nb.hungers
23ebccac7e
Fixed differences in STATE in result file for bug#34190.
2008-02-06 11:02:45 +01:00
hhunger@hh-nb.hungers
5817cec5ba
fixes for bug#34190.
2008-01-31 16:12:54 +01:00
tsmith@ramayana.hindu.god
46703ed2ce
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-30 19:21:33 -07:00
tsmith@ramayana.hindu.god
261dd79bff
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-30 19:17:13 -07:00
tsmith@ramayana.hindu.god
91a7720ad8
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-01-30 19:08:38 -07:00
tsmith@ramayana.hindu.god
9965472d43
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-30 19:00:46 -07:00
tsmith@ramayana.hindu.god
c74959c9e0
Bug #32149 Long semaphore wait for adaptive hash latch
...
Fix by calling ha_release_temporary_latches() before ::filesort().
2008-01-30 19:00:20 -07:00
cmiller@zippy.cornsilk.net
1f13c62225
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug24624/my50-bug24624
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug24624/my51-bug24624
2008-01-30 18:15:00 -05:00
cmiller@zippy.cornsilk.net
806ff0187d
Bug#24624: MySQL client ignores its own completion table
...
Nothing was in the command-line dictionary, because of the wrong
order of instructions when populating it.
This is a smaller, less optimistic patch that both fixes a bug and
refreshes the list of keywords that the command-line library (e.g.,
readline) can use to expand typed commands. Now, read from the
command list /after/ we free the list, not before.
The best way is to read the keywords from the lexer code, but that
doesn't work everywhere yet. Grr.
2008-01-30 16:51:39 -05:00
cmiller@zippy.cornsilk.net
c173a217d5
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-01-29 18:24:38 -05:00
cmiller@zippy.cornsilk.net
3e23741bc6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-build
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-01-29 18:23:40 -05:00
cmiller@zippy.cornsilk.net
c3a92a661c
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint--bug33841
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-build
2008-01-29 17:18:27 -05:00
joerg@trift2.
d6e60f2a16
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-01-28 16:06:07 +01:00
joerg@trift2.
3c5ca383bf
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2008-01-28 16:01:50 +01:00
joerg@trift2.
5ffbbfcecc
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-01-28 15:16:40 +01:00
joerg@trift2.
a6f257361e
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2008-01-28 15:05:33 +01:00
joerg@trift2.
e0db1853e8
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2008-01-28 15:03:19 +01:00
tsmith@ramayana.hindu.god
dbcd4d9ec8
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-27 14:31:49 -07:00
tsmith@ramayana.hindu.god
1bf737a152
Fix test case for Bug #25347 so that it actually tests the code fix,
...
and so that it works correctly on Windows.
2008-01-27 14:28:50 -07:00
tsmith@ramayana.hindu.god
41f288f1b9
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-25 16:02:41 -07:00
tsmith@ramayana.hindu.god
218627aa33
Un-break test case on Windows, for bug #25347
2008-01-25 16:00:15 -07:00
tsmith@ramayana.hindu.god
b92a9a6142
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-25 13:25:34 -07:00
tsmith@ramayana.hindu.god
3906cc27d7
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-25 10:37:29 -07:00
tsmith@ramayana.hindu.god
f522912d20
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2008-01-25 10:03:15 -07:00
cmiller@zippy.cornsilk.net
b040a97c2a
Bug#33841: mysql client crashes when returning results for long-\
...
running queries
Bug#33976: buffer overflow of variable time_buff in function com_go()
An internal buffer was too short. Overextending could smash the
stack on some architectures and cause SEGVs. This is not a problem
that could be exploited to run arbitrary code.
To fix, I expanded one buffer to cover all the size that could be
written to (we know the abolute max).
2008-01-25 10:53:21 -05:00
anozdrin/alik@quad.
21630ab91f
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
2008-01-24 17:45:09 +03:00
anozdrin/alik@quad.
5ff7860f69
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
...
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
2008-01-24 17:40:16 +03:00
anozdrin/alik@quad.
1c1401bbb2
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0
...
into quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged-5.0
2008-01-24 17:37:16 +03:00
kaa@kaamos.(none)
de3f89096d
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-24 14:58:38 +03:00
tsmith@ramayana.hindu.god
b83b02876b
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-24 00:32:39 -07:00
tsmith@ramayana.hindu.god
3ba8a94bd0
Fix bug in BK trigger for sending changes to InnoDB devs.
2008-01-24 00:31:47 -07:00
tsmith@ramayana.hindu.god
0a5ff57a9b
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-23 23:58:21 -07:00
tsmith@ramayana.hindu.god
525028794d
Merge ramayana.hindu.god:/home/tsmith/m/inno/jan23/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-01-23 18:20:39 -07:00
tsmith@ramayana.hindu.god
fa257c031c
Applied innodb-5.0-ss2223 snapshot
...
Fixes:
Bug #32083 : server crashes on show status when InnoDB is not initialized
innodb_export_status(): Check that InnoDB has been initialized
before invoking srv_export_innodb_status(). (Bug #32083 )
This bug does not exist in MySQL/InnoDB 5.1.
2008-01-23 18:20:04 -07:00
tsmith@ramayana.hindu.god
e75e8d6321
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/done/b32679/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-23 16:59:44 -07:00
tsmith@ramayana.hindu.god
1803b4ca86
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-23 16:41:31 -07:00
tsmith@ramayana.hindu.god
adf800c8e4
Merge ramayana.hindu.god:/home/tsmith/m/inno/51-triggers
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-23 16:34:31 -07:00
tsmith@ramayana.hindu.god
6dabb0d48d
Merge ramayana.hindu.god:/home/tsmith/m/inno/50-triggers
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-01-23 16:33:10 -07:00
tsmith@ramayana.hindu.god
a2a682f636
Update triggers lib for version MySQL 5.1
2008-01-23 16:32:19 -07:00
tsmith@ramayana.hindu.god
f405fefcf4
Merge ramayana.hindu.god:/home/tsmith/m/inno/50-triggers
...
into ramayana.hindu.god:/home/tsmith/m/inno/51-triggers
2008-01-23 16:22:35 -07:00
malff@lambda.hsd1.co.comcast.net.
e685e7e354
Manual merge
2008-01-23 16:21:09 -07:00
tsmith@ramayana.hindu.god
c40e1ab171
Add triggers to notify InnoDB developers when MySQL developers change files
...
that they control.
2008-01-23 16:18:23 -07:00
tsmith@ramayana.hindu.god
38bbdf2bc3
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-23 15:46:11 -07:00
malff@lambda.hsd1.co.comcast.net.
ec6c4fad89
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618
2008-01-23 15:36:57 -07:00
malff@lambda.hsd1.co.comcast.net.
7bd56cfa79
manual merge
2008-01-23 14:52:40 -07:00
malff@lambda.hsd1.co.comcast.net.
1eecc24a21
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
2008-01-23 14:04:46 -07:00
tsmith@ramayana.hindu.god
5f6429b01a
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-23 13:27:11 -07:00
malff@lambda.hsd1.co.comcast.net.
c3ad0cac75
Bug#33618 (Crash in sp_rcontext)
...
Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
The server used to crash when REPEAT or another control instruction
was used in conjunction with labels and a LEAVE instruction.
The crash was caused by a missing "pop" of handlers or cursors in the
code representing the stored program. When executing the code in a loop,
this missing "pop" would result in a stack overflow, corrupting memory.
Code generation has been fixed to produce the missing h_pop/c_pop
instructions.
Also, the logic checking that labels at the beginning and the end of a
statement are matched was incorrect, causing Bug 33983.
End labels, when used, must match the label used at the beginning of a block.
2008-01-23 13:26:41 -07:00
cmiller@zippy.cornsilk.net
fdb423e8de
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2008-01-23 13:50:27 -05:00
tsmith@ramayana.hindu.god
ff4835385a
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2008-01-23 11:48:29 -07:00