mikael@dator6.(none)
53546f51f5
BUG#32943: Fixed buggy lock handling of ALTER TABLE for partitioning
2008-01-28 15:20:55 +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
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
malff@lambda.hsd1.co.comcast.net.
e685e7e354
Manual merge
2008-01-23 16:21:09 -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
cmiller@zippy.cornsilk.net
2d259302ea
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2008-01-23 11:53:06 -05:00
cmiller@zippy.cornsilk.net
71316696a1
Patch contributed by Jocelyn Fournier. CLA received 2007-02-27.
...
Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed
mysqlcheck tests nullness of the engine type to know whether the
"table" is a view or not. That also falsely catches tables that
are severly damaged.
Instead, use SHOW FULL TABLES to test whether a "table" is a view
or not.
(Don't add new function. Instead, get original data a smarter way.)
Make it safe for use against databases before when views appeared.
2008-01-23 11:37:46 -05:00
cmiller@zippy.cornsilk.net
c13d726f5d
Bug#27427: resolveip fails on hostnames with a leading digit
...
Patch by Kasper Dupont. No CLA required for this size of patch.
"resolveip" program produces incorrect result if given a hostname
starting with a digit. Someone seems to have thought that names
can not have digits at the beginning.
Instead, use the resolver library to work out the rules of hostnames,
as it will undoubtedly be better at it than we are.
2008-01-23 11:34:08 -05:00
cmiller@zippy.cornsilk.net
9777809b33
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2008-01-23 10:03:58 -05:00
tsmith@ramayana.hindu.god
6022704723
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-22 16:59:41 -07:00
tsmith@ramayana.hindu.god
91449543cc
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2008-01-22 16:44:44 -07:00
tsmith@ramayana.hindu.god
6668554a8d
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-22 15:56:15 -07:00
tsmith@ramayana.hindu.god
8287a4f27b
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2008-01-22 15:44:18 -07:00
tsmith@ramayana.hindu.god
289d3e824d
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2008-01-22 15:43:06 -07:00
kaa@kaamos.(none)
fa20bb5afe
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-20 13:50:26 +03:00
kaa@kaamos.(none)
6619db580d
Fixed a PushBuild failure of the system_mysql_db test caused by the lack
...
of cleanups in the test case for bug33794.
2008-01-20 13:46:55 +03:00
anozdrin/alik@ibm.
e5ed653e16
Fix merge.
2008-01-20 00:59:24 +03:00
anozdrin/alik@ibm.
58f76a036d
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt
...
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.0-rt
2008-01-20 00:39:14 +03:00
anozdrin/alik@ibm.
baf5f73853
Merge ibm.:/home/alik/Documents/MySQL/devel/5.1
...
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1
2008-01-19 22:32:48 +03:00
kaa@kaamos.(none)
6f451bf228
Post-merge fixes.
2008-01-19 22:13:42 +03:00
anozdrin/alik@ibm.
3cd05f003e
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0
...
into ibm.:/home/alik/Documents/MySQL/devel/5.0-rt-merged-5.0
2008-01-19 21:28:21 +03:00
kaa@kaamos.(none)
e91bf15d5c
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
...
into kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-01-19 21:09:22 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
c6a01870bc
Raise version number after cloning 5.1.23-rc
2008-01-19 12:39:49 +01:00
mhansson@lamia.dupka
e3e370dd9d
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into lamia.dupka:/home/mhansson/my50-bug33143-again-pushee
2008-01-18 22:45:14 +02:00
sergefp@mysql.com
d56ac2f37b
BUG#33794 "MySQL crashes executing specific query":
...
The problem occurred when one had a subquery that had an equality X=Y where
Y referred to a named select list expression from the parent select. MySQL
crashed when trying to use the X=Y equality for ref-based access.
Fixed by allowing non-Item_field items in the described case.
2008-01-18 22:50:36 +03:00
mhansson/martin@linux-st28.site
f8fb6e930a
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143-pushee
2008-01-17 18:36:04 +01:00
mhansson/martin@linux-st28.site
2067dfe474
Merge linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my51-bug33143
2008-01-17 18:22:55 +01:00
mhansson/martin@linux-st28.site
7207d3ce21
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug33143/my50-bug33143-again-pushee
2008-01-17 18:15:53 +01:00
kostja@dipika.(none)
8aa978352e
A minor cleanup.
2008-01-16 16:44:07 +03:00
mhansson/martin@linux-st28.site
effe27e350
Bug#33143: Incorrect ORDER BY for ROUND()/TRUNCATE() result
...
The ROUND(X, D) function would change the Item::decimals field during
execution to achieve the effect of a dynamic number of decimal digits.
This caused a series of bugs:
Bug #30617:Round() function not working under some circumstances in InnoDB
Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
Bug #30889:filesort and order by with float/numeric crashes server
Fixed by never changing the number of shown digits for DECIMAL when
used with a nonconstant number of decimal digits.
2008-01-14 16:16:36 +01:00
mhansson@lamia.dupka
8eb74b1f5f
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into lamia.dupka:/home/mhansson/my50-bug31797-pushee
2008-01-12 18:59:05 +02:00
davi@mysql.com/endora.local
30267c7750
Post merge fix for BUG 33728
2008-01-11 21:34:23 -02:00
davi@endora.local
ec5c26f8d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-01-11 20:42:07 -02:00
davi@mysql.com/endora.local
e88edf6ab1
Bug#33728 Atomic builtins
...
Use compiler provided atomic builtins as a 'backend' for
MySQL's atomic primitives. The builtins are available on
a handful of platforms and compilers.
2008-01-11 20:34:36 -02:00
mhansson@lamia.dupka
deacf8b37f
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into lamia.dupka:/home/mhansson/my51-bug31797-pushee
2008-01-11 23:09:34 +02:00