kroki/tomash@moonlight.intranet
813431e9c9
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20953
2006-10-12 18:06:26 +04:00
kroki/tomash@moonlight.intranet
591c06d4b7
BUG#20953: create proc with a create view that uses local vars/params
...
should fail to create
The problem was that this type of errors was checked during view
creation, which doesn't happen when CREATE VIEW is a statement of
a created stored routine.
The solution is to perform the checks at parse time. The idea of the
fix is that the parser checks if a construction just parsed is allowed
in current circumstances by testing certain flags, and this flags are
reset for VIEWs.
The side effect of this change is that if the user already have
such bogus routines, it will now get a error when trying to do
SHOW CREATE PROCEDURE proc;
(and some other) and when trying to execute such routine he will get
ERROR 1457 (HY000): Failed to load routine test.p5. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
However there should be very few such users (if any), and they may
(and should) drop these bogus routines.
2006-10-12 18:02:57 +04:00
kroki/tomash@moonlight.intranet
2f0363deb9
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21354
2006-10-10 20:56:26 +04:00
kroki/tomash@moonlight.intranet
f999aaa301
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21354
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21354
2006-10-10 17:28:11 +04:00
kroki/tomash@moonlight.intranet
0d457976ea
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21354
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21354
2006-10-10 17:18:36 +04:00
kroki/tomash@moonlight.intranet
fbf6507cf7
BUG#21354: (COUNT(*) = 1) not working in SELECT inside prepared
...
statement.
The problem was that during statement re-execution if the result was
empty the old result could be returned for group functions.
The solution is to implement proper cleanup() method in group
functions.
2006-10-10 17:08:47 +04:00
kroki/tomash@moonlight.intranet
588e8df592
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug19111
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug19111
2006-10-10 14:00:49 +04:00
kroki/tomash@moonlight.intranet
4a28f8f1a0
Bug#19111: TRIGGERs selecting from a VIEW on the firing base table fail.
...
In a trigger or a function used in a statement it is possible to do
SELECT from a table being modified by the statement. However,
encapsulation of such SELECT into a view and selecting from a view
instead of direct SELECT was not possible.
This happened because tables used by views (which in their turn
were used from functions/triggers) were not excluded from checks
in unique_table() routine as it happens for the rest of tables
added to the statement table list for prelocking.
With this fix we ignore all such tables in unique_table(), thus
providing consistency: inside a trigger or a functions SELECT from
a view may be used where plain SELECT is allowed. Modification of
the same table from function or trigger is still disallowed. Also,
this patch doesn't affect the case where SELECT from the table being
modified is done outside of function of trigger, such SELECTs are
still disallowed (this limitation and visibility problem when function
select from a table being modified are subjects of bug 21326). See
also bug 22427.
2006-10-10 13:44:04 +04:00
svoj@may.pils.ru
0ea6959d78
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines
2006-10-08 15:32:00 +05:00
svoj@april.(none)
c2f1876816
Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
2006-10-06 14:55:57 +05:00
svoj@mysql.com/april.(none)
60ba9f2b63
Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
2006-10-06 14:49:21 +05:00
svoj@mysql.com/april.(none)
6a1a765b5d
Per discussion with pekka removed non-deterministic test case for bug#21381.
2006-10-06 14:47:58 +05:00
svoj@april.(none)
77cb275b70
Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines
2006-10-05 21:15:12 +05:00
svoj@mysql.com/april.(none)
d41340516f
Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
2006-10-05 19:02:29 +05:00
svoj@mysql.com/april.(none)
16c13a588f
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
2006-10-05 18:56:10 +05:00
svoj@mysql.com/april.(none)
b141a7c1b9
BUG#21381 - Engine not notified about multi-table UPDATE IGNORE
...
Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.
BDB has removed duplicate rows which is not expected.
NDB returns an error.
For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.
2006-10-05 18:23:53 +05:00
acurtis/antony@ltamd64.xiphis.org
52326aba48
Merge xiphis.org:/home/antony/work2/p2-bug22080.2
...
into xiphis.org:/home/antony/work2/p2-bug22080.3
2006-10-03 16:51:19 -07:00
msvensson@neptunus.(none)
237779218c
Merge bk-internal:/home/bk/mysql-5.1-new-rpl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 15:56:56 +02:00
svoj@mysql.com/april.(none)
d9e92fbd9e
BUG#22924 - windows test fails with wrong errno
...
Fixed a test case according to fix for bug10974.
2006-10-03 16:50:15 +05:00
msvensson@neptunus.(none)
48d99634f3
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 13:27:48 +02:00
bar@bar.intranet.mysql.r18.ru
3cfbe36adc
After merge fix
2006-10-03 16:00:09 +05:00
msvensson@neptunus.(none)
ca21b57992
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 09:28:44 +02:00
ramil/ram@myoffice.izhnet.ru
b1463a4b42
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
2006-10-03 08:56:19 +05:00
ramil/ram@myoffice.izhnet.ru
9241230b69
Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271
...
into mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
2006-10-03 08:51:59 +05:00
dlenev@mockturtle.local
cc9ab7d0b7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-10-02 23:40:56 +04:00
dlenev@mockturtle.local
0868629129
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-10-02 21:41:35 +04:00
kroki/tomash@moonlight.intranet
9402038287
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
2006-10-02 18:01:32 +04:00
lars/lthalmann@dl145j.mysql.com
9b17d0d332
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
2006-10-02 15:33:15 +02:00
lars/lthalmann@dl145h.mysql.com
4f2b786bf3
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-10-02 14:21:49 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
a8e845a6d2
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-10-02 14:19:51 +02:00
mats@romeo.(none)
c8ec10e4a4
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/fix-mysql-5.1-new-rpl
2006-10-02 14:03:54 +02:00
mats@romeo.(none)
3aaa49ed0b
BUG#22550 (Replication of BIT column failing):
...
Adding test case.
2006-10-02 13:38:06 +02:00
svoj@april.(none)
115c4fe8dc
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-10-02 15:11:08 +05:00
svoj@mysql.com/april.(none)
361c46eefe
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-10-02 14:52:09 +05:00
svoj@mysql.com/april.(none)
7afbe5f86e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-10-02 14:42:12 +05:00
msvensson@neptunus.(none)
c5ddd64bb8
Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-02 10:27:38 +02:00
msvensson@neptunus.(none)
6ebcb3d701
Don't run crash_commit_before under valgrind
2006-10-02 10:07:46 +02:00
tsmith/tim@siva.hindu.god
c36f165629
Post-merge fix. New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.
2006-09-30 01:21:27 -06:00
tsmith/tim@siva.hindu.god
44f0e55ca4
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 18:04:34 -06:00
dlenev@mockturtle.local
93fed182eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg20670
2006-09-30 00:31:33 +04:00
cmiller@zippy.cornsilk.net
5275e2437a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-29 16:24:21 -04:00
kroki/tomash@moonlight.intranet
5c9420bb18
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
2006-09-29 22:33:08 +04:00
dlenev@mockturtle.local
8b63a55b3a
After merge fixes.
2006-09-29 21:05:12 +04:00
istruewing@chilla.local
fe7de5b96c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug20627
2006-09-29 17:59:56 +02:00
dlenev@mockturtle.local
5c2a51292d
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-09-29 19:39:15 +04:00
cmiller@zippy.cornsilk.net
fa438d86cc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-29 11:20:47 -04:00
cmiller@zippy.cornsilk.net
097d60a883
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-29 11:18:26 -04:00
cmiller@zippy.cornsilk.net
2a7d7dd939
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778
2006-09-29 11:14:28 -04:00
sergefp@pylon.mylan
16506e906b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/psergey/mysql-5.1-bug14940-r10a
2006-09-29 18:35:03 +04:00
dlenev@mockturtle.local
ae117f23a8
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20670-2
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg20670
2006-09-29 18:26:30 +04:00